Sfoglia il codice sorgente

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>
Trond Myklebust 9 anni fa
parent
commit
95864c9154
1 ha cambiato i file con 3 aggiunte e 0 eliminazioni
  1. 3 0
      fs/nfs/nfs4proc.c

+ 3 - 0
fs/nfs/nfs4proc.c

@@ -208,6 +208,9 @@ static const u32 nfs4_pnfs_open_bitmap[3] = {
 	| FATTR4_WORD1_TIME_METADATA
 	| FATTR4_WORD1_TIME_METADATA
 	| FATTR4_WORD1_TIME_MODIFY,
 	| FATTR4_WORD1_TIME_MODIFY,
 	FATTR4_WORD2_MDSTHRESHOLD
 	FATTR4_WORD2_MDSTHRESHOLD
+#ifdef CONFIG_NFS_V4_SECURITY_LABEL
+	| FATTR4_WORD2_SECURITY_LABEL
+#endif
 };
 };
 
 
 static const u32 nfs4_open_noattr_bitmap[3] = {
 static const u32 nfs4_open_noattr_bitmap[3] = {