[PATCH] nfsd: Remove nfsfh.h dependency on sunrpc

[PATCH] nfsd: Remove nfsfh.h dependency on sunrpc

[Boaz Harrosh]

linux/nfsd/nfsfh.h defines some low level types which
are needed by exportfs and though by filesystems.

In the file, fh_lock() uses the sunrpc dprint facility which
might cause a dependency of exportfs (and filesystems) on
sunrpc which is unwanted.

Remove the debug-print from fh_lock() and avoid this dependency.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
 include/linux/nfsd/nfsfh.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index 94c1aee..b91760c 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -20,7 +20,6 @@
 # include <linux/fs.h>
 #endif
 #include <linux/nfsd/const.h>
-#include <linux/nfsd/debug.h>
 
 /*
  * This is the old "dentry style" Linux NFSv2 file handle.
@@ -330,9 +329,6 @@ fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
 	struct dentry	*dentry = fhp->fh_dentry;
 	struct inode	*inode;
 
-	dfprintk(FILEOP, "nfsd: fh_lock(%s) locked = %d\n",
-			SVCFH_fmt(fhp), fhp->fh_locked);
-
 	BUG_ON(!dentry);
 
 	if (fhp->fh_locked) {
-- 
1.6.2.1

Re: [PATCH] nfsd: Remove nfsfh.h dependency on sunrpc

[Boaz Harrosh]

On 10/20/2009 04:35 PM, Boaz Harrosh wrote:
> linux/nfsd/nfsfh.h defines some low level types which
> are needed by exportfs and though by filesystems.
>
> In the file, fh_lock() uses the sunrpc dprint facility which
> might cause a dependency of exportfs (and filesystems) on
> sunrpc which is unwanted.
>
> Remove the debug-print from fh_lock() and avoid this dependency.
>
> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
>   
Bruce hi.

In light of the new patches Benny sent, and the new exportfs + xdr
facilities,
would you like this patch? Is that debugging-print still useful?

If you absolutely do need it, or anticipate other debugging needs, I
would like
to cook something special for exportfs + xdr guys and move nfsfh stuff
to that
debugging-prints.

Benny If this patch is accepted then we don't need the last patch I sent.

Thanks
Boaz

> ---
>  include/linux/nfsd/nfsfh.h |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
> index 94c1aee..b91760c 100644
> --- a/include/linux/nfsd/nfsfh.h
> +++ b/include/linux/nfsd/nfsfh.h
> @@ -20,7 +20,6 @@
>  # include <linux/fs.h>
>  #endif
>  #include <linux/nfsd/const.h>
> -#include <linux/nfsd/debug.h>
>  
>  /*
>   * This is the old "dentry style" Linux NFSv2 file handle.
> @@ -330,9 +329,6 @@ fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
>  	struct dentry	*dentry = fhp->fh_dentry;
>  	struct inode	*inode;
>  
> -	dfprintk(FILEOP, "nfsd: fh_lock(%s) locked = %d\n",
> -			SVCFH_fmt(fhp), fhp->fh_locked);
> -
>  	BUG_ON(!dentry);
>  
>  	if (fhp->fh_locked) {
>   

[PATCH version 2] nfsd: Remove nfsfh.h dependency on sunrpc

[Boaz Harrosh]

linux/nfsd/nfsfh.h defines some low level types which
are needed by exportfs and though by filesystems.

In the file, fh_lock() uses the sunrpc dprint facility which
might cause a dependency of exportfs (and filesystems) on
sunrpc which is unwanted.

Remove the debug-print from fh_lock() and avoid this dependency.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
 fs/nfsd/pnfsd_lexp.c       |    3 ++-
 fs/nfsd/spnfs_com.c        |    3 ++-
 include/linux/nfsd/nfsfh.h |    4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/nfsd/pnfsd_lexp.c b/fs/nfsd/pnfsd_lexp.c
index 23789d6..2bcb6b5 100644
--- a/fs/nfsd/pnfsd_lexp.c
+++ b/fs/nfsd/pnfsd_lexp.c
@@ -27,7 +27,8 @@
 #include <linux/nfsd/state.h>
 #include <linux/nfsd/pnfsd.h>
 #include <linux/nfsd/nfs4layoutxdr.h>
-
+#include <linux/nfsd/debug.h>
+ 
 #define NFSDDBG_FACILITY NFSDDBG_PNFS
 
 struct sockaddr pnfsd_lexp_addr;
diff --git a/fs/nfsd/spnfs_com.c b/fs/nfsd/spnfs_com.c
index f8b7b63..7c7d48d 100644
--- a/fs/nfsd/spnfs_com.c
+++ b/fs/nfsd/spnfs_com.c
@@ -58,7 +58,8 @@
 #include <linux/nfs_fs.h>
 
 #include <linux/nfsd4_spnfs.h>
-
+#include <linux/nfsd/debug.h>
+ 
 #define	NFSDDBG_FACILITY		NFSDDBG_PROC
 
 static ssize_t   spnfs_pipe_upcall(struct file *, struct rpc_pipe_msg *,
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index 94c1aee..b91760c 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -20,7 +20,6 @@
 # include <linux/fs.h>
 #endif
 #include <linux/nfsd/const.h>
-#include <linux/nfsd/debug.h>
 
 /*
  * This is the old "dentry style" Linux NFSv2 file handle.
@@ -330,9 +329,6 @@ fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
 	struct dentry	*dentry = fhp->fh_dentry;
 	struct inode	*inode;
 
-	dfprintk(FILEOP, "nfsd: fh_lock(%s) locked = %d\n",
-			SVCFH_fmt(fhp), fhp->fh_locked);
-
 	BUG_ON(!dentry);
 
 	if (fhp->fh_locked) {
-- 
1.6.2.1