Skip to contentSkip to conversation

NFS: fix ERR_PTR with un mapped NFSv4 error

PATCH In review [email protected] 3 participants 3 messages Nov 26, 2008 – Nov 27, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

From: Andy Adamson <[email protected]>

NFSv4 errors need to be mapped prior to ERR_PTR.

---
 fs/nfs/client.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
fs/nfs/client.c +3 -3
index 7547600..49f06ce 100644
@@ -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
Signature · 1 line
1.5.4.3
#1 lore raw

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

Quoted 40 lines · On Nov. 27, 2008, 0:49 +0200, [email protected] wrote:

From: Andy Adamson <[email protected]>

NFSv4 errors need to be mapped prior to ERR_PTR.

---
 fs/nfs/client.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
fs/nfs/client.c +3 -3
index 7547600..49f06ce 100644
@@ -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
#2 lore raw
Quoted 4 lines · 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.

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

Cheers
Trond

Signature · 6 lines
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com