[PATCH 1/1] NFS: fix ERR_PTR with un mapped NFSv4 error

[PATCH 1/1] NFS: fix ERR_PTR with un mapped NFSv4 error

[andros]

From: Andy Adamson <andros@netapp.com>

NFSv4 errors need to be mapped prior to ERR_PTR.

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/client.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 7547600..49f06ce 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1154,7 +1154,7 @@ struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data,
 error:
 	nfs_free_server(server);
 	dprintk("<-- nfs4_create_server() = error %d\n", error);
-	return ERR_PTR(error);
+	return ERR_PTR(nfs4_map_errors(error));
 }
 
 /*
@@ -1231,7 +1231,7 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
 error:
 	nfs_free_server(server);
 	dprintk("<-- nfs4_create_referral_server() = error %d\n", error);
-	return ERR_PTR(error);
+	return ERR_PTR(nfs4_map_errors(error));
 }
 
 #endif /* CONFIG_NFS_V4 */
@@ -1299,7 +1299,7 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source,
 out_free_server:
 	nfs_free_server(server);
 	dprintk("<-- nfs_clone_server() = error %d\n", error);
-	return ERR_PTR(error);
+	return ERR_PTR(nfs4_map_errors(error));
 }
 
 #ifdef CONFIG_PROC_FS
-- 
1.5.4.3

Re: [PATCH 1/1] NFS: fix ERR_PTR with un mapped NFSv4 error

[Benny Halevy]

Andy, I wonder if this actually needs to be done in
lower-level functions (e.g. nfs_probe_fsinfo).
I think that in general we should not let nfs errors
out of the layer immediately invoking the xdr routines.

Benny

On Nov. 27, 2008, 0:49 +0200, andros@netapp.com wrote:
> From: Andy Adamson <andros@netapp.com>
> 
> NFSv4 errors need to be mapped prior to ERR_PTR.
> 
> Signed-off-by: Andy Adamson <andros@netapp.com>
> ---
>  fs/nfs/client.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/nfs/client.c b/fs/nfs/client.c
> index 7547600..49f06ce 100644
> --- a/fs/nfs/client.c
> +++ b/fs/nfs/client.c
> @@ -1154,7 +1154,7 @@ struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data,
>  error:
>  	nfs_free_server(server);
>  	dprintk("<-- nfs4_create_server() = error %d\n", error);
> -	return ERR_PTR(error);
> +	return ERR_PTR(nfs4_map_errors(error));
>  }
>  
>  /*
> @@ -1231,7 +1231,7 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
>  error:
>  	nfs_free_server(server);
>  	dprintk("<-- nfs4_create_referral_server() = error %d\n", error);
> -	return ERR_PTR(error);
> +	return ERR_PTR(nfs4_map_errors(error));
>  }
>  
>  #endif /* CONFIG_NFS_V4 */
> @@ -1299,7 +1299,7 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source,
>  out_free_server:
>  	nfs_free_server(server);
>  	dprintk("<-- nfs_clone_server() = error %d\n", error);
> -	return ERR_PTR(error);
> +	return ERR_PTR(nfs4_map_errors(error));
>  }
>  
>  #ifdef CONFIG_PROC_FS

Re: [PATCH 1/1] NFS: fix ERR_PTR with un mapped NFSv4 error

[Trond Myklebust]

On Thu, 2008-11-27 at 09:15 +0200, Benny Halevy wrote:
> Andy, I wonder if this actually needs to be done in
> lower-level functions (e.g. nfs_probe_fsinfo).
> I think that in general we should not let nfs errors
> out of the layer immediately invoking the xdr routines.

I agree. We're not processing the NFSv4-specific errors at that level,
so why pass them up in the first place?

Cheers
  Trond
-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com