fs/cifs - clean up 'set but not used' variables.
Subsystems (2)
PATCH 1/1 fs/cifs - clean up 'set but not used' variables.
When building with W=1, fs/cifs throws a lot of 'set but not used' messages.
CC [M] fs/cifs/file.ofs/cifs/file.c: In function 'cifs_lock':fs/cifs/file.c:1698:8: warning: variable 'netfid' set but not used [-Wunused-but-set-variable]
1698 | __u16 netfid;
| ^~~~~~fs/cifs/file.c:1696:24: warning: variable 'cinode' set but not used [-Wunused-but-set-variable]
1696 | struct cifsInodeInfo *cinode;
| ^~~~~~fs/cifs/file.c: In function 'cifs_write':fs/cifs/file.c:1767:23: warning: variable 'cifs_sb' set but not used [-Wunused-but-set-variable]
1767 | struct cifs_sb_info *cifs_sb;
| ^~~~~~~fs/cifs/file.c: In function 'collect_uncached_read_data':fs/cifs/file.c:3580:20: warning: variable 'tcon' set but not used [-Wunused-but-set-variable]
3580 | struct cifs_tcon *tcon;
| ^~~~
CC [M] fs/cifs/netmisc.ofs/cifs/netmisc.c:120:40: warning: 'mapping_table_ERRHRD' defined but not used [-Wunused-const-variable=]
120 | static const struct smb_to_posix_error mapping_table_ERRHRD[] = {
| ^~~~~~~~~~~~~~~~~~~~ CC [M] fs/cifs/smb2ops.ofs/cifs/smb2ops.c: In function 'smb3_punch_hole':fs/cifs/smb2ops.c:2942:24: warning: variable 'cifsi' set but not used [-Wunused-but-set-variable]
2942 | struct cifsInodeInfo *cifsi;
| ^~~~~
CC [M] fs/cifs/cifsacl.ofs/cifs/cifsacl.c: In function 'sid_to_id':fs/cifs/cifsacl.c:367:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable]
367 | int rc;
| ^~
At top level:
fs/cifs/cifsacl.c:89:30: warning: 'sid_unix_NFS_mode' defined but not used [-Wunused-const-variable=]
89 | static const struct cifs_sid sid_unix_NFS_mode = { 1, 2, {0, 0, 0, 0, 0, 5},
| ^~~~~~~~~~~~~~~~~fs/cifs/cifsacl.c:62:30: warning: 'sid_user' defined but not used [-Wunused-const-variable=]
62 | static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} };
| ^~~~~~~~
Heave the unused stuff over the side.
fs/cifs/cifsacl.c +0 -10
@@ -58,8 +58,6 @@ static const struct cifs_sid sid_everyone = {/* security id for Authenticated Users system group */ static const struct cifs_sid sid_authusers = {1 ,1 , {0 ,0 ,0 ,0 ,0 ,5 }, {cpu_to_le32 (11 )} }; -/* group users */ -static const struct cifs_sid sid_user = {1 ,2 , {0 ,0 ,0 ,0 ,0 ,5 }, {} };/* S-1-22-1 Unmapped Unix users */ static const struct cifs_sid sid_unix_users = {1 ,1 , {0 ,0 ,0 ,0 ,0 ,22 },
@@ -85,11 +83,6 @@ static const struct cifs_sid sid_unix_NFS_groups = { 1, 2, {0, 0, 0, 0, 0, 5}, {cpu_to_le32 (88 ), cpu_to_le32(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; -/* S-1-5-88-3 Unix mode */ -static const struct cifs_sid sid_unix_NFS_mode = {1 ,2 , {0 ,0 ,0 ,0 ,0 ,5 }, - {cpu_to_le32 (88 ), -cpu_to_le32 (3 ),0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 } }; -static const struct cred *root_cred; static int
@@ -364,7 +357,6 @@ static int sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid, struct cifs_fattr *fattr, uint sidtype) { - int rc; struct key *sidkey;char *sidstr;const struct cred *saved_cred;
@@ -426,7 +418,6 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid, sidkey =request_key (&cifs_idmap_key_type, sidstr,"" , &cifs_idmap_key_acl);if (IS_ERR (sidkey)) { - rc = -EINVAL ;cifs_dbg (FYI ,"%s: Can't map SID %s to a %cid\n" , __func__, sidstr, sidtype ==SIDOWNER ?'u' :'g' ); goto out_revert_creds;
@@ -439,7 +430,6 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,*/ BUILD_BUG_ON (sizeof (uid_t) !=sizeof (gid_t));if (sidkey->datalen !=sizeof (uid_t)) { - rc = -EIO ;cifs_dbg (FYI ,"%s: Downcall contained malformed key (datalen=%hu)\n" , __func__, sidkey->datalen);key_invalidate (sidkey);
fs/cifs/file.c +0 -9
@@ -1693,9 +1693,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)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 ;
@@ -1711,8 +1709,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) && (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&
@@ -1764,7 +1760,6 @@ cifs_write(struct cifsFileInfo *open_file, __u32 pid, const char *write_data,int rc =0 ;unsigned int bytes_written =0 ;unsigned int total_written; -struct cifs_sb_info *cifs_sb;struct cifs_tcon *tcon;struct TCP_Server_Info *server;unsigned int xid;
@@ -1772,8 +1767,6 @@ cifs_write(struct cifsFileInfo *open_file, __u32 pid, const char *write_data,struct cifsInodeInfo *cifsi =CIFS_I (d_inode (dentry));struct cifs_io_parms io_parms; - cifs_sb =CIFS_SB (dentry->d_sb); -cifs_dbg (FYI ,"write %zd bytes to offset %lld of %pd\n" , write_size, *offset, dentry);
@@ -3577,10 +3570,8 @@ collect_uncached_read_data(struct cifs_aio_ctx *ctx)struct cifs_readdata *rdata, *tmp;struct iov_iter *to = &ctx->iter;struct cifs_sb_info *cifs_sb; -struct cifs_tcon *tcon;int rc; - tcon =tlink_tcon (ctx->cfile->tlink); cifs_sb =CIFS_SB (ctx->cfile->dentry->d_sb);mutex_lock (&ctx->aio_mutex);
fs/cifs/netmisc.c +0 -4
@@ -117,10 +117,6 @@ static const struct smb_to_posix_error mapping_table_ERRSRV[] = { {0, 0} }; -static const struct smb_to_posix_error mapping_table_ERRHRD[] = { - {0 ,0 } -}; -/* * Convert a string containing text IPv4 or IPv6 address to binary form. *
fs/cifs/smb2ops.c +0 -2
@@ -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 */