FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-03-07 04:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFS: Clean up decode_layoutrecall_args()

Browse Source 
Additionally, this change lets us cut out the goto by returning errors
immediately.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Anna Schumaker 2017-04-07 14:15:00 -04:00 committed by Trond Myklebust
parent 135a4ea0d9
commit c79d56d214
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fs/nfs/callback_xdr.c
View File

@ -227,10 +227,8 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp,
uint32_t iomode; uint32_t iomode;
p = read_buf(xdr, 4 * sizeof(uint32_t)); p = read_buf(xdr, 4 * sizeof(uint32_t));
if (unlikely(p == NULL)) { if (unlikely(p == NULL))
status = htonl(NFS4ERR_BADXDR); return htonl(NFS4ERR_BADXDR);
goto out;
}
args->cbl_layout_type = ntohl(*p++); args->cbl_layout_type = ntohl(*p++);
/* Depite the spec's xdr, iomode really belongs in the FILE switch, /* Depite the spec's xdr, iomode really belongs in the FILE switch,
@ -244,37 +242,23 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp,
args->cbl_range.iomode = iomode; args->cbl_range.iomode = iomode;
status = decode_fh(xdr, &args->cbl_fh); status = decode_fh(xdr, &args->cbl_fh);
if (unlikely(status != 0)) if (unlikely(status != 0))
goto out; return status;
p = read_buf(xdr, 2 * sizeof(uint64_t)); p = read_buf(xdr, 2 * sizeof(uint64_t));
if (unlikely(p == NULL)) { if (unlikely(p == NULL))
status = htonl(NFS4ERR_BADXDR); return htonl(NFS4ERR_BADXDR);
goto out;
}
p = xdr_decode_hyper(p, &args->cbl_range.offset); p = xdr_decode_hyper(p, &args->cbl_range.offset);
p = xdr_decode_hyper(p, &args->cbl_range.length); p = xdr_decode_hyper(p, &args->cbl_range.length);
status = decode_layout_stateid(xdr, &args->cbl_stateid); return decode_layout_stateid(xdr, &args->cbl_stateid);
if (unlikely(status != 0))
goto out;
} else if (args->cbl_recall_type == RETURN_FSID) { } else if (args->cbl_recall_type == RETURN_FSID) {
p = read_buf(xdr, 2 * sizeof(uint64_t)); p = read_buf(xdr, 2 * sizeof(uint64_t));
if (unlikely(p == NULL)) { if (unlikely(p == NULL))
status = htonl(NFS4ERR_BADXDR); return htonl(NFS4ERR_BADXDR);
goto out;
}
p = xdr_decode_hyper(p, &args->cbl_fsid.major); p = xdr_decode_hyper(p, &args->cbl_fsid.major);
p = xdr_decode_hyper(p, &args->cbl_fsid.minor); p = xdr_decode_hyper(p, &args->cbl_fsid.minor);
} else if (args->cbl_recall_type != RETURN_ALL) { } else if (args->cbl_recall_type != RETURN_ALL)
status = htonl(NFS4ERR_BADXDR); return htonl(NFS4ERR_BADXDR);
goto out; return 0;
}
dprintk("%s: ltype 0x%x iomode %d changed %d recall_type %d\n",
__func__,
args->cbl_layout_type, iomode,
args->cbl_layoutchanged, args->cbl_recall_type);
out:
dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
return status;
} }
static static