diff options
| author | Jeff Layton <jlayton@redhat.com> | 2008-04-16 16:28:46 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-04-23 16:13:43 -0400 |
| commit | dee3209d993f17081d2c58d6470dfc8d6662078b (patch) | |
| tree | d19b417851b970c659612593a1f9b6df942e313e /fs | |
| parent | 0dc220f0815497858db539d27947f3ec83202ace (diff) | |
| download | op-kernel-dev-dee3209d993f17081d2c58d6470dfc8d6662078b.zip op-kernel-dev-dee3209d993f17081d2c58d6470dfc8d6662078b.tar.gz | |
knfsd: get rid of imode variable in nfsd_setattr
...it's not really needed.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 832e2b8..1d0406c 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -264,7 +264,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, struct inode *inode; int accmode = MAY_SATTR; int ftype = 0; - int imode; __be32 err; int host_err; int size_change = 0; @@ -360,10 +359,9 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, DQUOT_INIT(inode); } - imode = inode->i_mode; if (iap->ia_valid & ATTR_MODE) { iap->ia_mode &= S_IALLUGO; - imode = iap->ia_mode |= (imode & ~S_IALLUGO); + iap->ia_mode |= (inode->i_mode & ~S_IALLUGO); /* if changing uid/gid revoke setuid/setgid in mode */ if ((iap->ia_valid & ATTR_UID) && iap->ia_uid != inode->i_uid) { iap->ia_valid |= ATTR_KILL_PRIV; |
