From 380e2365345b37072599b39e14f5c8fdc90f4ddd Mon Sep 17 00:00:00 2001
From: Roman Borisov <ext-roman.borisov@nokia.com>
Date: Wed, 13 Oct 2010 16:54:51 +0400
Subject: [PATCH] --- yaml --- r: 217089 b: refs/heads/master c:
 3388bff5cfe91589a912cdc7f00d3aae3aa18adc h: refs/heads/master i:   217087:
 3db2d0f183aa5c1026c1c4fab28098498e7e4d79 v: v3

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

diff --git a/[refs] b/[refs]
index bf8e80a96654..34b05771e76e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55b6e7742d5b25182edf410369379b9727b2e5bc
+refs/heads/master: 3388bff5cfe91589a912cdc7f00d3aae3aa18adc
diff --git a/trunk/fs/nfs/nfs4xdr.c b/trunk/fs/nfs/nfs4xdr.c
index 7131c761d85c..bd2101d918c8 100644
--- a/trunk/fs/nfs/nfs4xdr.c
+++ b/trunk/fs/nfs/nfs4xdr.c
@@ -2687,7 +2687,10 @@ static inline int decode_attr_length(struct xdr_stream *xdr, uint32_t *attrlen,
 static int decode_attr_supported(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *bitmask)
 {
 	if (likely(bitmap[0] & FATTR4_WORD0_SUPPORTED_ATTRS)) {
-		decode_attr_bitmap(xdr, bitmask);
+		int ret;
+		ret = decode_attr_bitmap(xdr, bitmask);
+		if (unlikely(ret < 0))
+			return ret;
 		bitmap[0] &= ~FATTR4_WORD0_SUPPORTED_ATTRS;
 	} else
 		bitmask[0] = bitmask[1] = 0;