tentatively pushed to cifs-2.6.git for-next pending more testing of the flock patch it modified.
On Fri, Oct 18, 2019 at 1:07 AM YueHaibing <yuehaib...@huawei.com> wrote: > > Fixes gcc '-Wunused-but-set-variable' warning: > > fs/cifs/file.c: In function 'cifs_flock': > fs/cifs/file.c:1704:8: warning: > variable 'netfid' set but not used [-Wunused-but-set-variable] > > fs/cifs/file.c:1702:24: warning: > variable 'cinode' set but not used [-Wunused-but-set-variable] > > Reported-by: Hulk Robot <hul...@huawei.com> > Signed-off-by: YueHaibing <yuehaib...@huawei.com> > --- > fs/cifs/file.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/fs/cifs/file.c b/fs/cifs/file.c > index 936e03892e2a..02a81dc6861a 100644 > --- a/fs/cifs/file.c > +++ b/fs/cifs/file.c > @@ -1699,9 +1699,7 @@ int cifs_flock(struct file *file, int cmd, struct > file_lock *fl) > bool posix_lck = false; > struct cifs_sb_info *cifs_sb; > struct cifs_tcon *tcon; > - struct cifsInodeInfo *cinode; > struct cifsFileInfo *cfile; > - __u16 netfid; > __u32 type; > > rc = -EACCES; > @@ -1716,8 +1714,6 @@ int cifs_flock(struct file *file, int cmd, struct > file_lock *fl) > cifs_read_flock(fl, &type, &lock, &unlock, &wait_flag, > tcon->ses->server); > cifs_sb = CIFS_FILE_SB(file); > - netfid = cfile->fid.netfid; > - cinode = CIFS_I(file_inode(file)); > > if (cap_unix(tcon->ses) && > (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) > && > > > -- Thanks, Steve
