From 90323e987aeb4d890774d78f83df045d9c36107f Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Thu, 10 May 2012 15:07:33 -0400 Subject: [PATCH] --- yaml --- r: 308601 b: refs/heads/master c: 586f95cd4ffda7aa120327ec09865b181c809cdf h: refs/heads/master i: 308599: 6c45adddb069a34fcda364a849cff138fb0d7b5f v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9af2d54a59cf..00097e86496f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2311b9439ce8c525f3f8f821fc2ca9a541f673a5 +refs/heads/master: 586f95cd4ffda7aa120327ec09865b181c809cdf diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index f56fb357ddb3..40d43e05af03 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -2719,7 +2719,7 @@ nfs4_remote_mount(struct file_system_type *fs_type, int flags, } sb_mntdata.server = server; - if (server->flags & NFS4_MOUNT_UNSHARED) + if (server->flags & NFS_MOUNT_UNSHARED) compare_super = NULL; /* -o noac implies -o sync */ @@ -2983,7 +2983,7 @@ nfs4_xdev_mount(struct file_system_type *fs_type, int flags, } sb_mntdata.server = server; - if (server->flags & NFS4_MOUNT_UNSHARED) + if (server->flags & NFS_MOUNT_UNSHARED) compare_super = NULL; /* -o noac implies -o sync */ @@ -3074,7 +3074,7 @@ nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags, } sb_mntdata.server = server; - if (server->flags & NFS4_MOUNT_UNSHARED) + if (server->flags & NFS_MOUNT_UNSHARED) compare_super = NULL; /* -o noac implies -o sync */