summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-11-04 14:38:05 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 11:28:02 -0800
commitdbb9a46b2e72985f711ab234d0e3e62d6faf3535 (patch)
tree7f2a684e6f00d566250ff25f33c62c1e9faf36bb /include
parentc14049500ecb5ba0a5c3325d502928b753beaf17 (diff)
downloadlwn-dbb9a46b2e72985f711ab234d0e3e62d6faf3535.tar.gz
lwn-dbb9a46b2e72985f711ab234d0e3e62d6faf3535.zip
NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec
commit f3f5a0f8cc40b942f4c0ae117df82eeb65f07d4d upstream. 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> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 e36dee52f224..3859ddbecb5f 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)