On Feb. 10, 2010, 12:47 +0200, Boaz Harrosh <bharrosh@xxxxxxxxxxx> wrote:
> Dependent on patch from Andy:
> [PATCH 1/6] pnfsd: fix file system API layout_get error codes
>
> Change codes to nfs4.1 codes
>
> Signed-off-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
> ---
> fs/exofs/export.c | 10 ++++++----
> 1 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/fs/exofs/export.c b/fs/exofs/export.c
> index be3d54e..4a4e3a0 100644
> --- a/fs/exofs/export.c
> +++ b/fs/exofs/export.c
> @@ -95,13 +95,13 @@ static int exofs_layout_get(
> /* skip opaque size, will be filled-in later */
> start = exp_xdr_reserve_qwords(xdr, 1);
> if (!start) {
> - err = -E2BIG;
> + err = NFS4ERR_TOOSMALL;
> goto err;
> }
>
> creds = kcalloc(el->s_numdevs, sizeof(*creds), GFP_KERNEL);
> if (!creds) {
> - err = -ENOMEM;
> + err = NFS4ERR_LAYOUTTRYLATER;
> goto err;
> }
>
> @@ -134,8 +134,10 @@ static int exofs_layout_get(
> layout.olo_comps = creds;
>
> err = pnfs_osd_xdr_encode_layout(xdr, &layout);
> - if (err)
> + if (err) {
> + err = NFS4ERR_TOOSMALL; /*FIXME: Change osd_xdr error codes */
> goto err;
> + }
>
> exp_xdr_encode_opaque_len(start, xdr->p);
>
> @@ -146,7 +148,7 @@ static int exofs_layout_get(
> spin_unlock(&oi->i_layout_lock);
>
> if (in_recall)
> - err = -EAGAIN;
> + err = NFS4ERR_LAYOUTTRYLATER;
That should be NFS4ERR_RECALLCONFLICT...
I'll fix that in my tree.
Benny
>
> err:
> kfree(creds);
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
