nfsd: #includes cleanup
Subsystems (3)
PATCH 1/1 nfsd: #includes cleanup
Hi Bruce
This time I've based the patchset on the:
git://linux-nfs.org/~bfields/linux.git for-2.6.33 branch
I was hoping to find that nfsd.h cleanup you sent to the mailing list the other day. But I don't see it. Should I rebase this work on some other branch? would you like to submit that patch, which made lots of sense in my opinion, and I'll wait and base this work on that? [On the other we might be able to move the complete nfsd.h to fs/nfsd/]
I have gone deeper and wider this time. And it is based on upcoming main-line, not pnfs tree like before. So it can actually be applied this time. Please lets decide on some time table because these things are moving targets.
I've removed the hunk from posix_acl.h that Trond did not like, I'll take care of that one, another time. (For late comers, posix_acl.h intimately fiddles with fs.h types but does not #include it)
With these patches Benny will suffer on his next rebase, both in conflicts and a few miss-compiling files, but it should be trivial to fix, I'll help.
The next step after these patches, is to move lots of files from include/linux/nfsd/* to fs/nfsd/... I have found that the include/linux/nfsd/xdr?.h, nfsd.h and cache.h are all essentially only used by fs/nfsd source, except they are *wrongly* included by some compat.c source files. Once I'll fix that they can move.
[PATCH 1/6] nfsd: Remove nfsfh.h dependency on sunrpc
Bruce, what about this patch. It is independent of the others. Currently sunrpc is loaded/unloaded with nfs or nfsd. exportfs and filesystems don't expect to need it. It works because depmod is doing it's job. Do we really need this dprintk?
[PATCH 2/6] sunrpc: Clean never used include files
[PATCH 3/6] nfsd: Fix independence of a few nfsd related headers
I wish these two patches could go through Bruce's tree as one group. Who's ACKs do we need on them? Trond?
[PATCH 4/6] nfsd: Headers Independence and include cleanups [PATCH 5/6] nfsd: Source files #include cleanups
Please review these patches to understand the motivation behind all this.
[PATCH 6/6] compat.c: Remove dependence on nfsd private headers
This patch is a beginning of the next step to move the nfsd private headers to inside the fs/nfsd subdirectory.
Thanks
Boaz
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/6 nfsd: Remove nfsfh.h dependency on sunrpc
In reply to a message not in the archivelinux/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 / unexpected.
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.
@@ -329,9 +328,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.5.2
PATCH 2/6 sunrpc: Clean never used include files
In reply to a message not in the archiveRemove include of two headers never used by this file. Doing so exposed a missing #include <linux/types.h> in include/linux/sunrpc/rpc_rdma.h.
I did not see any other users dependency but if exist they should be fixed since these headers are totally irrelevant to here.
--- include/linux/sunrpc/debug.h | 3 --- include/linux/sunrpc/rpc_rdma.h | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-)
include/linux/sunrpc/debug.h +0 -3
@@ -28,9 +28,6 @@#ifdef __KERNEL__ -#include <linux/timer.h> -#include <linux/workqueue.h> -/* * Enable RPC debugging/profiling. */
include/linux/sunrpc/rpc_rdma.h +2 -0
@@ -40,6 +40,8 @@ #ifndef _LINUX_SUNRPC_RPC_RDMA_H #define _LINUX_SUNRPC_RPC_RDMA_H +#include <linux/types.h> + struct rpcrdma_segment { __be32 rs_handle; /* Registered memory handle */ __be32 rs_length; /* Length of the chunk in bytes */
Signature · 1 line
1.6.5.2
PATCH 3/6 nfsd: Fix independence of a few nfsd related headers
In reply to a message not in the archiveAn header should be compilation independent, .i.e pull in any header who's declarations are directly used by this header. And not let users re-include all it's dependencies all over again.
[At the end of the day what's the use of a header if it does
not have more then one user?]
--- include/linux/nfs_xdr.h | 1 + include/linux/nfsacl.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
include/linux/nfs_xdr.h +1 -0
@@ -2,6 +2,7 @@#define _LINUX_NFS_XDR_H#include <linux/nfsacl.h> +#include <linux/nfs3.h> /* * To change the maximum rsize and wsize supported by the NFS client, adjust
include/linux/nfsacl.h +1 -0
@@ -29,6 +29,7 @@#ifdef __KERNEL__#include <linux/posix_acl.h> +#include <linux/sunrpc/xdr.h> /* Maximum number of ACL entries over NFS */ #define NFS_ACL_MAX_ENTRIES 1024
Signature · 1 line
1.6.5.2
PATCH 4/6 nfsd: Headers Independence and include cleanups
In reply to a message not in the archive* Add includes that are directly used by headers
* Remove includes that are not needed
These are the changes made:
[xdr.h]
struct nfsd_readdirres has an embedded struct readdir_cd from nfsd.h fixing that we can drop other includes
[xdr4.h]
embedded types defined both at state.h and nfsd.h
[syscall.h]
After export.h fix none of these stuff is needed.
fix extra space in # include <> statement
[stats.h]
does not need <linux/nfs4.h> but was export to user-mode so I don't touch it
[state.h]
embedded types from nfsfh.h like struct knfsd_fh. bringing that eliminates the need for all other includes
[nfsfh.h]
directly manipulating types from sunrpc/svc.h.
Removed Other unused headers.
[nfsd.h]
removed unused headers include
[export.h]
lots of sunrpc/svc.h types and a single prototype declaration with pointer from nfsfh.h, but all users of export.h do need nfsfh.h any way. remove now un-needed include.
[const.h]
Unfixed (not independent)
[cache.h]
could do with a forward declaration of "struct svc_rqst;" from sunrpc/svc.h but all users absolutely will need sunrpc/svc.h it is easier overall this way.
--- include/linux/nfsd/cache.h | 3 +-- include/linux/nfsd/export.h | 2 +- include/linux/nfsd/nfsd.h | 4 ---- include/linux/nfsd/nfsfh.h | 3 +-- include/linux/nfsd/state.h | 4 +--- include/linux/nfsd/syscall.h | 8 +------- include/linux/nfsd/xdr.h | 3 +-- include/linux/nfsd/xdr4.h | 3 ++- 8 files changed, 8 insertions(+), 22 deletions(-)
include/linux/nfsd/cache.h +1 -2
@@ -10,8 +10,7 @@#ifndef NFSCACHE_H #define NFSCACHE_H -#include <linux/in.h> -#include <linux/uio.h> +#include <linux/sunrpc/svc.h> /* * Representation of a reply cache entry.
include/linux/nfsd/export.h +1 -1
@@ -12,7 +12,7 @@# include <linux/types.h> #ifdef __KERNEL__ -# include <linux/in.h> +# include <linux/nfsd/nfsfh.h> #endif /*
include/linux/nfsd/nfsd.h +0 -4
@@ -11,13 +11,9 @@#define LINUX_NFSD_NFSD_H #include <linux/types.h> -#include <linux/unistd.h> -#include <linux/fs.h> -#include <linux/posix_acl.h> #include <linux/mount.h> #include <linux/nfsd/debug.h> -#include <linux/nfsd/nfsfh.h> #include <linux/nfsd/export.h> #include <linux/nfsd/stats.h> /*
include/linux/nfsd/nfsfh.h +1 -2
@@ -16,8 +16,7 @@# include <linux/types.h> #ifdef __KERNEL__ -# include <linux/string.h> -# include <linux/fs.h> +# include <linux/sunrpc/svc.h> #endif #include <linux/nfsd/const.h>
include/linux/nfsd/state.h +1 -3
@@ -37,9 +37,7 @@ #ifndef _NFSD4_STATE_H #define _NFSD4_STATE_H -#include <linux/list.h> -#include <linux/kref.h> -#include <linux/sunrpc/clnt.h> +#include <linux/nfsd/nfsfh.h> typedef struct { u32 cl_boot;
include/linux/nfsd/syscall.h +1 -7
@@ -9,14 +9,8 @@#ifndef NFSD_SYSCALL_H #define NFSD_SYSCALL_H -# include <linux/types.h> -#ifdef __KERNEL__ -# include <linux/in.h> -#endif -#include <linux/posix_types.h> -#include <linux/nfsd/const.h> +#include <linux/types.h> #include <linux/nfsd/export.h> -#include <linux/nfsd/nfsfh.h> /* * Version of the syscall interface
include/linux/nfsd/xdr.h +1 -2
@@ -7,9 +7,8 @@ #ifndef LINUX_NFSD_H #define LINUX_NFSD_H -#include <linux/fs.h> #include <linux/vfs.h> -#include <linux/nfs.h> +#include <linux/nfsd/nfsd.h> struct nfsd_fhandle { struct svc_fh fh;
include/linux/nfsd/xdr4.h +2 -1
@@ -39,7 +39,8 @@#ifndef _LINUX_NFSD_XDR4_H#define _LINUX_NFSD_XDR4_H -#include <linux/nfs4.h> +#include <linux/nfsd/state.h> +#include <linux/nfsd/nfsd.h> #define NFSD4_MAX_TAGLEN 128#define XDR_LEN (n) (((n) + 3) & ~3)
Signature · 1 line
1.6.5.2
PATCH 5/6 nfsd: Source files #include cleanups
In reply to Boaz HarroshNow that the headers are fixed and carry their own wait, all fs/nfsd/ source files can include a minimal set of headers. and still compile just fine.
This patch should improve the compilation speed of the nfsd module.
--- fs/nfsd/auth.c | 4 ---- fs/nfsd/export.c | 15 --------------- fs/nfsd/lockd.c | 5 ----- fs/nfsd/nfs2acl.c | 4 ---- fs/nfsd/nfs3acl.c | 3 --- fs/nfsd/nfs3proc.c | 13 ------------- fs/nfsd/nfs3xdr.c | 11 ----------- fs/nfsd/nfs4acl.c | 8 -------- fs/nfsd/nfs4callback.c | 13 ------------- fs/nfsd/nfs4idmap.c | 15 +-------------- fs/nfsd/nfs4proc.c | 10 ---------- fs/nfsd/nfs4recover.c | 8 -------- fs/nfsd/nfs4state.c | 15 --------------- fs/nfsd/nfs4xdr.c | 12 +----------- fs/nfsd/nfscache.c | 8 -------- fs/nfsd/nfsctl.c | 25 ------------------------- fs/nfsd/nfsfh.c | 9 --------- fs/nfsd/nfsproc.c | 13 ------------- fs/nfsd/nfssvc.c | 15 --------------- fs/nfsd/nfsxdr.c | 8 -------- fs/nfsd/stats.c | 5 ----- fs/nfsd/vfs.c | 21 --------------------- 22 files changed, 2 insertions(+), 238 deletions(-)
fs/nfsd/auth.c +0 -4
@@ -4,12 +4,8 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/types.h> #include <linux/sched.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/svcauth.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/export.h> #include "auth.h" int nfsexp_flags (struct svc_rqst *rqstp,struct svc_export *exp)
fs/nfsd/export.c +0 -15
@@ -14,27 +14,12 @@* Copyright (C) 1995, 1996 Olaf Kirch, <[email protected]> */ -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/stat.h> -#include <linux/in.h> -#include <linux/seq_file.h> -#include <linux/syscalls.h> -#include <linux/rwsem.h> -#include <linux/dcache.h> #include <linux/namei.h> -#include <linux/mount.h> -#include <linux/hash.h> #include <linux/module.h> #include <linux/exportfs.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/nfsfh.h> #include <linux/nfsd/syscall.h> -#include <linux/lockd/bind.h> -#include <linux/sunrpc/msg_prot.h> -#include <linux/sunrpc/gss_api.h> #include <net/ipv6.h> #define NFSDDBG_FACILITY NFSDDBG_EXPORT
fs/nfsd/lockd.c +0 -5
@@ -8,12 +8,7 @@* Copyright (C) 1996, Olaf Kirch <[email protected]> */ -#include <linux/types.h> -#include <linux/fs.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/lockd/bind.h>
fs/nfsd/nfs2acl.c +0 -4
@@ -6,13 +6,9 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/sunrpc/svc.h> -#include <linux/nfs.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> #include <linux/nfsd/xdr3.h> -#include <linux/posix_acl.h> #include <linux/nfsacl.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs3acl.c +0 -3
@@ -6,12 +6,9 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/sunrpc/svc.h> -#include <linux/nfs3.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr3.h> -#include <linux/posix_acl.h> #include <linux/nfsacl.h> #define RETURN_STATUS (st) { resp->status = (st); return (st); }
fs/nfsd/nfs3proc.c +0 -13
@@ -6,25 +6,12 @@* Copyright (C) 1996, 1997, 1998 Olaf Kirch <[email protected]> */ -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> #include <linux/fs.h> #include <linux/ext2_fs.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/major.h> #include <linux/magic.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr3.h> -#include <linux/nfs3.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs3xdr.c +0 -11
@@ -8,18 +8,7 @@* 2003-08-09 Jamie Lokier: Use htonl() for nanoseconds, not htons()! */ -#include <linux/types.h> -#include <linux/time.h> -#include <linux/nfs3.h> -#include <linux/list.h> -#include <linux/spinlock.h> -#include <linux/dcache.h> #include <linux/namei.h> -#include <linux/mm.h> -#include <linux/vfs.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr3.h> #include "auth.h"
fs/nfsd/nfs4acl.c +0 -8
@@ -36,15 +36,7 @@* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <linux/string.h> -#include <linux/slab.h> -#include <linux/list.h> -#include <linux/types.h> -#include <linux/fs.h> -#include <linux/module.h> #include <linux/nfs_fs.h> -#include <linux/posix_acl.h> -#include <linux/nfs4.h> #include <linux/nfs4_acl.h>
fs/nfsd/nfs4callback.c +0 -13
@@ -33,22 +33,9 @@* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <linux/module.h> -#include <linux/list.h> -#include <linux/inet.h> -#include <linux/errno.h> -#include <linux/delay.h> -#include <linux/sched.h> -#include <linux/kthread.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/state.h> -#include <linux/sunrpc/sched.h> -#include <linux/nfs4.h> -#include <linux/sunrpc/xprtsock.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4idmap.c +1 -14
@@ -35,22 +35,9 @@*/ #include <linux/module.h> -#include <linux/init.h> - -#include <linux/mm.h> -#include <linux/errno.h> -#include <linux/string.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfs.h> -#include <linux/nfs4.h> -#include <linux/nfs_fs.h> -#include <linux/nfs_page.h> -#include <linux/sunrpc/cache.h> #include <linux/nfsd_idmap.h> -#include <linux/list.h> -#include <linux/time.h> #include <linux/seq_file.h> -#include <linux/sunrpc/svcauth.h> +#include <linux/sched.h> /* * Cache entry
fs/nfsd/nfs4proc.c +0 -10
@@ -34,20 +34,10 @@* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include <linux/param.h> -#include <linux/major.h> -#include <linux/slab.h> #include <linux/file.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfs4.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> -#include <linux/nfs4_acl.h> -#include <linux/sunrpc/gss_api.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4recover.c +0 -8
@@ -33,20 +33,12 @@* */ -#include <linux/err.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfs4.h> #include <linux/nfsd/state.h> -#include <linux/nfsd/xdr4.h> -#include <linux/param.h> #include <linux/file.h> #include <linux/namei.h> -#include <asm/uaccess.h> -#include <linux/scatterlist.h> #include <linux/crypto.h> #include <linux/sched.h> -#include <linux/mount.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4state.c +0 -15
@@ -34,26 +34,11 @@* */ -#include <linux/param.h> -#include <linux/major.h> -#include <linux/slab.h> - -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/workqueue.h> #include <linux/smp_lock.h> -#include <linux/kthread.h> -#include <linux/nfs4.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> #include <linux/namei.h> #include <linux/swap.h> -#include <linux/mutex.h> -#include <linux/lockd/bind.h> -#include <linux/module.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/clnt.h>
fs/nfsd/nfs4xdr.c +1 -11
@@ -40,22 +40,12 @@* at the end of nfs4svc_decode_compoundargs. */ -#include <linux/param.h> -#include <linux/smp.h> -#include <linux/fs.h> #include <linux/namei.h> -#include <linux/vfs.h> +#include <linux/statfs.h> #include <linux/utsname.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> #include <linux/nfsd_idmap.h> -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> -#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/svcauth_gss.h> #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/nfscache.c +0 -8
@@ -10,14 +10,6 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/slab.h> -#include <linux/string.h> -#include <linux/spinlock.h> -#include <linux/list.h> - -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h>
fs/nfsd/nfsctl.c +0 -25
@@ -6,42 +6,17 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/module.h> - -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/fs.h> #include <linux/namei.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/syscalls.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/proc_fs.h> -#include <linux/seq_file.h> -#include <linux/pagemap.h> -#include <linux/init.h> -#include <linux/inet.h> -#include <linux/string.h> #include <linux/ctype.h> -#include <linux/nfs.h> #include <linux/nfsd_idmap.h> -#include <linux/lockd/bind.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> #include <linux/nfsd/syscall.h> #include <linux/lockd/lockd.h> #include <linux/sunrpc/clnt.h> -#include <asm/uaccess.h> -#include <net/ipv6.h> -/* * We have a single directory with 9 nodes in it. */
fs/nfsd/nfsfh.c +0 -9
@@ -9,17 +9,8 @@* ... and again Southern-Winter 2001 to support export_operations */ -#include <linux/slab.h> -#include <linux/fs.h> -#include <linux/unistd.h> -#include <linux/string.h> -#include <linux/stat.h> -#include <linux/dcache.h> #include <linux/exportfs.h> -#include <linux/mount.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/nfsd/nfsd.h> #include "auth.h"
fs/nfsd/nfsproc.c +0 -13
@@ -7,21 +7,8 @@* Copyright (C) 1995-1997 Olaf Kirch <[email protected]> */ -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/fs.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> #include <linux/namei.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr.h>
fs/nfsd/nfssvc.c +0 -15
@@ -8,30 +8,15 @@* Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]> */ -#include <linux/module.h> #include <linux/sched.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/nfs.h> -#include <linux/in.h> -#include <linux/uio.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/smp.h> #include <linux/freezer.h> #include <linux/fs_struct.h> -#include <linux/kthread.h> #include <linux/swap.h> -#include <linux/sunrpc/types.h> #include <linux/sunrpc/stats.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> -#include <linux/sunrpc/cache.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/stats.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/syscall.h> #include <linux/lockd/bind.h> #include <linux/nfsacl.h> #include <linux/seq_file.h>
fs/nfsd/nfsxdr.c +0 -8
@@ -6,15 +6,7 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/types.h> -#include <linux/time.h> -#include <linux/nfs.h> -#include <linux/vfs.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr.h> -#include <linux/mm.h> #include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/stats.c +0 -5
@@ -23,14 +23,9 @@* Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]> */ -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/stat.h> #include <linux/module.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/stats.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/stats.h>
fs/nfsd/vfs.c +0 -21
@@ -16,43 +16,22 @@* Zerocpy NFS support (C) 2002 Hirokazu Takahashi <[email protected]> */ -#include <linux/string.h> -#include <linux/time.h> -#include <linux/errno.h> #include <linux/fs.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/major.h> #include <linux/splice.h> -#include <linux/proc_fs.h> -#include <linux/stat.h> #include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/pagemap.h> -#include <linux/in.h> -#include <linux/module.h> #include <linux/namei.h> -#include <linux/vfs.h> -#include <linux/delay.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #ifdef CONFIG_NFSD_V3 -#include <linux/nfs3.h> #include <linux/nfsd/xdr3.h> #endif /* CONFIG_NFSD_V3 */ -#include <linux/nfsd/nfsfh.h> #include <linux/quotaops.h> #include <linux/fsnotify.h> -#include <linux/posix_acl.h> #include <linux/posix_acl_xattr.h> #include <linux/xattr.h> #ifdef CONFIG_NFSD_V4 -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> #include <linux/nfsd_idmap.h> -#include <linux/security.h> #endif /* CONFIG_NFSD_V4 */ #include <linux/jhash.h> #include <linux/ima.h>
Signature · 1 line
1.6.5.2
PATCH 6/6 compat.c: Remove dependence on nfsd private headers
In reply to a message not in the archiveTwo nfsd related headers where included but never actually used. The linux/nfsd/nfsd.h file will eventually be moved to fs/nfsd directory as it is only needed by nfsd itself.
There are 3 more compat.c files in the Kernel at other ARCHs that wrongly #include nfsd headers. Once these are fixed the headers can be moved.
--- fs/compat.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
fs/compat.c +0 -2
@@ -38,8 +38,6 @@#include <linux/dirent.h> #include <linux/fsnotify.h> #include <linux/highuid.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/syscall.h> #include <linux/personality.h> #include <linux/rwsem.h>
Signature · 1 line
1.6.5.2
Re: [pnfs] [PATCH 5/6] nfsd: Source files #include cleanups
In reply to a message not in the archiveQuoted 576 lines · Boaz Harrosh
Now that the headers are fixed and carry their own wait, all
fs/nfsd/source files can include a minimal set of headers. and still compile just fine.This patch should improve the compilation speed of the nfsd module.
Signed-off-by Boaz Harrosh <[email protected]>--- fs/nfsd/auth.c | 4 ---- fs/nfsd/export.c | 15 --------------- fs/nfsd/lockd.c | 5 ----- fs/nfsd/nfs2acl.c | 4 ---- fs/nfsd/nfs3acl.c | 3 --- fs/nfsd/nfs3proc.c | 13 ------------- fs/nfsd/nfs3xdr.c | 11 ----------- fs/nfsd/nfs4acl.c | 8 -------- fs/nfsd/nfs4callback.c | 13 ------------- fs/nfsd/nfs4idmap.c | 15 +-------------- fs/nfsd/nfs4proc.c | 10 ---------- fs/nfsd/nfs4recover.c | 8 -------- fs/nfsd/nfs4state.c | 15 --------------- fs/nfsd/nfs4xdr.c | 12 +----------- fs/nfsd/nfscache.c | 8 -------- fs/nfsd/nfsctl.c | 25 ------------------------- fs/nfsd/nfsfh.c | 9 --------- fs/nfsd/nfsproc.c | 13 ------------- fs/nfsd/nfssvc.c | 15 --------------- fs/nfsd/nfsxdr.c | 8 -------- fs/nfsd/stats.c | 5 ----- fs/nfsd/vfs.c | 21 --------------------- 22 files changed, 2 insertions(+), 238 deletions(-)fs/nfsd/auth.c +0
-4@@ -4,12 +4,8 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/types.h> #include <linux/sched.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/svcauth.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/export.h> #include "auth.h" int nfsexp_flags (struct svc_rqst *rqstp,struct svc_export *exp)fs/nfsd/export.c +0
-15@@ -14,27 +14,12 @@* Copyright (C) 1995, 1996 Olaf Kirch, <[email protected]> */ -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/stat.h> -#include <linux/in.h> -#include <linux/seq_file.h> -#include <linux/syscalls.h> -#include <linux/rwsem.h> -#include <linux/dcache.h> #include <linux/namei.h> -#include <linux/mount.h> -#include <linux/hash.h> #include <linux/module.h> #include <linux/exportfs.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/nfsfh.h> #include <linux/nfsd/syscall.h> -#include <linux/lockd/bind.h> -#include <linux/sunrpc/msg_prot.h> -#include <linux/sunrpc/gss_api.h> #include <net/ipv6.h> #define NFSDDBG_FACILITY NFSDDBG_EXPORTfs/nfsd/lockd.c +0
-5@@ -8,12 +8,7 @@* Copyright (C) 1996, Olaf Kirch <[email protected]> */ -#include <linux/types.h> -#include <linux/fs.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/lockd/bind.h> fs/nfsd/nfs2acl.c +0
-4@@ -6,13 +6,9 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/sunrpc/svc.h> -#include <linux/nfs.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> #include <linux/nfsd/xdr3.h> -#include <linux/posix_acl.h> #include <linux/nfsacl.h> #define NFSDDBG_FACILITY NFSDDBG_PROCfs/nfsd/nfs3acl.c +0
-3@@ -6,12 +6,9 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/sunrpc/svc.h> -#include <linux/nfs3.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr3.h> -#include <linux/posix_acl.h> #include <linux/nfsacl.h> #define RETURN_STATUS (st) { resp->status = (st); return (st); }fs/nfsd/nfs3proc.c +0
-13@@ -6,25 +6,12 @@* Copyright (C) 1996, 1997, 1998 Olaf Kirch <[email protected]> */ -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> #include <linux/fs.h> #include <linux/ext2_fs.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/major.h> #include <linux/magic.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr3.h> -#include <linux/nfs3.h> #define NFSDDBG_FACILITY NFSDDBG_PROCfs/nfsd/nfs3xdr.c +0
-11@@ -8,18 +8,7 @@* 2003-08-09 Jamie Lokier: Use htonl() for nanoseconds, not htons()! */ -#include <linux/types.h> -#include <linux/time.h> -#include <linux/nfs3.h> -#include <linux/list.h> -#include <linux/spinlock.h> -#include <linux/dcache.h> #include <linux/namei.h> -#include <linux/mm.h> -#include <linux/vfs.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr3.h> #include "auth.h" fs/nfsd/nfs4acl.c +0
-8@@ -36,15 +36,7 @@* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <linux/string.h> -#include <linux/slab.h> -#include <linux/list.h> -#include <linux/types.h> -#include <linux/fs.h> -#include <linux/module.h> #include <linux/nfs_fs.h> -#include <linux/posix_acl.h> -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> fs/nfsd/nfs4callback.c +0
-13@@ -33,22 +33,9 @@* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <linux/module.h> -#include <linux/list.h> -#include <linux/inet.h> -#include <linux/errno.h> -#include <linux/delay.h> -#include <linux/sched.h> -#include <linux/kthread.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/state.h> -#include <linux/sunrpc/sched.h> -#include <linux/nfs4.h> -#include <linux/sunrpc/xprtsock.h> #define NFSDDBG_FACILITY NFSDDBG_PROCfs/nfsd/nfs4idmap.c +1
-14@@ -35,22 +35,9 @@*/ #include <linux/module.h> -#include <linux/init.h> - -#include <linux/mm.h> -#include <linux/errno.h> -#include <linux/string.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfs.h> -#include <linux/nfs4.h> -#include <linux/nfs_fs.h> -#include <linux/nfs_page.h> -#include <linux/sunrpc/cache.h> #include <linux/nfsd_idmap.h> -#include <linux/list.h> -#include <linux/time.h> #include <linux/seq_file.h> -#include <linux/sunrpc/svcauth.h> +#include <linux/sched.h> /* * Cache entry fs/nfsd/nfs4proc.c +0
-10@@ -34,20 +34,10 @@* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include <linux/param.h> -#include <linux/major.h> -#include <linux/slab.h> #include <linux/file.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfs4.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> -#include <linux/nfs4_acl.h> -#include <linux/sunrpc/gss_api.h> #define NFSDDBG_FACILITY NFSDDBG_PROCfs/nfsd/nfs4recover.c +0
-8@@ -33,20 +33,12 @@* */ -#include <linux/err.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfs4.h> #include <linux/nfsd/state.h> -#include <linux/nfsd/xdr4.h> -#include <linux/param.h> #include <linux/file.h> #include <linux/namei.h> -#include <asm/uaccess.h> -#include <linux/scatterlist.h> #include <linux/crypto.h> #include <linux/sched.h> -#include <linux/mount.h> #define NFSDDBG_FACILITY NFSDDBG_PROCfs/nfsd/nfs4state.c +0
-15@@ -34,26 +34,11 @@* */ -#include <linux/param.h> -#include <linux/major.h> -#include <linux/slab.h> - -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/workqueue.h> #include <linux/smp_lock.h> -#include <linux/kthread.h> -#include <linux/nfs4.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> #include <linux/namei.h> #include <linux/swap.h> -#include <linux/mutex.h> -#include <linux/lockd/bind.h> -#include <linux/module.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/clnt.h> fs/nfsd/nfs4xdr.c +1
-11@@ -40,22 +40,12 @@* at the end of nfs4svc_decode_compoundargs. */ -#include <linux/param.h> -#include <linux/smp.h> -#include <linux/fs.h> #include <linux/namei.h> -#include <linux/vfs.h> +#include <linux/statfs.h> #include <linux/utsname.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> #include <linux/nfsd_idmap.h> -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> -#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/svcauth_gss.h> #define NFSDDBG_FACILITY NFSDDBG_XDRfs/nfsd/nfscache.c +0
-8@@ -10,14 +10,6 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/slab.h> -#include <linux/string.h> -#include <linux/spinlock.h> -#include <linux/list.h> - -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> fs/nfsd/nfsctl.c +0
-25@@ -6,42 +6,17 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/module.h> - -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/fs.h> #include <linux/namei.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/syscalls.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/proc_fs.h> -#include <linux/seq_file.h> -#include <linux/pagemap.h> -#include <linux/init.h> -#include <linux/inet.h> -#include <linux/string.h> #include <linux/ctype.h> -#include <linux/nfs.h> #include <linux/nfsd_idmap.h> -#include <linux/lockd/bind.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> #include <linux/nfsd/syscall.h> #include <linux/lockd/lockd.h> #include <linux/sunrpc/clnt.h> -#include <asm/uaccess.h> -#include <net/ipv6.h> -/* * We have a single directory with 9 nodes in it. */ fs/nfsd/nfsfh.c +0
-9@@ -9,17 +9,8 @@* ... and again Southern-Winter 2001 to support export_operations */ -#include <linux/slab.h> -#include <linux/fs.h> -#include <linux/unistd.h> -#include <linux/string.h> -#include <linux/stat.h> -#include <linux/dcache.h> #include <linux/exportfs.h> -#include <linux/mount.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/nfsd/nfsd.h> #include "auth.h" fs/nfsd/nfsproc.c +0
-13@@ -7,21 +7,8 @@* Copyright (C) 1995-1997 Olaf Kirch <[email protected]> */ -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/fs.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> #include <linux/namei.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr.h> fs/nfsd/nfssvc.c +0
-15@@ -8,30 +8,15 @@* Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]> */ -#include <linux/module.h> #include <linux/sched.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/nfs.h> -#include <linux/in.h> -#include <linux/uio.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/smp.h> #include <linux/freezer.h> #include <linux/fs_struct.h> -#include <linux/kthread.h> #include <linux/swap.h> -#include <linux/sunrpc/types.h> #include <linux/sunrpc/stats.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> -#include <linux/sunrpc/cache.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/stats.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/syscall.h> #include <linux/lockd/bind.h> #include <linux/nfsacl.h> #include <linux/seq_file.h> fs/nfsd/nfsxdr.c +0
-8@@ -6,15 +6,7 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/types.h> -#include <linux/time.h> -#include <linux/nfs.h> -#include <linux/vfs.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr.h> -#include <linux/mm.h> #include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_XDRfs/nfsd/stats.c +0
-5@@ -23,14 +23,9 @@* Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]> */ -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/stat.h> #include <linux/module.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/stats.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/stats.h> fs/nfsd/vfs.c +0
-7@@ -16,43 +16,22 @@* Zerocpy NFS support (C) 2002 Hirokazu Takahashi <[email protected]> */ -#include <linux/string.h> -#include <linux/time.h> -#include <linux/errno.h> #include <linux/fs.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/major.h> #include <linux/splice.h> -#include <linux/proc_fs.h> -#include <linux/stat.h>
fs/nfsd/vfs.c line 38
Quoted 10 lines
fs/nfsd/vfs.c +0
-8#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/pagemap.h> -#include <linux/in.h> -#include <linux/module.h> #include <linux/namei.h> -#include <linux/vfs.h> -#include <linux/delay.h>
This one is needed on some arches. This patch will have
to sit in linux-next for a while and collect some breakage. I'll monitor it's progress.
I'm sending a ver 2 patch.
Boaz
Quoted 20 lines
fs/nfsd/vfs.c +0
-6-#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #ifdef CONFIG_NFSD_V3 -#include <linux/nfs3.h> #include <linux/nfsd/xdr3.h> #endif /* CONFIG_NFSD_V3 */ -#include <linux/nfsd/nfsfh.h> #include <linux/quotaops.h> #include <linux/fsnotify.h> -#include <linux/posix_acl.h> #include <linux/posix_acl_xattr.h> #include <linux/xattr.h> #ifdef CONFIG_NFSD_V4 -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> #include <linux/nfsd_idmap.h> -#include <linux/security.h> #endif /* CONFIG_NFSD_V4 */ #include <linux/jhash.h> #include <linux/ima.h>
Quoted 9 lines · Boaz Harrosh
Hi Bruce
This time I've based the patchset on the:
git://linux-nfs.org/~bfields/linux.git for-2.6.33 branchI was hoping to find that
nfsd.hcleanup you sent to the mailing list the other day. But I don't see it. Should I rebase this work on some other branch?
Apologies, I applied it but hadn't pushed it out; done now. Could you rebase onto that?
--b.
Quoted 43 lines
would you like to submit that patch, which made lots of sense in my opinion, and I'll wait and base this work on that? [On the other we might be able to move the complete
nfsd.htofs/nfsd/]I have gone deeper and wider this time. And it is based on upcoming main-line, not pnfs tree like before. So it can actually be applied this time. Please lets decide on some time table because these things are moving targets.
I've removed the hunk from
posix_acl.hthat Trond did not like, I'll take care of that one, another time. (For late comers,posix_acl.hintimately fiddles withfs.htypes but does not #include it)With these patches Benny will suffer on his next rebase, both in conflicts and a few miss-compiling files, but it should be trivial to fix, I'll help.
The next step after these patches, is to move lots of files from
include/linux/nfsd/*tofs/nfsd/... I have found that the include/linux/nfsd/xdr?.h,nfsd.handcache.hare all essentially only used by fs/nfsd source, except they are *wrongly* included by somecompat.csource files. Once I'll fix that they can move.[PATCH 1/6] nfsd: Remove
nfsfh.hdependency on sunrpc
Bruce, what about this patch. It is independent of the others. Currently sunrpc is loaded/unloaded with nfs or nfsd. exportfs and filesystems don't expect to need it. It works because depmod is doing it's job. Do we really need this dprintk?[PATCH 2/6] sunrpc: Clean never used include files
[PATCH 3/6] nfsd: Fix independence of a few nfsd related headers
I wish these two patches could go through Bruce's tree as one group. Who's ACKs do we need on them? Trond?[PATCH 4/6] nfsd: Headers Independence and include cleanups [PATCH 5/6] nfsd: Source files #include cleanups
Please review these patches to understand the motivation behind all this.[PATCH 6/6]
compat.c: Remove dependence on nfsd private headers
This patch is a beginning of the next step to move the nfsd private headers to inside the fs/nfsd subdirectory.Thanks
Boaz
Re: [PATCH 1/6] nfsd: Remove nfsfh.h dependency on sunrpc
In reply to a message not in the archiveQuoted 5 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
"might cause"?
Does mere inclusion of this .h (without referencing fh_lock_nested() or its callers) actually create a dependency?
--b.
Quoted 34 lines
sunrpc which is unwanted / unexpected.
Remove the debug-print from
fh_lock()and avoid this dependency.Signed-off-by Boaz Harrosh <[email protected]>--- 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. @@ -329,9 +328,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.5.2
PATCH 5/6 nfsd: Source files #include cleanups
In reply to Boaz HarroshNow that the headers are fixed and carry their own wait, all fs/nfsd/ source files can include a minimal set of headers. and still compile just fine.
This patch should improve the compilation speed of the nfsd module.
--- fs/nfsd/auth.c | 4 ---- fs/nfsd/export.c | 15 --------------- fs/nfsd/lockd.c | 5 ----- fs/nfsd/nfs2acl.c | 4 ---- fs/nfsd/nfs3acl.c | 3 --- fs/nfsd/nfs3proc.c | 13 ------------- fs/nfsd/nfs3xdr.c | 11 ----------- fs/nfsd/nfs4acl.c | 8 -------- fs/nfsd/nfs4callback.c | 13 ------------- fs/nfsd/nfs4idmap.c | 15 +-------------- fs/nfsd/nfs4proc.c | 10 ---------- fs/nfsd/nfs4recover.c | 8 -------- fs/nfsd/nfs4state.c | 15 --------------- fs/nfsd/nfs4xdr.c | 12 +----------- fs/nfsd/nfscache.c | 8 -------- fs/nfsd/nfsctl.c | 25 ------------------------- fs/nfsd/nfsfh.c | 9 --------- fs/nfsd/nfsproc.c | 13 ------------- fs/nfsd/nfssvc.c | 15 --------------- fs/nfsd/nfsxdr.c | 8 -------- fs/nfsd/stats.c | 5 ----- fs/nfsd/vfs.c | 20 -------------------- 22 files changed, 2 insertions(+), 237 deletions(-)
fs/nfsd/auth.c +0 -4
@@ -4,12 +4,8 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/types.h> #include <linux/sched.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/svcauth.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/export.h> #include "auth.h" int nfsexp_flags (struct svc_rqst *rqstp,struct svc_export *exp)
fs/nfsd/export.c +0 -15
@@ -14,27 +14,12 @@* Copyright (C) 1995, 1996 Olaf Kirch, <[email protected]> */ -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/stat.h> -#include <linux/in.h> -#include <linux/seq_file.h> -#include <linux/syscalls.h> -#include <linux/rwsem.h> -#include <linux/dcache.h> #include <linux/namei.h> -#include <linux/mount.h> -#include <linux/hash.h> #include <linux/module.h> #include <linux/exportfs.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/nfsfh.h> #include <linux/nfsd/syscall.h> -#include <linux/lockd/bind.h> -#include <linux/sunrpc/msg_prot.h> -#include <linux/sunrpc/gss_api.h> #include <net/ipv6.h> #define NFSDDBG_FACILITY NFSDDBG_EXPORT
fs/nfsd/lockd.c +0 -5
@@ -8,12 +8,7 @@* Copyright (C) 1996, Olaf Kirch <[email protected]> */ -#include <linux/types.h> -#include <linux/fs.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/lockd/bind.h>
fs/nfsd/nfs2acl.c +0 -4
@@ -6,13 +6,9 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/sunrpc/svc.h> -#include <linux/nfs.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> #include <linux/nfsd/xdr3.h> -#include <linux/posix_acl.h> #include <linux/nfsacl.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs3acl.c +0 -3
@@ -6,12 +6,9 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/sunrpc/svc.h> -#include <linux/nfs3.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr3.h> -#include <linux/posix_acl.h> #include <linux/nfsacl.h> #define RETURN_STATUS (st) { resp->status = (st); return (st); }
fs/nfsd/nfs3proc.c +0 -13
@@ -6,25 +6,12 @@* Copyright (C) 1996, 1997, 1998 Olaf Kirch <[email protected]> */ -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> #include <linux/fs.h> #include <linux/ext2_fs.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/major.h> #include <linux/magic.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr3.h> -#include <linux/nfs3.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs3xdr.c +0 -11
@@ -8,18 +8,7 @@* 2003-08-09 Jamie Lokier: Use htonl() for nanoseconds, not htons()! */ -#include <linux/types.h> -#include <linux/time.h> -#include <linux/nfs3.h> -#include <linux/list.h> -#include <linux/spinlock.h> -#include <linux/dcache.h> #include <linux/namei.h> -#include <linux/mm.h> -#include <linux/vfs.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr3.h> #include "auth.h"
fs/nfsd/nfs4acl.c +0 -8
@@ -36,15 +36,7 @@* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <linux/string.h> -#include <linux/slab.h> -#include <linux/list.h> -#include <linux/types.h> -#include <linux/fs.h> -#include <linux/module.h> #include <linux/nfs_fs.h> -#include <linux/posix_acl.h> -#include <linux/nfs4.h> #include <linux/nfs4_acl.h>
fs/nfsd/nfs4callback.c +0 -13
@@ -33,22 +33,9 @@* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <linux/module.h> -#include <linux/list.h> -#include <linux/inet.h> -#include <linux/errno.h> -#include <linux/delay.h> -#include <linux/sched.h> -#include <linux/kthread.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/state.h> -#include <linux/sunrpc/sched.h> -#include <linux/nfs4.h> -#include <linux/sunrpc/xprtsock.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4idmap.c +1 -14
@@ -35,22 +35,9 @@*/ #include <linux/module.h> -#include <linux/init.h> - -#include <linux/mm.h> -#include <linux/errno.h> -#include <linux/string.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfs.h> -#include <linux/nfs4.h> -#include <linux/nfs_fs.h> -#include <linux/nfs_page.h> -#include <linux/sunrpc/cache.h> #include <linux/nfsd_idmap.h> -#include <linux/list.h> -#include <linux/time.h> #include <linux/seq_file.h> -#include <linux/sunrpc/svcauth.h> +#include <linux/sched.h> /* * Cache entry
fs/nfsd/nfs4proc.c +0 -10
@@ -34,20 +34,10 @@* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include <linux/param.h> -#include <linux/major.h> -#include <linux/slab.h> #include <linux/file.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfs4.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> -#include <linux/nfs4_acl.h> -#include <linux/sunrpc/gss_api.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4recover.c +0 -8
@@ -33,20 +33,12 @@* */ -#include <linux/err.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfs4.h> #include <linux/nfsd/state.h> -#include <linux/nfsd/xdr4.h> -#include <linux/param.h> #include <linux/file.h> #include <linux/namei.h> -#include <asm/uaccess.h> -#include <linux/scatterlist.h> #include <linux/crypto.h> #include <linux/sched.h> -#include <linux/mount.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4state.c +0 -15
@@ -34,26 +34,11 @@* */ -#include <linux/param.h> -#include <linux/major.h> -#include <linux/slab.h> - -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/workqueue.h> #include <linux/smp_lock.h> -#include <linux/kthread.h> -#include <linux/nfs4.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> #include <linux/namei.h> #include <linux/swap.h> -#include <linux/mutex.h> -#include <linux/lockd/bind.h> -#include <linux/module.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/clnt.h>
fs/nfsd/nfs4xdr.c +1 -11
@@ -40,22 +40,12 @@* at the end of nfs4svc_decode_compoundargs. */ -#include <linux/param.h> -#include <linux/smp.h> -#include <linux/fs.h> #include <linux/namei.h> -#include <linux/vfs.h> +#include <linux/statfs.h> #include <linux/utsname.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> #include <linux/nfsd_idmap.h> -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> -#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/svcauth_gss.h> #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/nfscache.c +0 -8
@@ -10,14 +10,6 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/slab.h> -#include <linux/string.h> -#include <linux/spinlock.h> -#include <linux/list.h> - -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h>
fs/nfsd/nfsctl.c +0 -25
@@ -6,42 +6,17 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/module.h> - -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/fs.h> #include <linux/namei.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/syscalls.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/proc_fs.h> -#include <linux/seq_file.h> -#include <linux/pagemap.h> -#include <linux/init.h> -#include <linux/inet.h> -#include <linux/string.h> #include <linux/ctype.h> -#include <linux/nfs.h> #include <linux/nfsd_idmap.h> -#include <linux/lockd/bind.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> #include <linux/nfsd/syscall.h> #include <linux/lockd/lockd.h> #include <linux/sunrpc/clnt.h> -#include <asm/uaccess.h> -#include <net/ipv6.h> -/* * We have a single directory with 9 nodes in it. */
fs/nfsd/nfsfh.c +0 -9
@@ -9,17 +9,8 @@* ... and again Southern-Winter 2001 to support export_operations */ -#include <linux/slab.h> -#include <linux/fs.h> -#include <linux/unistd.h> -#include <linux/string.h> -#include <linux/stat.h> -#include <linux/dcache.h> #include <linux/exportfs.h> -#include <linux/mount.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/nfsd/nfsd.h> #include "auth.h"
fs/nfsd/nfsproc.c +0 -13
@@ -7,21 +7,8 @@* Copyright (C) 1995-1997 Olaf Kirch <[email protected]> */ -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/fs.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> #include <linux/namei.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr.h>
fs/nfsd/nfssvc.c +0 -15
@@ -8,30 +8,15 @@* Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]> */ -#include <linux/module.h> #include <linux/sched.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/nfs.h> -#include <linux/in.h> -#include <linux/uio.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/smp.h> #include <linux/freezer.h> #include <linux/fs_struct.h> -#include <linux/kthread.h> #include <linux/swap.h> -#include <linux/sunrpc/types.h> #include <linux/sunrpc/stats.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> -#include <linux/sunrpc/cache.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/stats.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/syscall.h> #include <linux/lockd/bind.h> #include <linux/nfsacl.h> #include <linux/seq_file.h>
fs/nfsd/nfsxdr.c +0 -8
@@ -6,15 +6,7 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/types.h> -#include <linux/time.h> -#include <linux/nfs.h> -#include <linux/vfs.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr.h> -#include <linux/mm.h> #include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/stats.c +0 -5
@@ -23,14 +23,9 @@* Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]> */ -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/stat.h> #include <linux/module.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/stats.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/stats.h>
fs/nfsd/vfs.c +0 -20
@@ -16,43 +16,23 @@* Zerocpy NFS support (C) 2002 Hirokazu Takahashi <[email protected]> */ -#include <linux/string.h> -#include <linux/time.h> -#include <linux/errno.h> #include <linux/fs.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/major.h> #include <linux/splice.h> -#include <linux/proc_fs.h> -#include <linux/stat.h> #include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/pagemap.h> -#include <linux/in.h> -#include <linux/module.h> #include <linux/namei.h> -#include <linux/vfs.h> #include <linux/delay.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #ifdef CONFIG_NFSD_V3 -#include <linux/nfs3.h> #include <linux/nfsd/xdr3.h> #endif /* CONFIG_NFSD_V3 */ -#include <linux/nfsd/nfsfh.h> #include <linux/quotaops.h> #include <linux/fsnotify.h> -#include <linux/posix_acl.h> #include <linux/posix_acl_xattr.h> #include <linux/xattr.h> #ifdef CONFIG_NFSD_V4 -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> #include <linux/nfsd_idmap.h> -#include <linux/security.h> #endif /* CONFIG_NFSD_V4 */ #include <linux/jhash.h> #include <linux/ima.h>
Signature · 1 line
1.6.5.2
Re: [PATCH 1/6] nfsd: Remove nfsfh.h dependency on sunrpc
In reply to a message not in the archiveQuoted 7 lines · J. Bruce Fields
Quoted 5 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
Quoted 7 lines
"might cause"?
Does mere inclusion of this .h (without referencing
fh_lock_nested()or its callers) actually create a dependency?--b.
No, only if code actually uses fh_lock_nested it will cause a dependency. Which is only used in fs/nfsd/...
But I would like to discourage nfsd/debug.h at this level.
Should I move fh_lock_nested() and it's siblings to the new private vfs.h header you made, and get rid of it this way?
Boaz
Quoted 34 lines
Quoted 34 lines
sunrpc which is unwanted / unexpected.
Remove the debug-print from
fh_lock()and avoid this dependency.Signed-off-by Boaz Harrosh <[email protected]>--- 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. @@ -329,9 +328,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.5.2
Quoted 7 lines · J. Bruce Fields
Quoted 6 lines · Boaz Harrosh
Hi Bruce
This time I've based the patchset on the:
git://linux-nfs.org/~bfields/linux.git for-2.6.33 branch
Quoted 9 lines
Quoted 3 lines
I was hoping to find that
nfsd.hcleanup you sent to the mailing list the other day. But I don't see it. Should I rebase this work on some other branch?Apologies, I applied it but hadn't pushed it out; done now. Could you rebase onto that?
--b.
OK that wasn't so bad. I'm just re-posting that one patch which changed:
[PATCH 5/6 version3] nfsd: Source files #include cleanups
Note the version3.
Thanks
Boaz
Re: [pnfs] [PATCH 5/6 version3] nfsd: Source files #include cleanups
In reply to a message not in the archiveNow that the headers are fixed and carry their own wait, all fs/nfsd/ source files can include a minimal set of headers. and still compile just fine.
This patch should improve the compilation speed of the nfsd module.
--- fs/nfsd/auth.c | 4 ---- fs/nfsd/export.c | 15 --------------- fs/nfsd/lockd.c | 5 ----- fs/nfsd/nfs2acl.c | 4 ---- fs/nfsd/nfs3acl.c | 3 --- fs/nfsd/nfs3proc.c | 13 ------------- fs/nfsd/nfs3xdr.c | 11 ----------- fs/nfsd/nfs4acl.c | 8 -------- fs/nfsd/nfs4callback.c | 13 ------------- fs/nfsd/nfs4idmap.c | 15 +-------------- fs/nfsd/nfs4proc.c | 10 ---------- fs/nfsd/nfs4recover.c | 8 -------- fs/nfsd/nfs4state.c | 15 --------------- fs/nfsd/nfs4xdr.c | 12 +----------- fs/nfsd/nfscache.c | 8 -------- fs/nfsd/nfsctl.c | 25 ------------------------- fs/nfsd/nfsfh.c | 9 --------- fs/nfsd/nfsproc.c | 13 ------------- fs/nfsd/nfssvc.c | 15 --------------- fs/nfsd/nfsxdr.c | 8 -------- fs/nfsd/stats.c | 5 ----- fs/nfsd/vfs.c | 20 -------------------- 22 files changed, 2 insertions(+), 237 deletions(-)
fs/nfsd/auth.c +0 -4
@@ -4,12 +4,8 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/types.h> #include <linux/sched.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/svcauth.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/export.h> #include "auth.h" int nfsexp_flags (struct svc_rqst *rqstp,struct svc_export *exp)
fs/nfsd/export.c +0 -15
@@ -14,27 +14,12 @@* Copyright (C) 1995, 1996 Olaf Kirch, <[email protected]> */ -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/stat.h> -#include <linux/in.h> -#include <linux/seq_file.h> -#include <linux/syscalls.h> -#include <linux/rwsem.h> -#include <linux/dcache.h> #include <linux/namei.h> -#include <linux/mount.h> -#include <linux/hash.h> #include <linux/module.h> #include <linux/exportfs.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/nfsfh.h> #include <linux/nfsd/syscall.h> -#include <linux/lockd/bind.h> -#include <linux/sunrpc/msg_prot.h> -#include <linux/sunrpc/gss_api.h> #include <net/ipv6.h> #define NFSDDBG_FACILITY NFSDDBG_EXPORT
fs/nfsd/lockd.c +0 -5
@@ -8,12 +8,7 @@* Copyright (C) 1996, Olaf Kirch <[email protected]> */ -#include <linux/types.h> -#include <linux/fs.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/lockd/bind.h> #include "vfs.h"
fs/nfsd/nfs2acl.c +0 -4
@@ -6,13 +6,9 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/sunrpc/svc.h> -#include <linux/nfs.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> #include <linux/nfsd/xdr3.h> -#include <linux/posix_acl.h> #include <linux/nfsacl.h> #include "vfs.h"
fs/nfsd/nfs3acl.c +0 -3
@@ -6,12 +6,9 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/sunrpc/svc.h> -#include <linux/nfs3.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr3.h> -#include <linux/posix_acl.h> #include <linux/nfsacl.h> #include "vfs.h"
fs/nfsd/nfs3proc.c +0 -13
@@ -6,25 +6,12 @@* Copyright (C) 1996, 1997, 1998 Olaf Kirch <[email protected]> */ -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> #include <linux/fs.h> #include <linux/ext2_fs.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/major.h> #include <linux/magic.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr3.h> -#include <linux/nfs3.h> #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs3xdr.c +0 -11
@@ -8,18 +8,7 @@* 2003-08-09 Jamie Lokier: Use htonl() for nanoseconds, not htons()! */ -#include <linux/types.h> -#include <linux/time.h> -#include <linux/nfs3.h> -#include <linux/list.h> -#include <linux/spinlock.h> -#include <linux/dcache.h> #include <linux/namei.h> -#include <linux/mm.h> -#include <linux/vfs.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr3.h> #include "auth.h"
fs/nfsd/nfs4acl.c +0 -8
@@ -36,15 +36,7 @@* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <linux/string.h> -#include <linux/slab.h> -#include <linux/list.h> -#include <linux/types.h> -#include <linux/fs.h> -#include <linux/module.h> #include <linux/nfs_fs.h> -#include <linux/posix_acl.h> -#include <linux/nfs4.h> #include <linux/nfs4_acl.h>
fs/nfsd/nfs4callback.c +0 -13
@@ -33,22 +33,9 @@* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <linux/module.h> -#include <linux/list.h> -#include <linux/inet.h> -#include <linux/errno.h> -#include <linux/delay.h> -#include <linux/sched.h> -#include <linux/kthread.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/state.h> -#include <linux/sunrpc/sched.h> -#include <linux/nfs4.h> -#include <linux/sunrpc/xprtsock.h> #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4idmap.c +1 -14
@@ -35,22 +35,9 @@*/ #include <linux/module.h> -#include <linux/init.h> - -#include <linux/mm.h> -#include <linux/errno.h> -#include <linux/string.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfs.h> -#include <linux/nfs4.h> -#include <linux/nfs_fs.h> -#include <linux/nfs_page.h> -#include <linux/sunrpc/cache.h> #include <linux/nfsd_idmap.h> -#include <linux/list.h> -#include <linux/time.h> #include <linux/seq_file.h> -#include <linux/sunrpc/svcauth.h> +#include <linux/sched.h> /* * Cache entry
fs/nfsd/nfs4proc.c +0 -10
@@ -34,20 +34,10 @@* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include <linux/param.h> -#include <linux/major.h> -#include <linux/slab.h> #include <linux/file.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfs4.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> -#include <linux/nfs4_acl.h> -#include <linux/sunrpc/gss_api.h> #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4recover.c +0 -8
@@ -33,20 +33,12 @@* */ -#include <linux/err.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfs4.h> #include <linux/nfsd/state.h> -#include <linux/nfsd/xdr4.h> -#include <linux/param.h> #include <linux/file.h> #include <linux/namei.h> -#include <asm/uaccess.h> -#include <linux/scatterlist.h> #include <linux/crypto.h> #include <linux/sched.h> -#include <linux/mount.h> #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4state.c +0 -15
@@ -34,26 +34,11 @@* */ -#include <linux/param.h> -#include <linux/major.h> -#include <linux/slab.h> - -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/workqueue.h> #include <linux/smp_lock.h> -#include <linux/kthread.h> -#include <linux/nfs4.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> #include <linux/namei.h> #include <linux/swap.h> -#include <linux/mutex.h> -#include <linux/lockd/bind.h> -#include <linux/module.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/clnt.h> #include "vfs.h"
fs/nfsd/nfs4xdr.c +1 -11
@@ -40,22 +40,12 @@* at the end of nfs4svc_decode_compoundargs. */ -#include <linux/param.h> -#include <linux/smp.h> -#include <linux/fs.h> #include <linux/namei.h> -#include <linux/vfs.h> +#include <linux/statfs.h> #include <linux/utsname.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> #include <linux/nfsd_idmap.h> -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> -#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/svcauth_gss.h> #include "vfs.h"
fs/nfsd/nfscache.c +0 -8
@@ -10,14 +10,6 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/slab.h> -#include <linux/string.h> -#include <linux/spinlock.h> -#include <linux/list.h> - -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h>
fs/nfsd/nfsctl.c +0 -25
@@ -6,42 +6,17 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/module.h> - -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/fs.h> #include <linux/namei.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/syscalls.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/proc_fs.h> -#include <linux/seq_file.h> -#include <linux/pagemap.h> -#include <linux/init.h> -#include <linux/inet.h> -#include <linux/string.h> #include <linux/ctype.h> -#include <linux/nfs.h> #include <linux/nfsd_idmap.h> -#include <linux/lockd/bind.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> #include <linux/nfsd/syscall.h> #include <linux/lockd/lockd.h> #include <linux/sunrpc/clnt.h> -#include <asm/uaccess.h> -#include <net/ipv6.h> -/* * We have a single directory with 9 nodes in it. */
fs/nfsd/nfsfh.c +0 -9
@@ -9,17 +9,8 @@* ... and again Southern-Winter 2001 to support export_operations */ -#include <linux/slab.h> -#include <linux/fs.h> -#include <linux/unistd.h> -#include <linux/string.h> -#include <linux/stat.h> -#include <linux/dcache.h> #include <linux/exportfs.h> -#include <linux/mount.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/nfsd/nfsd.h> #include "vfs.h"
fs/nfsd/nfsproc.c +0 -13
@@ -7,21 +7,8 @@* Copyright (C) 1995-1997 Olaf Kirch <[email protected]> */ -#include <linux/linkage.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/fs.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> #include <linux/namei.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr.h> #include "vfs.h"
fs/nfsd/nfssvc.c +0 -15
@@ -8,30 +8,15 @@* Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]> */ -#include <linux/module.h> #include <linux/sched.h> -#include <linux/time.h> -#include <linux/errno.h> -#include <linux/nfs.h> -#include <linux/in.h> -#include <linux/uio.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/smp.h> #include <linux/freezer.h> #include <linux/fs_struct.h> -#include <linux/kthread.h> #include <linux/swap.h> -#include <linux/sunrpc/types.h> #include <linux/sunrpc/stats.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> -#include <linux/sunrpc/cache.h> #include <linux/nfsd/nfsd.h> -#include <linux/nfsd/stats.h> #include <linux/nfsd/cache.h> -#include <linux/nfsd/syscall.h> #include <linux/lockd/bind.h> #include <linux/nfsacl.h> #include <linux/seq_file.h>
fs/nfsd/nfsxdr.c +0 -8
@@ -6,15 +6,7 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/types.h> -#include <linux/time.h> -#include <linux/nfs.h> -#include <linux/vfs.h> -#include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr.h> -#include <linux/mm.h> #include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/stats.c +0 -5
@@ -23,14 +23,9 @@* Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]> */ -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/stat.h> #include <linux/module.h> -#include <linux/sunrpc/svc.h> #include <linux/sunrpc/stats.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/stats.h>
fs/nfsd/vfs.c +0 -20
@@ -16,43 +16,23 @@* Zerocpy NFS support (C) 2002 Hirokazu Takahashi <[email protected]> */ -#include <linux/string.h> -#include <linux/time.h> -#include <linux/errno.h> #include <linux/fs.h> #include <linux/file.h> -#include <linux/mount.h> -#include <linux/major.h> #include <linux/splice.h> -#include <linux/proc_fs.h> -#include <linux/stat.h> #include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/pagemap.h> -#include <linux/in.h> -#include <linux/module.h> #include <linux/namei.h> -#include <linux/vfs.h> #include <linux/delay.h> -#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #ifdef CONFIG_NFSD_V3 -#include <linux/nfs3.h> #include <linux/nfsd/xdr3.h> #endif /* CONFIG_NFSD_V3 */ -#include <linux/nfsd/nfsfh.h> #include <linux/quotaops.h> #include <linux/fsnotify.h> -#include <linux/posix_acl.h> #include <linux/posix_acl_xattr.h> #include <linux/xattr.h> #ifdef CONFIG_NFSD_V4 -#include <linux/nfs4.h> #include <linux/nfs4_acl.h> #include <linux/nfsd_idmap.h> -#include <linux/security.h> #endif /* CONFIG_NFSD_V4 */ #include <linux/jhash.h> #include <linux/ima.h>
Signature · 7 lines
1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] nfsd: Remove nfsfh.h dependency on sunrpc
In reply to Boaz HarroshQuoted 16 lines · Boaz Harrosh
Quoted 7 lines · J. Bruce Fields
Quoted 5 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) onQuoted 7 lines
"might cause"?
Does mere inclusion of this .h (without referencing
fh_lock_nested()or its callers) actually create a dependency?--b.
Quoted 7 lines
No, only if code actually uses
fh_lock_nestedit will cause a dependency. Which is only used infs/nfsd/...But I would like to discourage
nfsd/debug.hat this level.Should I move
fh_lock_nested()and it's siblings to the new privatevfs.hheader you made, and get rid of it this way?
Sure, that sounds reasonable.
--b.