diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-11-25 14:00:40 +0100 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2012-12-05 20:13:12 +0100 |
| commit | d3d1fce11dbbf4246f1c37839b13757f08aec3b7 (patch) | |
| tree | e2594a52a76da9b36aea5cbd176a6ec65b4a30e9 /fs | |
| parent | cifs: remove uneeded __KERNEL__ block from cifsacl.h (diff) | |
| download | linux-d3d1fce11dbbf4246f1c37839b13757f08aec3b7.tar.xz linux-d3d1fce11dbbf4246f1c37839b13757f08aec3b7.zip | |
cifs: don't override the uid/gid in getattr when cifsacl is enabled
If we're using cifsacl, then we don't want to override the uid/gid with
the current uid/gid, since that would prevent you from being able to
upcall for this info.
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/inode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index afdff79651f1..ed6208ff85a7 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1791,11 +1791,12 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry, stat->ino = CIFS_I(inode)->uniqueid; /* - * If on a multiuser mount without unix extensions, and the admin hasn't - * overridden them, set the ownership to the fsuid/fsgid of the current - * process. + * If on a multiuser mount without unix extensions or cifsacl being + * enabled, and the admin hasn't overridden them, set the ownership + * to the fsuid/fsgid of the current process. */ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER) && + !(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) && !tcon->unix_ext) { if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)) stat->uid = current_fsuid(); |