From 973015a4eceaab07a15862f55b4d1ee8daf3f756 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 13 Apr 2012 00:15:37 -0400
Subject: [PATCH] --- yaml --- r: 299303 b: refs/heads/master c:
 afcf6792afd66209161495f691e19d4fc5460a93 h: refs/heads/master i:   299301:
 c681f31c75e556a1f03d60cdf139adf475f9c84a   299299:
 ad2da5111f7f5bf5c81d72686be3019b8b0e296b   299295:
 37d89d1dcb75037c14e1828204e8ee0da03e248a v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfsd/nfs4xdr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0d1b252ce50b..cf5a75d6c52e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02f5fde5df0ea930e70f93763dd48beff182b208
+refs/heads/master: afcf6792afd66209161495f691e19d4fc5460a93
diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
index 07a99b6d4bbe..74c00bc92b9a 100644
--- a/trunk/fs/nfsd/nfs4xdr.c
+++ b/trunk/fs/nfsd/nfs4xdr.c
@@ -1392,7 +1392,7 @@ nfsd4_decode_test_stateid(struct nfsd4_compoundargs *argp, struct nfsd4_test_sta
 	for (i = 0; i < test_stateid->ts_num_ids; i++) {
 		stateid = kmalloc(sizeof(struct nfsd4_test_stateid_id), GFP_KERNEL);
 		if (!stateid) {
-			status = PTR_ERR(stateid);
+			status = nfserrno(-ENOMEM);
 			goto out;
 		}