1 files changed, 32 insertions, 17 deletions

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 5be2868c02f1..72f3bf1754ef 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -3097,7 +3097,8 @@ out_overflow:
         return -EIO;
 }
 
-static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
+static bool __decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected,
+                int *nfs_retval)
 {
         __be32 *p;
         uint32_t opnum;
@@ -3107,19 +3108,32 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
         if (unlikely(!p))
                 goto out_overflow;
         opnum = be32_to_cpup(p++);
-        if (opnum != expected) {
-                dprintk("nfs: Server returned operation"
-                        " %d but we issued a request for %d\n",
-                                opnum, expected);
-                return -EIO;
-        }
+        if (unlikely(opnum != expected))
+                goto out_bad_operation;
         nfserr = be32_to_cpup(p);
-        if (nfserr != NFS_OK)
-                return nfs4_stat_to_errno(nfserr);
-        return 0;
+        if (nfserr == NFS_OK)
+                *nfs_retval = 0;
+        else
+                *nfs_retval = nfs4_stat_to_errno(nfserr);
+        return true;
+out_bad_operation:
+        dprintk("nfs: Server returned operation"
+                " %d but we issued a request for %d\n",
+                        opnum, expected);
+        *nfs_retval = -EREMOTEIO;
+        return false;
 out_overflow:
         print_overflow_msg(__func__, xdr);
-        return -EIO;
+        *nfs_retval = -EIO;
+        return false;
+}
+
+static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
+{
+        int retval;
+
+        __decode_op_hdr(xdr, expected, &retval);
+        return retval;
 }
 
 /* Dummy routine */
@@ -3435,7 +3449,7 @@ static int decode_attr_aclsupport(struct xdr_stream *xdr, uint32_t *bitmap, uint
 {
         __be32 *p;
 
-        *res = ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL;
+        *res = 0;
         if (unlikely(bitmap[0] & (FATTR4_WORD0_ACLSUPPORT - 1U)))
                 return -EIO;
         if (likely(bitmap[0] & FATTR4_WORD0_ACLSUPPORT)) {
@@ -5001,11 +5015,12 @@ static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res)
         uint32_t savewords, bmlen, i;
         int status;
 
-        status = decode_op_hdr(xdr, OP_OPEN);
-        if (status != -EIO)
-                nfs_increment_open_seqid(status, res->seqid);
-        if (!status)
-                status = decode_stateid(xdr, &res->stateid);
+        if (!__decode_op_hdr(xdr, OP_OPEN, &status))
+                return status;
+        nfs_increment_open_seqid(status, res->seqid);
+        if (status)
+                return status;
+        status = decode_stateid(xdr, &res->stateid);
         if (unlikely(status))
                 return status;