Commit 999e5683 authored Jun 03, 2014 by J. Bruce Fields

nfs4: remove unused CHANGE_SECURITY_LABEL



This constant has the wrong value.  And we don't use it.  And it's been
removed from the 4.2 spec anyway.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent 542d1ab3

fs/nfs/nfs4proc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2750,7 +2750,7 @@ static void nfs4_close_context(struct nfs_open_context *ctx, int is_sync)

		#define FATTR4_WORD1_NFS40_MASK (2*FATTR4_WORD1_MOUNTED_ON_FILEID - 1UL)
		#define FATTR4_WORD2_NFS41_MASK (2*FATTR4_WORD2_SUPPATTR_EXCLCREAT - 1UL)
		#define FATTR4_WORD2_NFS42_MASK (2*FATTR4_WORD2_CHANGE_SECURITY_LABEL - 1UL)
		#define FATTR4_WORD2_NFS42_MASK (2*FATTR4_WORD2_SECURITY_LABEL - 1UL)

		static int _nfs4_server_capabilities(struct nfs_server server, struct nfs_fh fhandle)
		{

include/linux/nfs4.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -399,8 +399,6 @@ enum lock_type4 {
		#define FATTR4_WORD2_LAYOUT_BLKSIZE (1UL << 1)
		#define FATTR4_WORD2_MDSTHRESHOLD (1UL << 4)
		#define FATTR4_WORD2_SECURITY_LABEL (1UL << 16)
		#define FATTR4_WORD2_CHANGE_SECURITY_LABEL \
		(1UL << 17)

		/* MDS threshold bitmap bits */
		#define THRESHOLD_RD (1UL << 0)