NFSD: nfserrno(-ENOMEM) is nfserr_jukebox

[ Upstream commit bb4d842722b84a2731257054b6405f2d866fc5f3 ]

Suggested-by: Dai Ngo <dai.ngo@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index a5ab6ea4754238e07c1e0e39b510ecc5590cc8fc..fb891249694c3f6b097ed586a870c685108e6627 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1810,7 +1810,7 @@ nfsd4_decode_test_stateid(struct nfsd4_compoundargs *argp, struct nfsd4_test_sta
        for (i = 0; i < test_stateid->ts_num_ids; i++) {
                stateid = svcxdr_tmpalloc(argp, sizeof(*stateid));
                if (!stateid)
-                       return nfserrno(-ENOMEM);       /* XXX: not jukebox? */
+                       return nfserr_jukebox;
                INIT_LIST_HEAD(&stateid->ts_id_list);
                list_add_tail(&stateid->ts_id_list, &test_stateid->ts_stateid_list);
                status = nfsd4_decode_stateid4(argp, &stateid->ts_id_stateid);
@@ -1933,7 +1933,7 @@ nfsd4_decode_copy(struct nfsd4_compoundargs *argp, struct nfsd4_copy *copy)
 
        ns_dummy = kmalloc(sizeof(struct nl4_server), GFP_KERNEL);
        if (ns_dummy == NULL)
-               return nfserrno(-ENOMEM);       /* XXX: jukebox? */
+               return nfserr_jukebox;
        for (i = 0; i < count - 1; i++) {
                status = nfsd4_decode_nl4_server(argp, ns_dummy);
                if (status) {