* [PATCH] cifs: remove unused variable
@ 2019-08-20 14:00 zhengbin
2019-08-21 16:40 ` Steve French
0 siblings, 1 reply; 2+ messages in thread
From: zhengbin @ 2019-08-20 14:00 UTC (permalink / raw)
To: sfrench, linux-cifs, samba-technical; +Cc: yi.zhang, zhengbin13
In smb3_punch_hole, variable cifsi set but not used, remove it.
In cifs_lock, variable netfid set but not used, remove it.
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
---
fs/cifs/file.c | 2 --
fs/cifs/smb2ops.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 9709069..ab07ae8 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1695,7 +1695,6 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
struct cifs_tcon *tcon;
struct cifsInodeInfo *cinode;
struct cifsFileInfo *cfile;
- __u16 netfid;
__u32 type;
rc = -EACCES;
@@ -1711,7 +1710,6 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
cifs_read_flock(flock, &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) &&
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 64a5864..f5bbd1d 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -2939,7 +2939,6 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
loff_t offset, loff_t len)
{
struct inode *inode;
- struct cifsInodeInfo *cifsi;
struct cifsFileInfo *cfile = file->private_data;
struct file_zero_data_information fsctl_buf;
long rc;
@@ -2949,7 +2948,6 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
xid = get_xid();
inode = d_inode(cfile->dentry);
- cifsi = CIFS_I(inode);
/* Need to make file sparse, if not already, before freeing range. */
/* Consider adding equivalent for compressed since it could also work */
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cifs: remove unused variable
2019-08-20 14:00 [PATCH] cifs: remove unused variable zhengbin
@ 2019-08-21 16:40 ` Steve French
0 siblings, 0 replies; 2+ messages in thread
From: Steve French @ 2019-08-21 16:40 UTC (permalink / raw)
To: zhengbin; +Cc: Steve French, CIFS, samba-technical, yi.zhang
merged into cifs-2.6.git for-next
On Tue, Aug 20, 2019 at 8:54 AM zhengbin <zhengbin13@huawei.com> wrote:
>
> In smb3_punch_hole, variable cifsi set but not used, remove it.
> In cifs_lock, variable netfid set but not used, remove it.
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: zhengbin <zhengbin13@huawei.com>
> ---
> fs/cifs/file.c | 2 --
> fs/cifs/smb2ops.c | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index 9709069..ab07ae8 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -1695,7 +1695,6 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
> struct cifs_tcon *tcon;
> struct cifsInodeInfo *cinode;
> struct cifsFileInfo *cfile;
> - __u16 netfid;
> __u32 type;
>
> rc = -EACCES;
> @@ -1711,7 +1710,6 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
> cifs_read_flock(flock, &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) &&
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index 64a5864..f5bbd1d 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -2939,7 +2939,6 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
> loff_t offset, loff_t len)
> {
> struct inode *inode;
> - struct cifsInodeInfo *cifsi;
> struct cifsFileInfo *cfile = file->private_data;
> struct file_zero_data_information fsctl_buf;
> long rc;
> @@ -2949,7 +2948,6 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
> xid = get_xid();
>
> inode = d_inode(cfile->dentry);
> - cifsi = CIFS_I(inode);
>
> /* Need to make file sparse, if not already, before freeing range. */
> /* Consider adding equivalent for compressed since it could also work */
> --
> 2.7.4
>
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-21 16:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-20 14:00 [PATCH] cifs: remove unused variable zhengbin
2019-08-21 16:40 ` Steve French
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).