From: Trond Myklebust Date: Mon, 4 Nov 2013 19:38:05 +0000 (-0500) Subject: NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec X-Git-Tag: MMI-PSA29.97-13-9~13133^2~18 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f3f5a0f8cc40b942f4c0ae117df82eeb65f07d4d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Cc: Steve Dickson Cc: stable@vger.kernel.org # 3.11+ Signed-off-by: Trond Myklebust --- 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)