From d24cc245c47610d525f7f96e3552c704cf452e67 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Sun, 25 Nov 2012 08:00:40 -0500 Subject: [PATCH] --- yaml --- r: 339460 b: refs/heads/master c: d3d1fce11dbbf4246f1c37839b13757f08aec3b7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/inode.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8ba622d16d4c..eebbc652fca1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1a6dc21d1a731fdb71fcd683ef856c6af0b3f23 +refs/heads/master: d3d1fce11dbbf4246f1c37839b13757f08aec3b7 diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index afdff79651f1..ed6208ff85a7 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/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();