--- fs/nfsd/nfs4xdr.c

+++ fs/nfsd/nfs4xdr.c

@@ -323,8 +323,8 @@ nfsd4_decode_fattr(struct nfsd4_compound

READ_BUF(dummy32);

len += (XDR_QUADLEN(dummy32) << 2);

READMEM(buf, dummy32);

- if ((host_err = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid)))

- goto out_nfserr;

+ if ((status = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid)))

+ return status;

iattr->ia_valid |= ATTR_UID;

}

if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) {

@@ -334,8 +334,8 @@ nfsd4_decode_fattr(struct nfsd4_compound

READ_BUF(dummy32);

len += (XDR_QUADLEN(dummy32) << 2);

READMEM(buf, dummy32);

- if ((host_err = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid)))

- goto out_nfserr;

+ if ((status = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid)))

+ return status;

iattr->ia_valid |= ATTR_GID;

}

if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {

@@ -1187,8 +1187,6 @@ nfsd4_decode_create_session(struct nfsd4

READ_BUF(4);

READ32(dummy);

READ_BUF(dummy * 4);

- for (i = 0; i < dummy; ++i)

- READ32(dummy);

break;

case RPC_AUTH_GSS:

dprintk("RPC_AUTH_GSS callback secflavor "

@@ -1204,7 +1202,6 @@ nfsd4_decode_create_session(struct nfsd4

READ_BUF(4);

READ32(dummy);

READ_BUF(dummy);

- p += XDR_QUADLEN(dummy);

break;

default:

dprintk("Illegal callback secflavor\n");