commit 95864c9154c1385c33e6782f4467c8f1422c1c90
author Trond Myklebust <trond.myklebust@primarydata.com> Sat Dec 26 15:06:03 2015 -0500
committer Trond Myklebust <trond.myklebust@primarydata.com> Mon Dec 28 09:57:08 2015 -0500
tree 116a27b1362eda1d1ae3148f2c289b8c46919e07
parent 68d264cf02b076a2457aa77c044f5e41b6fa8086

NFS: Allow the combination pNFS and labeled NFS

Fix the nfs4_pnfs_open_bitmap so that it also allows for labeled NFS.

Signed-off-by: Trond Myklebust <trond,myklebust@primarydata.com>

fs/nfs/nfs4proc.c

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2f1714f..1028d6d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -208,6 +208,9 @@
 	| FATTR4_WORD1_TIME_METADATA
 	| FATTR4_WORD1_TIME_MODIFY,
 	FATTR4_WORD2_MDSTHRESHOLD
+#ifdef CONFIG_NFS_V4_SECURITY_LABEL
+	| FATTR4_WORD2_SECURITY_LABEL
+#endif
 };
 
 static const u32 nfs4_open_noattr_bitmap[3] = {