fs/cifs/cifsacl: remove set but not used variable 'rc'
Subsystems (2)
PATCH 1/1 fs/cifs/cifsacl: remove set but not used variable 'rc'
It is set but not used, So can be removed.
--- fs/cifs/cifsacl.c | 3 --- 1 file changed, 3 deletions(-)
fs/cifs/cifsacl.c +0 -3
@@ -342,7 +342,6 @@ 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;
@@ -403,7 +402,6 @@ saved_cred =override_creds (root_cred); sidkey =request_key (&cifs_idmap_key_type, sidstr,"" );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;
@@ -416,7 +414,6 @@*/ 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);
Signature · 1 line
1.8.3.1
Isn't it not used because of a potential bug - missing returning an error in two cases.
If we leave the two lines you removed in - and set rc=0 in its declaration (and return rc at the end as you originally had suggested)
- doesn't that solve the problem? A minor modification to your first proposed patch?
Quoted 39 lines · Qiujun Huang
It is set but not used, So can be removed.
Signed-off-by Qiujun Huang <[email protected]>--- fs/cifs/cifsacl.c | 3 --- 1 file changed, 3 deletions(-)fs/cifs/cifsacl.c +0
-4@@ -342,7 +342,6 @@ 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;@@ -403,7 +402,6 @@ saved_cred =override_creds (root_cred); sidkey =request_key (&cifs_idmap_key_type, sidstr,"" );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;@@ -416,7 +414,6 @@*/ 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); --1.8.3.1
Signature · 3 lines
Thanks, Steve
Quoted 3 lines · Steve French
Isn't it not used because of a potential bug - missing returning an error in two cases.
I get it, thanks.
Quoted 5 lines
If we leave the two lines you removed in - and set rc=0 in its declaration (and return rc at the end as you originally had suggested)
- doesn't that solve the problem? A minor modification to your first proposed patch?
ok, I'll send v2.
Quoted 47 lines · Qiujun Huang
Quoted 37 lines
It is set but not used, So can be removed.
Signed-off-by Qiujun Huang <[email protected]>--- fs/cifs/cifsacl.c | 3 --- 1 file changed, 3 deletions(-)fs/cifs/cifsacl.c +0
-4@@ -342,7 +342,6 @@ 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;@@ -403,7 +402,6 @@ saved_cred =override_creds (root_cred); sidkey =request_key (&cifs_idmap_key_type, sidstr,"" );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;@@ -416,7 +414,6 @@*/ 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); --Quoted 2 lines
1.8.3.1
--
Thanks,Steve