summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-11-04 14:38:05 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-11-04 15:42:10 -0500
commitf3f5a0f8cc40b942f4c0ae117df82eeb65f07d4d (patch)
tree365c8f33bcb723706fab74453f20f1c689a8b8e1 /include
parentfcb63a9bd8427fc584229048ea14f1453dc9a2e1 (diff)
downloadlinux-f3f5a0f8cc40b942f4c0ae117df82eeb65f07d4d.tar.gz
linux-f3f5a0f8cc40b942f4c0ae117df82eeb65f07d4d.tar.bz2
linux-f3f5a0f8cc40b942f4c0ae117df82eeb65f07d4d.zip
NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec
In the spec, the security label attribute id is '80', which means that it should be bit number 80-64 == 16 in the 3rd word of the bitmap. Fixes: 4488cc96c581: NFS: Add NFSv4.2 protocol constants Cc: J. Bruce Fields <bfields@fieldses.org> Cc: Steve Dickson <steved@redhat.com> Cc: stable@vger.kernel.org # 3.11+ Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs4.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index c56fa8fedce9..bfe6c379a24e 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -395,7 +395,7 @@ enum lock_type4 {
#define FATTR4_WORD1_FS_LAYOUT_TYPES (1UL << 30)
#define FATTR4_WORD2_LAYOUT_BLKSIZE (1UL << 1)
#define FATTR4_WORD2_MDSTHRESHOLD (1UL << 4)
-#define FATTR4_WORD2_SECURITY_LABEL (1UL << 17)
+#define FATTR4_WORD2_SECURITY_LABEL (1UL << 16)
/* MDS threshold bitmap bits */
#define THRESHOLD_RD (1UL << 0)