Commit 3c7aa15d authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

NFSD: Using min/max/min_t/max_t for calculate 



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

fs/nfsd/nfs3proc.c

+1 −5
Original line number Diff line number Diff line
@@ -157,11 +157,7 @@ nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp, 
	 * 1 (status) + 22 (post_op_attr) + 1 (count) + 1 (eof)

	 * + 1 (xdr opaque byte count) = 26

	 */



	resp->count = argp->count;

	if (max_blocksize < resp->count)

		resp->count = max_blocksize;



	resp->count = min(argp->count, max_blocksize);

	svc_reserve_auth(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count +4);



	fh_copy(&resp->fh, &argp->fh);

fs/nfsd/nfs3xdr.c

+8 −22
Original line number Diff line number Diff line
@@ -120,10 +120,7 @@ decode_sattr3(__be32 *p, struct iattr *iap) 


		iap->ia_valid |= ATTR_SIZE;

		p = xdr_decode_hyper(p, &newsize);

		if (newsize <= NFS_OFFSET_MAX)

			iap->ia_size = newsize;

		else

			iap->ia_size = NFS_OFFSET_MAX;

		iap->ia_size = min_t(u64, newsize, NFS_OFFSET_MAX);

	}

	if ((tmp = ntohl(*p++)) == 1) {	/* set to server time */

		iap->ia_valid |= ATTR_ATIME;
@@ -338,10 +335,8 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p, 
		return 0;

	p = xdr_decode_hyper(p, &args->offset);



	len = args->count = ntohl(*p++);



	if (len > max_blocksize)

		len = max_blocksize;

	args->count = ntohl(*p++);

	len = min(args->count, max_blocksize);



	/* set up the kvec */

	v=0;
@@ -349,7 +344,7 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p, 
		struct page *p = *(rqstp->rq_next_page++);



		rqstp->rq_vec[v].iov_base = page_address(p);

		rqstp->rq_vec[v].iov_len = len < PAGE_SIZE? len : PAGE_SIZE;

		rqstp->rq_vec[v].iov_len = min_t(unsigned int, len, PAGE_SIZE);

		len -= rqstp->rq_vec[v].iov_len;

		v++;

	}
@@ -484,9 +479,7 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p, 
	}

	/* now copy next page if there is one */

	if (len && !avail && rqstp->rq_arg.page_len) {

		avail = rqstp->rq_arg.page_len;

		if (avail > PAGE_SIZE)

			avail = PAGE_SIZE;

		avail = min_t(unsigned int, rqstp->rq_arg.page_len, PAGE_SIZE);

		old = page_address(rqstp->rq_arg.pages[0]);

	}

	while (len && avail && *old) {
@@ -571,10 +564,7 @@ nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p, 
	args->verf   = p; p += 2;

	args->dircount = ~0;

	args->count  = ntohl(*p++);



	if (args->count > PAGE_SIZE)

		args->count = PAGE_SIZE;



	args->count  = min_t(u32, args->count, PAGE_SIZE);

	args->buffer = page_address(*(rqstp->rq_next_page++));



	return xdr_argsize_check(rqstp, p);
@@ -595,10 +585,7 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p, 
	args->dircount = ntohl(*p++);

	args->count    = ntohl(*p++);



	len = (args->count > max_blocksize) ? max_blocksize :

						  args->count;

	args->count = len;



	len = args->count = min(args->count, max_blocksize);

	while (len > 0) {

		struct page *p = *(rqstp->rq_next_page++);

		if (!args->buffer)
@@ -913,8 +900,7 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen, 
	 */



	/* truncate filename if too long */

	if (namlen > NFS3_MAXNAMLEN)

		namlen = NFS3_MAXNAMLEN;

	namlen = min(namlen, NFS3_MAXNAMLEN);



	slen = XDR_QUADLEN(namlen);

	elen = slen + NFS3_ENTRY_BAGGAGE

fs/nfsd/nfs4proc.c

+4 −8
Original line number Diff line number Diff line
@@ -1529,21 +1529,17 @@ static inline u32 nfsd4_read_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) 
	u32 maxcount = 0, rlen = 0;



	maxcount = svc_max_payload(rqstp);

	rlen = op->u.read.rd_length;



	if (rlen > maxcount)

		rlen = maxcount;

	rlen = min(op->u.read.rd_length, maxcount);



	return (op_encode_hdr_size + 2 + XDR_QUADLEN(rlen)) * sizeof(__be32);

}



static inline u32 nfsd4_readdir_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)

{

	u32 maxcount = svc_max_payload(rqstp);

	u32 rlen = op->u.readdir.rd_maxcount;

	u32 maxcount = 0, rlen = 0;



	if (rlen > maxcount)

		rlen = maxcount;

	maxcount = svc_max_payload(rqstp);

	rlen = min(op->u.readdir.rd_maxcount, maxcount);



	return (op_encode_hdr_size + op_encode_verifier_maxsz +

		XDR_QUADLEN(rlen)) * sizeof(__be32);

fs/nfsd/nfs4xdr.c

+3 −7
Original line number Diff line number Diff line
@@ -3134,9 +3134,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, 
	len = maxcount;

	v = 0;



	thislen = (void *)xdr->end - (void *)xdr->p;

	if (len < thislen)

		thislen = len;

	thislen = min(len, ((void *)xdr->end - (void *)xdr->p));

	p = xdr_reserve_space(xdr, (thislen+3)&~3);

	WARN_ON_ONCE(!p);

	resp->rqstp->rq_vec[v].iov_base = p;
@@ -3203,10 +3201,8 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, 
	xdr_commit_encode(xdr);



	maxcount = svc_max_payload(resp->rqstp);

	if (maxcount > xdr->buf->buflen - xdr->buf->len)

		maxcount = xdr->buf->buflen - xdr->buf->len;

	if (maxcount > read->rd_length)

		maxcount = read->rd_length;

	maxcount = min_t(unsigned long, maxcount, (xdr->buf->buflen - xdr->buf->len));

	maxcount = min_t(unsigned long, maxcount, read->rd_length);



	if (!read->rd_filp) {

		err = nfsd_get_tmp_read_open(resp->rqstp, read->rd_fhp,

fs/nfsd/nfsctl.c

+3 −6
Original line number Diff line number Diff line
@@ -369,8 +369,7 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size) 


	if (maxsize < NFS_FHSIZE)

		return -EINVAL;

	if (maxsize > NFS3_FHSIZE)

		maxsize = NFS3_FHSIZE;

	maxsize = min(maxsize, NFS3_FHSIZE);



	if (qword_get(&mesg, mesg, size)>0)

		return -EINVAL;
@@ -871,10 +870,8 @@ static ssize_t write_maxblksize(struct file *file, char *buf, size_t size) 
		/* force bsize into allowed range and

		 * required alignment.

		 */

		if (bsize < 1024)

			bsize = 1024;

		if (bsize > NFSSVC_MAXBLKSIZE)

			bsize = NFSSVC_MAXBLKSIZE;

		bsize = max_t(int, bsize, 1024);

		bsize = min_t(int, bsize, NFSSVC_MAXBLKSIZE);

		bsize &= ~(1024-1);

		mutex_lock(&nfsd_mutex);

		if (nn->nfsd_serv) {