nfsd: Remove nfsfh.h dependency on sunrpc
Subsystems (2)
PATCH 1/1 nfsd: Remove nfsfh.h dependency on sunrpc
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.
--- include/linux/nfsd/nfsfh.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
include/linux/nfsd/nfsfh.h +0 -4
@@ -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) {
Signature · 1 line
1.6.2.1
Quoted 11 lines · Boaz Harrosh
linux/nfsd/nfsfh.hdefines 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 <[email protected]>
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
Quoted 27 lines
--- include/linux/nfsd/nfsfh.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)include/linux/nfsd/nfsfh.h +0
-4@@ -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 1/1 nfsd: Remove nfsfh.h dependency on sunrpc
In reply to Boaz Harroshlinux/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.
--- 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(-)
fs/nfsd/pnfsd_lexp.c +2 -1
@@ -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_PNFSstruct sockaddr pnfsd_lexp_addr;
fs/nfsd/spnfs_com.c +2 -1
@@ -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 *,
include/linux/nfsd/nfsfh.h +0 -4
@@ -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) {
Signature · 1 line
1.6.2.1