diff mbox series

fs/cifs/cifsacl: remove set but not used variable 'rc'

Message ID 1583278783-11584-1-git-send-email-hqjagain@gmail.com (mailing list archive)
State New, archived
Headers show
Series fs/cifs/cifsacl: remove set but not used variable 'rc' | expand

Commit Message

Qiujun Huang March 3, 2020, 11:39 p.m. UTC
It is set but not used, So can be removed.

Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
---
 fs/cifs/cifsacl.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Steve French March 4, 2020, 6:23 a.m. UTC | #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?

On Tue, Mar 3, 2020 at 5:39 PM Qiujun Huang <hqjagain@gmail.com> wrote:
>
>  It is set but not used, So can be removed.
>
> Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
> ---
>  fs/cifs/cifsacl.c | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
> index 716574a..1cf3916 100644
> --- a/fs/cifs/cifsacl.c
> +++ b/fs/cifs/cifsacl.c
> @@ -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
>
Qiujun Huang March 4, 2020, 6:53 a.m. UTC | #2
On Wed, Mar 4, 2020 at 2:23 PM Steve French <smfrench@gmail.com> wrote:
>
> Isn't it not used because of a potential bug - missing returning an
> error in two cases.

I get it, thanks.

>
> 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.
>
> On Tue, Mar 3, 2020 at 5:39 PM Qiujun Huang <hqjagain@gmail.com> wrote:
> >
> >  It is set but not used, So can be removed.
> >
> > Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
> > ---
> >  fs/cifs/cifsacl.c | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
> > index 716574a..1cf3916 100644
> > --- a/fs/cifs/cifsacl.c
> > +++ b/fs/cifs/cifsacl.c
> > @@ -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
> >
>
>
> --
> Thanks,
>
> Steve
diff mbox series

Patch

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 716574a..1cf3916 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -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);