Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ec8c0c4 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

nfsd: Remove duplicate macro define for max sec label length 



NFS4_MAXLABELLEN has defined for sec label max length, use it directly.

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent b14f4f7e

fs/nfsd/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -1815,7 +1815,7 @@ static inline u32 nfsd4_getattr_rsize(struct svc_rqst *rqstp, 
		bmap0 &= ~FATTR4_WORD0_FILEHANDLE;

	}

	if (bmap2 & FATTR4_WORD2_SECURITY_LABEL) {

		ret += NFSD4_MAX_SEC_LABEL_LEN + 12;

		ret += NFS4_MAXLABELLEN + 12;

		bmap2 &= ~FATTR4_WORD2_SECURITY_LABEL;

	}

	/*

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, 
		len += 4;

		dummy32 = be32_to_cpup(p++);

		READ_BUF(dummy32);

		if (dummy32 > NFSD4_MAX_SEC_LABEL_LEN)

		if (dummy32 > NFS4_MAXLABELLEN)

			return nfserr_badlabel;

		len += (XDR_QUADLEN(dummy32) << 2);

		READMEM(buf, dummy32);

fs/nfsd/xdr4.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include "state.h"

#include "nfsd.h"



#define NFSD4_MAX_SEC_LABEL_LEN	2048

#define NFSD4_MAX_TAGLEN	128

#define XDR_LEN(n)                     (((n) + 3) & ~3)