Re: [pnfs] [PATCH] SQUASHME: pnfsd-exofs: Change layoutget return codes

[Boaz Harrosh <bharrosh@panasas.com>]

On 02/10/2010 10:24 AM, Boaz Harrosh 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@panasas.com>

Rrrr I spoke to soon.

Andy, Benny
This will not work, currently. All the nfserr_xxx constants are defined
if fs/nfsd/nfsd.h. 
(Why do they exist at all, why can't we use the client's definitions for these?)

At the minimum they need to move to include/linux/nfsd/export.h. But I say kill them
and use these from include/linux/nfs4.h. Added bonus these are enums, so prototype
of .layout_get() can change to return enum nfsstat4 and the compiler fixes all our
bugs.

I'm posting a second patch that uses "enum nfsstat4" constants in exofs which will
work just fine, but is really ugly on the documentation aspect of Andy's patch.

Bruce may I submit a patch that globally gets rid of all nfserr_* defines and uses
NFS4ERR_* in their place?

Cheers
Boaz

> ---
>  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..7a59614 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 = nfserr_toosmall;
>  		goto err;
>  	}
>  
>  	creds = kcalloc(el->s_numdevs, sizeof(*creds), GFP_KERNEL);
>  	if (!creds) {
> -		err = -ENOMEM;
> +		err = nfserr_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 = nfserr_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 = nfserr_layouttrylater;
>  
>  err:
>  	kfree(creds);