fs/9p: Add access = client option to opt in acl evaluation.

[deliverable/linux.git] / fs / 9p / vfs_super.c

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 14da5778d44ed33777c98f36d02c5028a6e8d86e..174643f4f901a7621edb99bdbe9ef9afa258991d 100644 (file)
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -90,7 +90,8 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses,
            MS_NOATIME;
 
 #ifdef CONFIG_9P_FS_POSIX_ACL
-       sb->s_flags |= MS_POSIXACL;
+       if ((v9ses->flags & V9FS_ACCESS_MASK) == V9FS_ACCESS_CLIENT)
+               sb->s_flags |= MS_POSIXACL;
 #endif
 
        save_mount_options(sb, data);
@@ -181,7 +182,6 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags,
        retval = v9fs_get_acl(inode, fid);
        if (retval)
                goto release_sb;
-
        v9fs_fid_add(root, fid);
 
        P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n");