From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Sat, 26 Dec 2015 20:06:03 +0000 (-0500)
Subject: NFS: Allow the combination pNFS and labeled NFS
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95864c9154c1385c33e6782f4467c8f1422c1c90;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2f1714fda666..1028d6dc40c0 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -208,6 +208,9 @@ static const u32 nfs4_pnfs_open_bitmap[3] = {
 	| 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] = {