| Message ID | 1583307771-16365-1-git-send-email-hqjagain@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fs/cifs: fix gcc warning in sid_to_id | expand |
merged into cifs-2.6.git for-next On Wed, Mar 4, 2020 at 1:42 AM Qiujun Huang <hqjagain@gmail.com> wrote: > > fix warning [-Wunused-but-set-variable] at variable 'rc', > keeping the code readable. > > Signed-off-by: Qiujun Huang <hqjagain@gmail.com> > --- > fs/cifs/cifsacl.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c > index 716574a..ae42163 100644 > --- a/fs/cifs/cifsacl.c > +++ b/fs/cifs/cifsacl.c > @@ -342,7 +342,7 @@ > sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid, > struct cifs_fattr *fattr, uint sidtype) > { > - int rc; > + int rc = 0; > struct key *sidkey; > char *sidstr; > const struct cred *saved_cred; > @@ -450,11 +450,12 @@ > * fails then we just fall back to using the mnt_uid/mnt_gid. > */ > got_valid_id: > + rc = 0; > if (sidtype == SIDOWNER) > fattr->cf_uid = fuid; > else > fattr->cf_gid = fgid; > - return 0; > + return rc; > } > > int > -- > 1.8.3.1 >
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 716574a..ae42163 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -342,7 +342,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid, struct cifs_fattr *fattr, uint sidtype) { - int rc; + int rc = 0; struct key *sidkey; char *sidstr; const struct cred *saved_cred; @@ -450,11 +450,12 @@ * fails then we just fall back to using the mnt_uid/mnt_gid. */ got_valid_id: + rc = 0; if (sidtype == SIDOWNER) fattr->cf_uid = fuid; else fattr->cf_gid = fgid; - return 0; + return rc; } int
fix warning [-Wunused-but-set-variable] at variable 'rc', keeping the code readable. Signed-off-by: Qiujun Huang <hqjagain@gmail.com> --- fs/cifs/cifsacl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)