From bf5d76f77b3cac19758fbe2e2a33d7d15c1fa97a Mon Sep 17 00:00:00 2001
From: Weston Andros Adamson <dros@netapp.com>
Date: Thu, 6 Sep 2012 15:54:27 -0400
Subject: [PATCH] --- yaml --- r: 322620 b: refs/heads/master c:
 01913b49cf1dc6409a07dd2a4cc6af2e77f3c410 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0bc2e727befa..c65d8364939f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f1ea6c2d9d8c0be9ec56454b05315273b5de8ce
+refs/heads/master: 01913b49cf1dc6409a07dd2a4cc6af2e77f3c410
diff --git a/trunk/fs/nfs/nfs4xdr.c b/trunk/fs/nfs/nfs4xdr.c
index 541e796e6db5..8dba6bd48557 100644
--- a/trunk/fs/nfs/nfs4xdr.c
+++ b/trunk/fs/nfs/nfs4xdr.c
@@ -6225,7 +6225,8 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
 	status = decode_open(xdr, res);
 	if (status)
 		goto out;
-	if (decode_getfh(xdr, &res->fh) != 0)
+	status = decode_getfh(xdr, &res->fh);
+	if (status)
 		goto out;
 	decode_getfattr(xdr, res->f_attr, res->server);
 out: