nfsd: #includes cleanup
Subsystems (6)
cover nfsd: #includes cleanup
Hi Bruce
I'm reposting the all set together
There are two patches that people have said will go through other trees (see below). So either wait with patch 12/12 after they get into Linus. Or also submit them through nfsd, it should not cause any problems to post the same patch from two sub-trees, right?
(For the things done here please let it sit in linux-next for
a couple of nights)
[PATCH 01/12] nfsd: Remove nfsfh.h dependency on sunrpc [PATCH 02/12] sunrpc: Clean never used include files [PATCH 03/12] nfsd: Fix independence of a few nfsd related headers [PATCH 04/12] nfsd: Headers Independence and include cleanups [PATCH 05/12] nfsd: Source files #include cleanups
First batch
[PATCH 06/12] compat.c: Remove dependence on nfsd private headers [PATCH 07/12] parsic: remove un-used nfsd #includes
This patch we have ACK on
[PATCH 08/12] sparc: remove un-used nfsd #includes [PATCH 09/12] s390: remove un-used nfsd #includes
These two were reported as submitted into ARCH tree for 2.6.33
[PATCH 10/12] lockd: Remove un-used nfsd headers #includes [PATCH 11/12] vfs: nfsctl.c un-used nfsd #includes
[PATCH 12/12] nfsd: Move private headers to source directory
this patch is the only one that depends on all the other parts, and need all patches in. (And will cause Benny's tree to adjust)
Thanks
Boaz
PATCH 1/12 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 / 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
Re: [PATCH 01/12] nfsd: Remove nfsfh.h dependency on sunrpc
Quoted 8 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 / unexpected.Remove the debug-print from
fh_lock()and avoid this dependency.
"might cause a dependency" is a little vague.
Applied but just with the comment that we don't seem to use the dprintk anyway.
--b.
Quoted 31 lines
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 2/12 sunrpc: Clean never used include files
In reply to Boaz HarroshRemove 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/12 nfsd: Fix independence of a few nfsd related headers
In reply to Boaz HarroshAn 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/12 nfsd: Headers Independence and include cleanups
In reply to Boaz Harrosh* 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/12 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> #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 · 1 line
1.6.5.2
PATCH 6/12 compat.c: Remove dependence on nfsd private headers
In reply to Boaz HarroshTwo 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
PATCH 7/12 parsic: remove un-used nfsd #includes
In reply to Boaz HarroshSome un-used includes removed.
This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.
--- arch/parisc/kernel/sys_parisc32.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
arch/parisc/kernel/sys_parisc32.c +0 -6
@@ -26,13 +26,7 @@#include <linux/shm.h> #include <linux/slab.h> #include <linux/uio.h> -#include <linux/nfs_fs.h> #include <linux/ncp_fs.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> -#include <linux/nfsd/syscall.h> #include <linux/poll.h> #include <linux/personality.h> #include <linux/stat.h>
Signature · 1 line
1.6.5.2
PATCH 8/12 sparc: remove un-used nfsd #includes
In reply to Boaz HarroshSome un-used includes removed.
In an effort to cleanup nfsd headers and move private definitions to source directory.
--- arch/sparc/kernel/sys_sparc32.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
arch/sparc/kernel/sys_sparc32.c +0 -5
@@ -26,11 +26,6 @@#include <linux/nfs_fs.h> #include <linux/quota.h> #include <linux/module.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> -#include <linux/nfsd/syscall.h> #include <linux/poll.h> #include <linux/personality.h> #include <linux/stat.h>
Signature · 1 line
1.6.5.2
PATCH 9/12 s390: remove un-used nfsd #includes
In reply to Boaz HarroshSome un-used includes removed.
This patch is in an effort to cleanup nfsd headers and move private definitions to source directory.
--- arch/s390/kernel/compat_linux.c | 6 ------ arch/s390/kernel/compat_linux.h | 4 ---- 2 files changed, 0 insertions(+), 10 deletions(-)
arch/s390/kernel/compat_linux.c +0 -6
@@ -31,14 +31,8 @@#include <linux/shm.h> #include <linux/slab.h> #include <linux/uio.h> -#include <linux/nfs_fs.h> #include <linux/quota.h> #include <linux/module.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> -#include <linux/nfsd/syscall.h> #include <linux/poll.h> #include <linux/personality.h> #include <linux/stat.h>
arch/s390/kernel/compat_linux.h +0 -4
@@ -4,10 +4,6 @@#include <linux/compat.h> #include <linux/socket.h> #include <linux/syscalls.h> -#include <linux/nfs_fs.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/export.h> /* Macro that masks the high order bit of an 32 bit pointer and converts it*/ /* to a 64 bit pointer */
Signature · 1 line
1.6.5.2
PATCH 10/12 lockd: Remove un-used nfsd headers #includes
In reply to Boaz HarroshIn what history where these ever needed? Well not
any more.
--- fs/lockd/svc4proc.c | 4 ---- fs/lockd/svcproc.c | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-)
fs/lockd/svc4proc.c +0 -4
@@ -11,10 +11,6 @@#include <linux/time.h> #include <linux/slab.h> #include <linux/smp_lock.h> -#include <linux/in.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfsd/nfsd.h> #include <linux/lockd/lockd.h> #include <linux/lockd/share.h>
fs/lockd/svcproc.c +0 -4
@@ -11,10 +11,6 @@#include <linux/time.h> #include <linux/slab.h> #include <linux/smp_lock.h> -#include <linux/in.h> -#include <linux/sunrpc/svc.h> -#include <linux/sunrpc/clnt.h> -#include <linux/nfsd/nfsd.h> #include <linux/lockd/lockd.h> #include <linux/lockd/share.h>
Signature · 1 line
1.6.5.2
PATCH 11/12 vfs: nfsctl.c un-used nfsd #includes
In reply to Boaz HarroshOnly linux/nfsd/syscall.h is actually used. Remove the other nfsd #includes, so they can be moved to source directory.
--- fs/nfsctl.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
fs/nfsctl.c +0 -2
@@ -7,8 +7,6 @@#include <linux/types.h> #include <linux/file.h> #include <linux/fs.h> -#include <linux/sunrpc/svc.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/syscall.h> #include <linux/cred.h> #include <linux/sched.h>
Signature · 1 line
1.6.5.2
PATCH 12/12 nfsd: Move private headers to source directory
In reply to Boaz HarroshLots of include/linux/nfsd/* headers are only used by nfsd module. Move them to the source directory
---
fs/nfsd/auth.c | 2 +-
{include/linux => fs}/nfsd/cache.h | 0
fs/nfsd/export.c | 3 ++-
fs/nfsd/lockd.c | 2 +-
fs/nfsd/nfs2acl.c | 7 ++++---
fs/nfsd/nfs3acl.c | 7 ++++---
fs/nfsd/nfs3proc.c | 4 ++--
fs/nfsd/nfs3xdr.c | 2 +-
fs/nfsd/nfs4callback.c | 4 ++--
fs/nfsd/nfs4proc.c | 4 ++--
fs/nfsd/nfs4recover.c | 5 +++--
fs/nfsd/nfs4state.c | 2 +-
fs/nfsd/nfs4xdr.c | 3 ++-
fs/nfsd/nfscache.c | 4 ++--
fs/nfsd/nfsctl.c | 5 +++--
{include/linux => fs}/nfsd/nfsd.h | 0
fs/nfsd/nfsfh.c | 2 +-
fs/nfsd/nfsproc.c | 4 ++--
fs/nfsd/nfssvc.c | 4 ++--
fs/nfsd/nfsxdr.c | 2 +-
{include/linux => fs}/nfsd/state.h | 0
fs/nfsd/stats.c | 4 ++--
fs/nfsd/vfs.c | 18 ++++++++++--------
{include/linux => fs}/nfsd/xdr.h | 2 +-
{include/linux => fs}/nfsd/xdr3.h | 2 +-
{include/linux => fs}/nfsd/xdr4.h | 4 ++--
26 files changed, 52 insertions(+), 44 deletions(-)
rename {include/linux => fs}/nfsd/cache.h (100%)
rename {include/linux => fs}/nfsd/nfsd.h (100%)
rename {include/linux => fs}/nfsd/state.h (100%)
rename {include/linux => fs}/nfsd/xdr.h (99%)
rename {include/linux => fs}/nfsd/xdr3.h (99%)
rename {include/linux => fs}/nfsd/xdr4.h (99%)fs/nfsd/auth.c +1 -1
@@ -5,7 +5,7 @@*/ #include <linux/sched.h> -#include <linux/nfsd/nfsd.h> +#include "nfsd.h" #include "auth.h" int nfsexp_flags (struct svc_rqst *rqstp,struct svc_export *exp)
fs/nfsd/cache.h renamed from include/linux/nfsd/cache.h +0 -0
fs/nfsd/export.c +2 -1
@@ -18,10 +18,11 @@#include <linux/module.h> #include <linux/exportfs.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/syscall.h> #include <net/ipv6.h> +#include "nfsd.h" +#define NFSDDBG_FACILITY NFSDDBG_EXPORTtypedef struct auth_domain svc_client ;
fs/nfsd/lockd.c +1 -1
@@ -9,8 +9,8 @@*/ #include <linux/file.h> -#include <linux/nfsd/nfsd.h> #include <linux/lockd/bind.h> +#include "nfsd.h" #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_LOCKD
fs/nfsd/nfs2acl.c +4 -3
@@ -6,10 +6,11 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr3.h> +#include "nfsd.h" +/* FIXME: nfsacl.h is a broken header */ #include <linux/nfsacl.h> +#include "cache.h" +#include "xdr3.h" #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs3acl.c +4 -3
@@ -6,10 +6,11 @@* Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]> */ -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr3.h> +#include "nfsd.h" +/* FIXME: nfsacl.h is a broken header */ #include <linux/nfsacl.h> +#include "cache.h" +#include "xdr3.h" #include "vfs.h" #define RETURN_STATUS (st) { resp->status = (st); return (st); }
fs/nfsd/nfs3proc.c +2 -2
@@ -10,8 +10,8 @@#include <linux/ext2_fs.h> #include <linux/magic.h> -#include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr3.h> +#include "cache.h" +#include "xdr3.h" #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs3xdr.c +1 -1
@@ -9,7 +9,7 @@*/ #include <linux/namei.h> -#include <linux/nfsd/xdr3.h> +#include "xdr3.h" #include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/nfs4callback.c +2 -2
@@ -34,8 +34,8 @@*/ #include <linux/sunrpc/clnt.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/state.h> +#include "nfsd.h" +#include "state.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4proc.c +2 -2
@@ -36,8 +36,8 @@*/ #include <linux/file.h> -#include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr4.h> +#include "cache.h" +#include "xdr4.h" #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4recover.c +3 -2
@@ -33,12 +33,13 @@* */ -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/state.h> #include <linux/file.h> #include <linux/namei.h> #include <linux/crypto.h> #include <linux/sched.h> + +#include "nfsd.h" +#include "state.h" #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4state.c +1 -1
@@ -36,11 +36,11 @@#include <linux/file.h> #include <linux/smp_lock.h> -#include <linux/nfsd/xdr4.h> #include <linux/namei.h> #include <linux/swap.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/clnt.h> +#include "xdr4.h" #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PROC
fs/nfsd/nfs4xdr.c +2 -1
@@ -43,10 +43,11 @@#include <linux/namei.h> #include <linux/statfs.h> #include <linux/utsname.h> -#include <linux/nfsd/xdr4.h> #include <linux/nfsd_idmap.h> #include <linux/nfs4_acl.h> #include <linux/sunrpc/svcauth_gss.h> + +#include "xdr4.h" #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/nfscache.c +2 -2
@@ -10,8 +10,8 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> +#include "nfsd.h" +#include "cache.h" /* Size of reply cache. Common values are: * 4.3BSD: 128
fs/nfsd/nfsctl.c +3 -2
@@ -11,12 +11,13 @@#include <linux/nfsd_idmap.h> #include <linux/sunrpc/svcsock.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> #include <linux/nfsd/syscall.h> #include <linux/lockd/lockd.h> #include <linux/sunrpc/clnt.h> +#include "nfsd.h" +#include "cache.h" +/* * We have a single directory with 9 nodes in it. */
fs/nfsd/nfsd.h renamed from include/linux/nfsd/nfsd.h +0 -0
fs/nfsd/nfsfh.c +1 -1
@@ -12,7 +12,7 @@#include <linux/exportfs.h> #include <linux/sunrpc/svcauth_gss.h> -#include <linux/nfsd/nfsd.h> +#include "nfsd.h" #include "vfs.h" #include "auth.h"
fs/nfsd/nfsproc.c +2 -2
@@ -9,8 +9,8 @@#include <linux/namei.h> -#include <linux/nfsd/cache.h> -#include <linux/nfsd/xdr.h> +#include "cache.h" +#include "xdr.h" #include "vfs.h" typedef struct svc_rqst svc_rqst ;
fs/nfsd/nfssvc.c +2 -2
@@ -15,11 +15,11 @@#include <linux/sunrpc/stats.h> #include <linux/sunrpc/svcsock.h> -#include <linux/nfsd/nfsd.h> -#include <linux/nfsd/cache.h> #include <linux/lockd/bind.h> #include <linux/nfsacl.h> #include <linux/seq_file.h> +#include "nfsd.h" +#include "cache.h" #include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_SVC
fs/nfsd/nfsxdr.c +1 -1
@@ -6,7 +6,7 @@* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ -#include <linux/nfsd/xdr.h> +#include "xdr.h" #include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/state.h renamed from include/linux/nfsd/state.h +0 -0
fs/nfsd/stats.c +2 -2
@@ -25,11 +25,11 @@#include <linux/seq_file.h> #include <linux/module.h> -#include <linux/sunrpc/stats.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/stats.h> +#include "nfsd.h" +struct nfsd_stats nfsdstats;struct svc_stat nfsd_svcstats = { .program = &nfsd_program,
fs/nfsd/vfs.c +10 -8
@@ -22,23 +22,25 @@#include <linux/fcntl.h> #include <linux/namei.h> #include <linux/delay.h> -#include <linux/nfsd/nfsd.h> -#ifdef CONFIG_NFSD_V3 -#include <linux/nfsd/xdr3.h> -#endif /* CONFIG_NFSD_V3 */ #include <linux/quotaops.h> #include <linux/fsnotify.h> #include <linux/posix_acl_xattr.h> #include <linux/xattr.h> +#include <linux/jhash.h> +#include <linux/ima.h> +#include <asm/uaccess.h> + +#ifdef CONFIG_NFSD_V3 +#include "xdr3.h" +#endif /* CONFIG_NFSD_V3 */ +#ifdef CONFIG_NFSD_V4 #include <linux/nfs4_acl.h> #include <linux/nfsd_idmap.h> #endif /* CONFIG_NFSD_V4 */ -#include <linux/jhash.h> -#include <linux/ima.h> -#include "vfs.h" -#include <asm/uaccess.h> +#include "nfsd.h" +#include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_FILEOP
fs/nfsd/xdr.h renamed from include/linux/nfsd/xdr.h +1 -1
@@ -8,7 +8,7 @@#define LINUX_NFSD_H #include <linux/vfs.h> -#include <linux/nfsd/nfsd.h> +#include "nfsd.h" struct nfsd_fhandle {struct svc_fh fh;
fs/nfsd/xdr3.h renamed from include/linux/nfsd/xdr3.h +1 -1
@@ -9,7 +9,7 @@ #ifndef _LINUX_NFSD_XDR3_H #define _LINUX_NFSD_XDR3_H -#include <linux/nfsd/xdr.h> +#include "xdr.h" struct nfsd3_sattrargs { struct svc_fh fh;
fs/nfsd/xdr4.h renamed from include/linux/nfsd/xdr4.h +2 -2
@@ -39,8 +39,8 @@#ifndef _LINUX_NFSD_XDR4_H#define _LINUX_NFSD_XDR4_H -#include <linux/nfsd/state.h> -#include <linux/nfsd/nfsd.h> +#include "state.h" +#include "nfsd.h" #define NFSD4_MAX_TAGLEN 128#define XDR_LEN (n) (((n) + 3) & ~3)
Signature · 1 line
1.6.5.2
Quoted 5 lines · Boaz Harrosh
Hi Bruce
I'm reposting the all set together
Quoted 9 lines
There are two patches that people have said will go through other trees (see below). So either wait with patch 12/12 after they get into Linus. Or also submit them through nfsd, it should not cause any problems to post the same patch from two sub-trees, right?
(For the things done here please let it sit in linux-next for
a couple of nights)
Bruce, these are based on for-2.6.33 branch from your tree but I just realize that your "-next" branch is more advanced
Must I rebase? (But only Sunday it's getting late down here)
Boaz
Quoted 34 lines
[PATCH 01/12] nfsd: Remove
nfsfh.hdependency on sunrpc [PATCH 02/12] sunrpc: Clean never used include files [PATCH 03/12] nfsd: Fix independence of a few nfsd related headers [PATCH 04/12] nfsd: Headers Independence and include cleanups [PATCH 05/12] nfsd: Source files #include cleanupsFirst batch
[PATCH 06/12]
compat.c: Remove dependence on nfsd private headers [PATCH 07/12] parsic: remove un-used nfsd #includesThis patch we have ACK on
[PATCH 08/12] sparc: remove un-used nfsd #includes [PATCH 09/12] s390: remove un-used nfsd #includes
These two were reported as submitted into ARCH tree for 2.6.33
[PATCH 10/12] lockd: Remove un-used nfsd headers #includes [PATCH 11/12] vfs:
nfsctl.cun-used nfsd #includes[PATCH 12/12] nfsd: Move private headers to source directory
this patch is the only one that depends on all the other parts, and need all patches in. (And will cause Benny's tree to adjust)
Thanks
Boaz_______________________________________________
pNFS mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
Quoted 12 lines · Boaz Harrosh
Quoted 11 lines · Boaz Harrosh
Hi Bruce
I'm reposting the all set together
There are two patches that people have said will go through other trees (see below). So either wait with patch 12/12 after they get into Linus. Or also submit them through nfsd, it should not cause any problems to post the same patch from two sub-trees, right?
Quoted 8 lines
Quoted 3 lines
(For the things done here please let it sit in linux-next for
a couple of nights)Bruce, these are based on for-2.6.33 branch from your tree but I just realize that your "-next" branch is more advanced
Must I rebase? (But only Sunday it's getting late down here)
No, for-2.6.33 is the right one to work against. Thanks!
(I'm keeping two main branches with pending patches:
for-2.6.x: this is stuff I've committed. I never rewind/rebase this branch. This is almost always the branch to work against.
for-2.6.x-next: this everything in for-2.6.x, plus stuff I'm expecting to commit soon, but may be waiting for review or may still need minor tweaks. I may rewind this branch. I wouldn't recommend working against it. This is the branch that's pulled into linux-next.
)
--b.
Quoted 37 lines
Boaz
Quoted 34 lines
[PATCH 01/12] nfsd: Remove
nfsfh.hdependency on sunrpc [PATCH 02/12] sunrpc: Clean never used include files [PATCH 03/12] nfsd: Fix independence of a few nfsd related headers [PATCH 04/12] nfsd: Headers Independence and include cleanups [PATCH 05/12] nfsd: Source files #include cleanupsFirst batch
[PATCH 06/12]
compat.c: Remove dependence on nfsd private headers [PATCH 07/12] parsic: remove un-used nfsd #includesThis patch we have ACK on
[PATCH 08/12] sparc: remove un-used nfsd #includes [PATCH 09/12] s390: remove un-used nfsd #includes
These two were reported as submitted into ARCH tree for 2.6.33
[PATCH 10/12] lockd: Remove un-used nfsd headers #includes [PATCH 11/12] vfs:
nfsctl.cun-used nfsd #includes[PATCH 12/12] nfsd: Move private headers to source directory
this patch is the only one that depends on all the other parts, and need all patches in. (And will cause Benny's tree to adjust)
Thanks
Boaz_______________________________________________
pNFS mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
Quoted 4 lines · Boaz Harrosh
Hi Bruce
I'm reposting the all set together
Applied locally (but pushed to branch for linux-next), thanks.
--b.
Quoted 40 lines
There are two patches that people have said will go through other trees (see below). So either wait with patch 12/12 after they get into Linus. Or also submit them through nfsd, it should not cause any problems to post the same patch from two sub-trees, right?
(For the things done here please let it sit in linux-next for
a couple of nights)[PATCH 01/12] nfsd: Remove
nfsfh.hdependency on sunrpc [PATCH 02/12] sunrpc: Clean never used include files [PATCH 03/12] nfsd: Fix independence of a few nfsd related headers [PATCH 04/12] nfsd: Headers Independence and include cleanups [PATCH 05/12] nfsd: Source files #include cleanupsFirst batch
[PATCH 06/12]
compat.c: Remove dependence on nfsd private headers [PATCH 07/12] parsic: remove un-used nfsd #includesThis patch we have ACK on
[PATCH 08/12] sparc: remove un-used nfsd #includes [PATCH 09/12] s390: remove un-used nfsd #includes
These two were reported as submitted into ARCH tree for 2.6.33
[PATCH 10/12] lockd: Remove un-used nfsd headers #includes [PATCH 11/12] vfs:
nfsctl.cun-used nfsd #includes[PATCH 12/12] nfsd: Move private headers to source directory
this patch is the only one that depends on all the other parts, and need all patches in. (And will cause Benny's tree to adjust)
Thanks
Boaz
Quoted 7 lines · J. Bruce Fields
Quoted 4 lines · Boaz Harrosh
Hi Bruce
I'm reposting the all set together
Applied locally (but pushed to branch for linux-next), thanks.
We can also move most of nfsfh.h. I didn't try to figure out exactly what needed to be shared and why, but at least moved what obviously didn't need to be shared.
--b.
commit ad98ebfdb488cfce46bfc9d75825fdc2ff1a96b9
Author: J. Bruce Fields <[email protected]> Date: Fri Dec 4 19:36:06 2009 -0500
nfsd: move most of nfsfh.h to fs/nfsd
Most of this can be trivially moved to a private header as well.
fs/nfsd/export.c +1 -0
@@ -22,6 +22,7 @@#include <net/ipv6.h> #include "nfsd.h" +#include "nfsfh.h" #define NFSDDBG_FACILITY NFSDDBG_EXPORT
fs/nfsd/nfsfh.h new file +208 -0
208 lines not on this page · raw message
fs/nfsd/state.h +1 -0
@@ -38,6 +38,7 @@#define _NFSD4_STATE_H#include <linux/nfsd/nfsfh.h> +#include "nfsfh.h" typedef struct { u32 cl_boot;
fs/nfsd/vfs.h +2 -0
@@ -5,6 +5,8 @@#ifndef LINUX_NFSD_VFS_H #define LINUX_NFSD_VFS_H +#include "nfsfh.h" +/* * Flags for nfsd_permission */
fs/nfsd/xdr.h +1 -0
@@ -9,6 +9,7 @@#include <linux/vfs.h> #include "nfsd.h" +#include "nfsfh.h" struct nfsd_fhandle {struct svc_fh fh;
include/linux/nfsd/nfsfh.h +0 -199
205 lines not on this page · raw message
And as long as we're there....
--b.
commit 987dc26d179e6359d9c9d9250c060633d4306025
Author: J. Bruce Fields <[email protected]> Date: Fri Dec 4 19:49:00 2009 -0500
nfsd: remove pointless paths in file headers
The new .h files have paths at the top that are now out of date. While we're here, just remove all of those from fs/nfsd; they never served any purpose.
fs/nfsd/auth.c +1 -5
@@ -1,8 +1,4 @@ -/* -* linux/fs/nfsd/auth.c -* -* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> -*/ +/* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> */ #include <linux/sched.h> #include "nfsd.h"
fs/nfsd/cache.h +0 -2
@@ -1,6 +1,4 @@/* -* include/linux/nfsd/cache.h -* * Request reply cache. This was heavily inspired by the * implementation in 4.3BSD/4.4BSD. *
fs/nfsd/export.c +0 -2
@@ -1,7 +1,5 @@#define MSNFS /* HACK HACK */ /* -* linux/fs/nfsd/export.c -* * NFS exporting and validation. * * We maintain a list of clients, each of which has a list of
fs/nfsd/lockd.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/lockd.c -* * This file contains all the stubs needed when communicating with lockd. * This level of indirection is necessary so we can run nfsd+lockd without * requiring the nfs client to be compiled in/loaded, and vice versa.
fs/nfsd/nfs2acl.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfs2acl.c -* * Process version 2 NFSACL requests. * * Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]>
fs/nfsd/nfs3acl.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfs3acl.c -* * Process version 3 NFSACL requests. * * Copyright (C) 2002-2003 Andreas Gruenbacher <[email protected]>
fs/nfsd/nfs3proc.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfs3proc.c -* * Process version 3 NFS requests. * * Copyright (C) 1996, 1997, 1998 Olaf Kirch <[email protected]>
fs/nfsd/nfs3xdr.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfs3xdr.c -* * XDR support for nfsd/protocol version 3. * * Copyright (C) 1995, 1996, 1997 Olaf Kirch <[email protected]>
fs/nfsd/nfs4acl.c +0 -2
@@ -1,6 +1,4 @@/* -* fs/nfs4acl/acl.c -* * Common NFSv4 ACL handling code. * * Copyright (c) 2002, 2003 The Regents of the University of Michigan.
fs/nfsd/nfs4callback.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfs4callback.c -* * Copyright (c) 2001 The Regents of the University of Michigan. * All rights reserved. *
fs/nfsd/nfs4idmap.c +0 -2
@@ -1,6 +1,4 @@/* -* fs/nfsd/nfs4idmap.c -* * Mapping of UID/GIDs to name and vice versa. * * Copyright (c) 2002, 2003 The Regents of the University of
fs/nfsd/nfs4proc.c +0 -2
@@ -1,6 +1,4 @@/* -* fs/nfsd/nfs4proc.c -* * Server-side procedures for NFSv4. * * Copyright (c) 2002 The Regents of the University of Michigan.
fs/nfsd/nfs4recover.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfs4recover.c -* * Copyright (c) 2004 The Regents of the University of Michigan. * All rights reserved. *
fs/nfsd/nfs4state.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfs4state.c -* * Copyright (c) 2001 The Regents of the University of Michigan. * All rights reserved. *
fs/nfsd/nfscache.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfscache.c -* * Request reply cache. This is currently a global cache, but this may * change in the future and be a per-client cache. *
fs/nfsd/nfsctl.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfsctl.c -* * Syscall interface to knfsd. * * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
fs/nfsd/nfsd.h +0 -2
@@ -1,6 +1,4 @@/* -* linux/include/linux/nfsd/nfsd.h -* * Hodge-podge collection of knfsd-related stuff. * I will sort this out later. *
fs/nfsd/nfsfh.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfsfh.c -* * NFS server file handle treatment. * * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
fs/nfsd/nfsproc.c +0 -3
@@ -1,7 +1,4 @@/* -* nfsproc2.c Process version 2 NFS requests. -* linux/fs/nfsd/nfs2proc.c -* * Process version 2 NFS requests. * * Copyright (C) 1995-1997 Olaf Kirch <[email protected]>
fs/nfsd/nfssvc.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfssvc.c -* * Central processing for nfsd. * * Authors: Olaf Kirch ([email protected])
fs/nfsd/nfsxdr.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/nfsxdr.c -* * XDR support for nfsd * * Copyright (C) 1995, 1996 Olaf Kirch <[email protected]>
fs/nfsd/state.h +0 -2
@@ -1,6 +1,4 @@/* -* linux/include/nfsd/state.h -* * Copyright (c) 2001 The Regents of the University of Michigan. * All rights reserved. *
fs/nfsd/stats.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/fs/nfsd/stats.c -* * procfs-based user access to knfsd statistics * * /proc/net/rpc/nfsd
fs/nfsd/vfs.c +0 -2
@@ -1,7 +1,5 @@#define MSNFS /* HACK HACK */ /* -* linux/fs/nfsd/vfs.c -* * File operations used by nfsd. Some of these have been ripped from * other parts of the kernel because they weren't exported, others * are partial duplicates with added or changed functionality.
fs/nfsd/xdr.h +1 -5
@@ -1,8 +1,4 @@ -/* -* linux/include/linux/nfsd/xdr.h -* -* XDR types for nfsd. This is mainly a typing exercise. -*/ +/* XDR types for nfsd. This is mainly a typing exercise. */ #ifndef LINUX_NFSD_H #define LINUX_NFSD_H
fs/nfsd/xdr3.h +0 -2
@@ -1,6 +1,4 @@/* -* linux/include/linux/nfsd/xdr3.h -* * XDR types for NFSv3 in nfsd. * * Copyright (C) 1996-1998, Olaf Kirch <[email protected]>
fs/nfsd/xdr4.h +0 -2
@@ -1,6 +1,4 @@/* -* include/linux/nfsd/xdr4.h -* * Server-side types for NFSv4. * * Copyright (c) 2002 The Regents of the University of Michigan.
Quoted 5 lines · J. Bruce Fields
And as long as we're there....
--b.
commit
987dc26d179e6359d9c9d9250c060633d4306025
Quoted 9 lines
Author: J. Bruce Fields <[email protected]> Date: Fri Dec 4 19:49:00 2009 -0500nfsd: remove pointless paths in file headers
The new .h files have paths at the top that are now out of date. While we're here, just remove all of those from fs/nfsd; they never served any purpose.
Wawoo thanks. Sorry about that. I totally missed it.
Quoted 2 lines
Signed-off-by J. Bruce Fields <[email protected]>
Boaz