From: Andreas Gruenbacher The issuer of an RPC call should be able to tell the difference between an I/O error and program unavailable / program version unavailable / procedure unavailable. Return -ENOSYS for unavailable RPCs instead of -EIO. Only issue a program unavailable warning for program numbers other than the one for nfsacl: Clients with nfsacl support are quite common already; no need to clutter the syslog. Signed-off-by: Andreas Gruenbacher Signed-off-by: Olaf Kirch Signed-off-by: Andrew Morton --- 25-akpm/include/linux/nfs.h | 1 + 25-akpm/net/sunrpc/clnt.c | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff -puN include/linux/nfs.h~nfsacl-return-enosys-for-rpc-programs-that-are-unavailable include/linux/nfs.h --- 25/include/linux/nfs.h~nfsacl-return-enosys-for-rpc-programs-that-are-unavailable 2005-01-23 01:27:47.529080808 -0800 +++ 25-akpm/include/linux/nfs.h 2005-01-23 01:27:47.534080048 -0800 @@ -11,6 +11,7 @@ #include #define NFS_PROGRAM 100003 +#define NFSACL_PROGRAM 100227 #define NFS_PORT 2049 #define NFS_MAXDATA 8192 #define NFS_MAXPATHLEN 1024 diff -puN net/sunrpc/clnt.c~nfsacl-return-enosys-for-rpc-programs-that-are-unavailable net/sunrpc/clnt.c --- 25/net/sunrpc/clnt.c~nfsacl-return-enosys-for-rpc-programs-that-are-unavailable 2005-01-23 01:27:47.530080656 -0800 +++ 25-akpm/net/sunrpc/clnt.c 2005-01-23 01:27:47.536079744 -0800 @@ -988,10 +988,12 @@ call_verify(struct rpc_task *task) break; case RPC_MISMATCH: printk(KERN_WARNING "%s: RPC call version mismatch!\n", __FUNCTION__); - goto out_eio; + error = -ENOSYS; + goto out_err; default: printk(KERN_WARNING "%s: RPC call rejected, unknown error: %x\n", __FUNCTION__, n); - goto out_eio; + error = -ENOSYS; + goto out_err; } if (--len < 0) goto out_overflow; @@ -1041,23 +1043,28 @@ call_verify(struct rpc_task *task) case RPC_SUCCESS: return p; case RPC_PROG_UNAVAIL: - printk(KERN_WARNING "RPC: call_verify: program %u is unsupported by server %s\n", + if (task->tk_client->cl_prog != NFSACL_PROGRAM) { + printk(KERN_WARNING "RPC: call_verify: program %u is unsupported by server %s\n", (unsigned int)task->tk_client->cl_prog, task->tk_client->cl_server); - goto out_eio; + } + error = -ENOSYS; + goto out_err; case RPC_PROG_MISMATCH: printk(KERN_WARNING "RPC: call_verify: program %u, version %u unsupported by server %s\n", (unsigned int)task->tk_client->cl_prog, (unsigned int)task->tk_client->cl_vers, task->tk_client->cl_server); - goto out_eio; + error = -ENOSYS; + goto out_err; case RPC_PROC_UNAVAIL: printk(KERN_WARNING "RPC: call_verify: proc %p unsupported by program %u, version %u on server %s\n", task->tk_msg.rpc_proc, task->tk_client->cl_prog, task->tk_client->cl_vers, task->tk_client->cl_server); - goto out_eio; + error = -ENOSYS; + goto out_err; case RPC_GARBAGE_ARGS: dprintk("RPC: %4d %s: server saw garbage\n", task->tk_pid, __FUNCTION__); break; /* retry */ @@ -1075,7 +1082,6 @@ out_retry: return NULL; } printk(KERN_WARNING "RPC %s: retry failed, exit EIO\n", __FUNCTION__); -out_eio: error = -EIO; out_err: rpc_exit(task, error); _