diff --git a/[refs] b/[refs] index 55784eaa1bcb..d182bb55e7a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0fd30d3e7e768aad5e398caaea6ae5a5c814eab +refs/heads/master: 4e94a105ed0df78e25b20ff8ed6761f5937662b1 diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index 12667d6bf305..ae6b725b3665 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/fs/cifs/inode.c @@ -1019,7 +1019,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) CIFS_MOUNT_DYNPERM) direntry->d_inode->i_mode = (mode | S_IFDIR); - + if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) { direntry->d_inode->i_uid =