The patch titled
NFS: improve debugging output in NFS in-kernel mount client
has been added to the -mm tree. Its filename is
nfs-improve-debugging-output-in-nfs-in-kernel-mount-client.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: NFS: improve debugging output in NFS in-kernel mount client
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nfs/mount_clnt.c | 18 +++++++++++++-----
include/linux/nfs_fs.h | 1 +
2 files changed, 14 insertions(+), 5 deletions(-)
diff -puN fs/nfs/mount_clnt.c~nfs-improve-debugging-output-in-nfs-in-kernel-mount-client fs/nfs/mount_clnt.c
--- a/fs/nfs/mount_clnt.c~nfs-improve-debugging-output-in-nfs-in-kernel-mount-client
+++ a/fs/nfs/mount_clnt.c
@@ -16,7 +16,7 @@
#include <linux/nfs_fs.h>
#ifdef RPC_DEBUG
-# define NFSDBG_FACILITY NFSDBG_ROOT
+# define NFSDBG_FACILITY NFSDBG_MOUNT
#endif
static struct rpc_program mnt_program;
@@ -72,8 +72,8 @@ int nfs_mount(struct sockaddr_in *addr,
char hostname[32];
int status;
- dprintk("NFS: nfs_mount(%08x:%s)\n",
- (unsigned)ntohl(addr->sin_addr.s_addr), path);
+ dprintk("NFS: %s: mounting" NIPQUAD_FMT ":%s\n",
+ __FUNCTION__, NIPQUAD(addr->sin_addr.s_addr), path);
sprintf(hostname, NIPQUAD_FMT, NIPQUAD(addr->sin_addr.s_addr));
mnt_clnt = mnt_create(hostname, addr, version, protocol);
@@ -86,10 +86,18 @@ int nfs_mount(struct sockaddr_in *addr,
msg.rpc_proc = &mnt_clnt->cl_procinfo[MNTPROC_MNT];
status = rpc_call_sync(mnt_clnt, &msg, 0);
- if (status < 0)
+ if (status < 0) {
+ dprintk("NFS: %s: rpc_call_sync returned %d\n",
+ __FUNCTION__, status);
return status;
- if (result.status != 0)
+ }
+ if (result.status != 0) {
+ dprintk("NFS: %s: server returned %d\n",
+ __FUNCTION__, result.status);
return -EACCES;
+ }
+ dprintk("NFS: %s: mount request succeeded\n",
+ __FUNCTION__);
return 0;
}
diff -puN include/linux/nfs_fs.h~nfs-improve-debugging-output-in-nfs-in-kernel-mount-client include/linux/nfs_fs.h
--- a/include/linux/nfs_fs.h~nfs-improve-debugging-output-in-nfs-in-kernel-mount-client
+++ a/include/linux/nfs_fs.h
@@ -556,6 +556,7 @@ extern void * nfs_root_data(void);
#define NFSDBG_ROOT 0x0080
#define NFSDBG_CALLBACK 0x0100
#define NFSDBG_CLIENT 0x0200
+#define NFSDBG_MOUNT 0x0400
#define NFSDBG_ALL 0xFFFF
#ifdef __KERNEL__
_
Patches currently in -mm which might be from chuck.lever@xxxxxxxxxx are
git-nfs.patch
nfs-refactor-ip-address-sanity-checks-in-nfs-client.patch
sunrpc-rename-rpcb_getport_external-routine.patch
sunrpc-rename-rpcb_getport-to-be-consistent-with-new-rpcb_getport_sync-name.patch
nfs-remake-nfsroot_mount-as-a-permanent-part-of-nfs-client.patch
nfs-clean-up-in-kernel-nfs-mount.patch
nfs-improve-debugging-output-in-nfs-in-kernel-mount-client.patch
nfs-new-infrastructure-for-nfs-client-in-kernel-mount-option-parsing.patch
nfs-add-functions-to-parse-nfs-mount-options-to-fs-nfs-superc.patch
nfs-implement-nfsv2-3-in-kernel-mount-option-parsing.patch
nfs-add-functions-to-parse-nfs4-mount-options-to-fs-nfs-superc.patch
nfs-move-nfs_copy_user_string.patch
nfs-more-nfs4-in-kernel-mount-option-parsing-infrastructure.patch
nfs-integrate-support-for-processing-nfs4-mount-options-in-fs-nfs-superc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
