mmc: dw_mmc: Make sure we don't get stuck when we get an error

[firefly-linux-kernel-4.4.55.git] / fs / nfsd / nfsxdr.c

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 1ac306b769df4bb52e58c9c7d2a1ceccd2a17a29..412d7061f9e5ec764cade00584ac87308b7caf3d 100644 (file)
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -257,8 +257,7 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, __be32 *p,
        len = args->count     = ntohl(*p++);
        p++; /* totalcount - unused */
 
-       if (len > NFSSVC_MAXBLKSIZE_V2)
-               len = NFSSVC_MAXBLKSIZE_V2;
+       len = min_t(unsigned int, len, NFSSVC_MAXBLKSIZE_V2);
 
        /* set up somewhere to store response.
         * We take pages, put them on reslist and include in iovec
@@ -268,7 +267,7 @@ nfssvc_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++;
        }
@@ -400,9 +399,7 @@ nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p,
                return 0;
        args->cookie = ntohl(*p++);
        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);
@@ -516,10 +513,11 @@ nfssvc_encode_entry(void *ccdv, const char *name,
        }
        if (cd->offset)
                *cd->offset = htonl(offset);
-       if (namlen > NFS2_MAXNAMLEN)
-               namlen = NFS2_MAXNAMLEN;/* truncate filename */
 
+       /* truncate filename */
+       namlen = min(namlen, NFS2_MAXNAMLEN);
        slen = XDR_QUADLEN(namlen);
+
        if ((buflen = cd->buflen - slen - 4) < 0) {
                cd->common.err = nfserr_toosmall;
                return -EINVAL;