diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/auth.c | 4 | ||||
-rw-r--r-- | fs/nfsd/export.c | 15 | ||||
-rw-r--r-- | fs/nfsd/lockd.c | 5 | ||||
-rw-r--r-- | fs/nfsd/nfs2acl.c | 4 | ||||
-rw-r--r-- | fs/nfsd/nfs3acl.c | 3 | ||||
-rw-r--r-- | fs/nfsd/nfs3proc.c | 13 | ||||
-rw-r--r-- | fs/nfsd/nfs3xdr.c | 11 | ||||
-rw-r--r-- | fs/nfsd/nfs4acl.c | 8 | ||||
-rw-r--r-- | fs/nfsd/nfs4callback.c | 13 | ||||
-rw-r--r-- | fs/nfsd/nfs4idmap.c | 15 | ||||
-rw-r--r-- | fs/nfsd/nfs4proc.c | 10 | ||||
-rw-r--r-- | fs/nfsd/nfs4recover.c | 8 | ||||
-rw-r--r-- | fs/nfsd/nfs4state.c | 15 | ||||
-rw-r--r-- | fs/nfsd/nfs4xdr.c | 12 | ||||
-rw-r--r-- | fs/nfsd/nfscache.c | 8 | ||||
-rw-r--r-- | fs/nfsd/nfsctl.c | 25 | ||||
-rw-r--r-- | fs/nfsd/nfsfh.c | 9 | ||||
-rw-r--r-- | fs/nfsd/nfsproc.c | 13 | ||||
-rw-r--r-- | fs/nfsd/nfssvc.c | 15 | ||||
-rw-r--r-- | fs/nfsd/nfsxdr.c | 8 | ||||
-rw-r--r-- | fs/nfsd/stats.c | 5 | ||||
-rw-r--r-- | fs/nfsd/vfs.c | 20 |
22 files changed, 2 insertions, 237 deletions
diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c index 36fcabbf5186..ad354d284cf8 100644 --- a/fs/nfsd/auth.c +++ b/fs/nfsd/auth.c | |||
@@ -4,12 +4,8 @@ | |||
4 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 4 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/types.h> | ||
8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
9 | #include <linux/sunrpc/svc.h> | ||
10 | #include <linux/sunrpc/svcauth.h> | ||
11 | #include <linux/nfsd/nfsd.h> | 8 | #include <linux/nfsd/nfsd.h> |
12 | #include <linux/nfsd/export.h> | ||
13 | #include "auth.h" | 9 | #include "auth.h" |
14 | 10 | ||
15 | int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp) | 11 | int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp) |
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index b73baba3fb97..68e63f441444 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c | |||
@@ -14,27 +14,12 @@ | |||
14 | * Copyright (C) 1995, 1996 Olaf Kirch, <okir@monad.swb.de> | 14 | * Copyright (C) 1995, 1996 Olaf Kirch, <okir@monad.swb.de> |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/unistd.h> | ||
18 | #include <linux/slab.h> | ||
19 | #include <linux/stat.h> | ||
20 | #include <linux/in.h> | ||
21 | #include <linux/seq_file.h> | ||
22 | #include <linux/syscalls.h> | ||
23 | #include <linux/rwsem.h> | ||
24 | #include <linux/dcache.h> | ||
25 | #include <linux/namei.h> | 17 | #include <linux/namei.h> |
26 | #include <linux/mount.h> | ||
27 | #include <linux/hash.h> | ||
28 | #include <linux/module.h> | 18 | #include <linux/module.h> |
29 | #include <linux/exportfs.h> | 19 | #include <linux/exportfs.h> |
30 | 20 | ||
31 | #include <linux/sunrpc/svc.h> | ||
32 | #include <linux/nfsd/nfsd.h> | 21 | #include <linux/nfsd/nfsd.h> |
33 | #include <linux/nfsd/nfsfh.h> | ||
34 | #include <linux/nfsd/syscall.h> | 22 | #include <linux/nfsd/syscall.h> |
35 | #include <linux/lockd/bind.h> | ||
36 | #include <linux/sunrpc/msg_prot.h> | ||
37 | #include <linux/sunrpc/gss_api.h> | ||
38 | #include <net/ipv6.h> | 23 | #include <net/ipv6.h> |
39 | 24 | ||
40 | #define NFSDDBG_FACILITY NFSDDBG_EXPORT | 25 | #define NFSDDBG_FACILITY NFSDDBG_EXPORT |
diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c index 812bc64874f6..801ef7104ff4 100644 --- a/fs/nfsd/lockd.c +++ b/fs/nfsd/lockd.c | |||
@@ -8,12 +8,7 @@ | |||
8 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> | 8 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/types.h> | ||
12 | #include <linux/fs.h> | ||
13 | #include <linux/file.h> | 11 | #include <linux/file.h> |
14 | #include <linux/mount.h> | ||
15 | #include <linux/sunrpc/clnt.h> | ||
16 | #include <linux/sunrpc/svc.h> | ||
17 | #include <linux/nfsd/nfsd.h> | 12 | #include <linux/nfsd/nfsd.h> |
18 | #include <linux/lockd/bind.h> | 13 | #include <linux/lockd/bind.h> |
19 | #include "vfs.h" | 14 | #include "vfs.h" |
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index 38c883d48b02..a54628de7715 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c | |||
@@ -6,13 +6,9 @@ | |||
6 | * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de> | 6 | * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/sunrpc/svc.h> | ||
10 | #include <linux/nfs.h> | ||
11 | #include <linux/nfsd/nfsd.h> | 9 | #include <linux/nfsd/nfsd.h> |
12 | #include <linux/nfsd/cache.h> | 10 | #include <linux/nfsd/cache.h> |
13 | #include <linux/nfsd/xdr.h> | ||
14 | #include <linux/nfsd/xdr3.h> | 11 | #include <linux/nfsd/xdr3.h> |
15 | #include <linux/posix_acl.h> | ||
16 | #include <linux/nfsacl.h> | 12 | #include <linux/nfsacl.h> |
17 | #include "vfs.h" | 13 | #include "vfs.h" |
18 | 14 | ||
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c index 526d85a65f76..2f5c61bea908 100644 --- a/fs/nfsd/nfs3acl.c +++ b/fs/nfsd/nfs3acl.c | |||
@@ -6,12 +6,9 @@ | |||
6 | * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de> | 6 | * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/sunrpc/svc.h> | ||
10 | #include <linux/nfs3.h> | ||
11 | #include <linux/nfsd/nfsd.h> | 9 | #include <linux/nfsd/nfsd.h> |
12 | #include <linux/nfsd/cache.h> | 10 | #include <linux/nfsd/cache.h> |
13 | #include <linux/nfsd/xdr3.h> | 11 | #include <linux/nfsd/xdr3.h> |
14 | #include <linux/posix_acl.h> | ||
15 | #include <linux/nfsacl.h> | 12 | #include <linux/nfsacl.h> |
16 | #include "vfs.h" | 13 | #include "vfs.h" |
17 | 14 | ||
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 1a259d313e14..b694b4304544 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c | |||
@@ -6,25 +6,12 @@ | |||
6 | * Copyright (C) 1996, 1997, 1998 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1996, 1997, 1998 Olaf Kirch <okir@monad.swb.de> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/linkage.h> | ||
10 | #include <linux/time.h> | ||
11 | #include <linux/errno.h> | ||
12 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
13 | #include <linux/ext2_fs.h> | 10 | #include <linux/ext2_fs.h> |
14 | #include <linux/stat.h> | ||
15 | #include <linux/fcntl.h> | ||
16 | #include <linux/net.h> | ||
17 | #include <linux/in.h> | ||
18 | #include <linux/unistd.h> | ||
19 | #include <linux/slab.h> | ||
20 | #include <linux/major.h> | ||
21 | #include <linux/magic.h> | 11 | #include <linux/magic.h> |
22 | 12 | ||
23 | #include <linux/sunrpc/svc.h> | ||
24 | #include <linux/nfsd/nfsd.h> | ||
25 | #include <linux/nfsd/cache.h> | 13 | #include <linux/nfsd/cache.h> |
26 | #include <linux/nfsd/xdr3.h> | 14 | #include <linux/nfsd/xdr3.h> |
27 | #include <linux/nfs3.h> | ||
28 | #include "vfs.h" | 15 | #include "vfs.h" |
29 | 16 | ||
30 | #define NFSDDBG_FACILITY NFSDDBG_PROC | 17 | #define NFSDDBG_FACILITY NFSDDBG_PROC |
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index d0a2ce1b4324..623e13aa6259 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c | |||
@@ -8,18 +8,7 @@ | |||
8 | * 2003-08-09 Jamie Lokier: Use htonl() for nanoseconds, not htons()! | 8 | * 2003-08-09 Jamie Lokier: Use htonl() for nanoseconds, not htons()! |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/types.h> | ||
12 | #include <linux/time.h> | ||
13 | #include <linux/nfs3.h> | ||
14 | #include <linux/list.h> | ||
15 | #include <linux/spinlock.h> | ||
16 | #include <linux/dcache.h> | ||
17 | #include <linux/namei.h> | 11 | #include <linux/namei.h> |
18 | #include <linux/mm.h> | ||
19 | #include <linux/vfs.h> | ||
20 | #include <linux/sunrpc/xdr.h> | ||
21 | #include <linux/sunrpc/svc.h> | ||
22 | #include <linux/nfsd/nfsd.h> | ||
23 | #include <linux/nfsd/xdr3.h> | 12 | #include <linux/nfsd/xdr3.h> |
24 | #include "auth.h" | 13 | #include "auth.h" |
25 | 14 | ||
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index 6d9c6aabc85e..d6f0cea4babe 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c | |||
@@ -36,15 +36,7 @@ | |||
36 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include <linux/string.h> | ||
40 | #include <linux/slab.h> | ||
41 | #include <linux/list.h> | ||
42 | #include <linux/types.h> | ||
43 | #include <linux/fs.h> | ||
44 | #include <linux/module.h> | ||
45 | #include <linux/nfs_fs.h> | 39 | #include <linux/nfs_fs.h> |
46 | #include <linux/posix_acl.h> | ||
47 | #include <linux/nfs4.h> | ||
48 | #include <linux/nfs4_acl.h> | 40 | #include <linux/nfs4_acl.h> |
49 | 41 | ||
50 | 42 | ||
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 24e8d78f8dde..4fe396071b61 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c | |||
@@ -33,22 +33,9 @@ | |||
33 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 33 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <linux/module.h> | ||
37 | #include <linux/list.h> | ||
38 | #include <linux/inet.h> | ||
39 | #include <linux/errno.h> | ||
40 | #include <linux/delay.h> | ||
41 | #include <linux/sched.h> | ||
42 | #include <linux/kthread.h> | ||
43 | #include <linux/sunrpc/xdr.h> | ||
44 | #include <linux/sunrpc/svc.h> | ||
45 | #include <linux/sunrpc/clnt.h> | 36 | #include <linux/sunrpc/clnt.h> |
46 | #include <linux/sunrpc/svcsock.h> | ||
47 | #include <linux/nfsd/nfsd.h> | 37 | #include <linux/nfsd/nfsd.h> |
48 | #include <linux/nfsd/state.h> | 38 | #include <linux/nfsd/state.h> |
49 | #include <linux/sunrpc/sched.h> | ||
50 | #include <linux/nfs4.h> | ||
51 | #include <linux/sunrpc/xprtsock.h> | ||
52 | 39 | ||
53 | #define NFSDDBG_FACILITY NFSDDBG_PROC | 40 | #define NFSDDBG_FACILITY NFSDDBG_PROC |
54 | 41 | ||
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c index ba2c199592fd..8e518cd5ac1b 100644 --- a/fs/nfsd/nfs4idmap.c +++ b/fs/nfsd/nfs4idmap.c | |||
@@ -35,22 +35,9 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
38 | #include <linux/init.h> | ||
39 | |||
40 | #include <linux/mm.h> | ||
41 | #include <linux/errno.h> | ||
42 | #include <linux/string.h> | ||
43 | #include <linux/sunrpc/clnt.h> | ||
44 | #include <linux/nfs.h> | ||
45 | #include <linux/nfs4.h> | ||
46 | #include <linux/nfs_fs.h> | ||
47 | #include <linux/nfs_page.h> | ||
48 | #include <linux/sunrpc/cache.h> | ||
49 | #include <linux/nfsd_idmap.h> | 38 | #include <linux/nfsd_idmap.h> |
50 | #include <linux/list.h> | ||
51 | #include <linux/time.h> | ||
52 | #include <linux/seq_file.h> | 39 | #include <linux/seq_file.h> |
53 | #include <linux/sunrpc/svcauth.h> | 40 | #include <linux/sched.h> |
54 | 41 | ||
55 | /* | 42 | /* |
56 | * Cache entry | 43 | * Cache entry |
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index a468224a118f..61f682c77e7f 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c | |||
@@ -34,20 +34,10 @@ | |||
34 | * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 34 | * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
35 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | */ | 36 | */ |
37 | |||
38 | #include <linux/param.h> | ||
39 | #include <linux/major.h> | ||
40 | #include <linux/slab.h> | ||
41 | #include <linux/file.h> | 37 | #include <linux/file.h> |
42 | 38 | ||
43 | #include <linux/sunrpc/svc.h> | ||
44 | #include <linux/nfsd/nfsd.h> | ||
45 | #include <linux/nfsd/cache.h> | 39 | #include <linux/nfsd/cache.h> |
46 | #include <linux/nfs4.h> | ||
47 | #include <linux/nfsd/state.h> | ||
48 | #include <linux/nfsd/xdr4.h> | 40 | #include <linux/nfsd/xdr4.h> |
49 | #include <linux/nfs4_acl.h> | ||
50 | #include <linux/sunrpc/gss_api.h> | ||
51 | #include "vfs.h" | 41 | #include "vfs.h" |
52 | 42 | ||
53 | #define NFSDDBG_FACILITY NFSDDBG_PROC | 43 | #define NFSDDBG_FACILITY NFSDDBG_PROC |
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index c7a6b245c7ad..48742f243c25 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
@@ -33,20 +33,12 @@ | |||
33 | * | 33 | * |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <linux/err.h> | ||
37 | #include <linux/sunrpc/svc.h> | ||
38 | #include <linux/nfsd/nfsd.h> | 36 | #include <linux/nfsd/nfsd.h> |
39 | #include <linux/nfs4.h> | ||
40 | #include <linux/nfsd/state.h> | 37 | #include <linux/nfsd/state.h> |
41 | #include <linux/nfsd/xdr4.h> | ||
42 | #include <linux/param.h> | ||
43 | #include <linux/file.h> | 38 | #include <linux/file.h> |
44 | #include <linux/namei.h> | 39 | #include <linux/namei.h> |
45 | #include <asm/uaccess.h> | ||
46 | #include <linux/scatterlist.h> | ||
47 | #include <linux/crypto.h> | 40 | #include <linux/crypto.h> |
48 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
49 | #include <linux/mount.h> | ||
50 | #include "vfs.h" | 42 | #include "vfs.h" |
51 | 43 | ||
52 | #define NFSDDBG_FACILITY NFSDDBG_PROC | 44 | #define NFSDDBG_FACILITY NFSDDBG_PROC |
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 850960e5d626..1fe6e29fd500 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -34,26 +34,11 @@ | |||
34 | * | 34 | * |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include <linux/param.h> | ||
38 | #include <linux/major.h> | ||
39 | #include <linux/slab.h> | ||
40 | |||
41 | #include <linux/sunrpc/svc.h> | ||
42 | #include <linux/nfsd/nfsd.h> | ||
43 | #include <linux/nfsd/cache.h> | ||
44 | #include <linux/file.h> | 37 | #include <linux/file.h> |
45 | #include <linux/mount.h> | ||
46 | #include <linux/workqueue.h> | ||
47 | #include <linux/smp_lock.h> | 38 | #include <linux/smp_lock.h> |
48 | #include <linux/kthread.h> | ||
49 | #include <linux/nfs4.h> | ||
50 | #include <linux/nfsd/state.h> | ||
51 | #include <linux/nfsd/xdr4.h> | 39 | #include <linux/nfsd/xdr4.h> |
52 | #include <linux/namei.h> | 40 | #include <linux/namei.h> |
53 | #include <linux/swap.h> | 41 | #include <linux/swap.h> |
54 | #include <linux/mutex.h> | ||
55 | #include <linux/lockd/bind.h> | ||
56 | #include <linux/module.h> | ||
57 | #include <linux/sunrpc/svcauth_gss.h> | 42 | #include <linux/sunrpc/svcauth_gss.h> |
58 | #include <linux/sunrpc/clnt.h> | 43 | #include <linux/sunrpc/clnt.h> |
59 | #include "vfs.h" | 44 | #include "vfs.h" |
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index db0fc55670b3..2fa96821f5b5 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
@@ -40,22 +40,12 @@ | |||
40 | * at the end of nfs4svc_decode_compoundargs. | 40 | * at the end of nfs4svc_decode_compoundargs. |
41 | */ | 41 | */ |
42 | 42 | ||
43 | #include <linux/param.h> | ||
44 | #include <linux/smp.h> | ||
45 | #include <linux/fs.h> | ||
46 | #include <linux/namei.h> | 43 | #include <linux/namei.h> |
47 | #include <linux/vfs.h> | 44 | #include <linux/statfs.h> |
48 | #include <linux/utsname.h> | 45 | #include <linux/utsname.h> |
49 | #include <linux/sunrpc/xdr.h> | ||
50 | #include <linux/sunrpc/svc.h> | ||
51 | #include <linux/sunrpc/clnt.h> | ||
52 | #include <linux/nfsd/nfsd.h> | ||
53 | #include <linux/nfsd/state.h> | ||
54 | #include <linux/nfsd/xdr4.h> | 46 | #include <linux/nfsd/xdr4.h> |
55 | #include <linux/nfsd_idmap.h> | 47 | #include <linux/nfsd_idmap.h> |
56 | #include <linux/nfs4.h> | ||
57 | #include <linux/nfs4_acl.h> | 48 | #include <linux/nfs4_acl.h> |
58 | #include <linux/sunrpc/gss_api.h> | ||
59 | #include <linux/sunrpc/svcauth_gss.h> | 49 | #include <linux/sunrpc/svcauth_gss.h> |
60 | #include "vfs.h" | 50 | #include "vfs.h" |
61 | 51 | ||
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index 4638635c5d87..96694b8345ef 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c | |||
@@ -10,14 +10,6 @@ | |||
10 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 10 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/time.h> | ||
15 | #include <linux/slab.h> | ||
16 | #include <linux/string.h> | ||
17 | #include <linux/spinlock.h> | ||
18 | #include <linux/list.h> | ||
19 | |||
20 | #include <linux/sunrpc/svc.h> | ||
21 | #include <linux/nfsd/nfsd.h> | 13 | #include <linux/nfsd/nfsd.h> |
22 | #include <linux/nfsd/cache.h> | 14 | #include <linux/nfsd/cache.h> |
23 | 15 | ||
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 5c01fc148ce8..e4f49fd6af44 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
@@ -6,42 +6,17 @@ | |||
6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/module.h> | ||
10 | |||
11 | #include <linux/linkage.h> | ||
12 | #include <linux/time.h> | ||
13 | #include <linux/errno.h> | ||
14 | #include <linux/fs.h> | ||
15 | #include <linux/namei.h> | 9 | #include <linux/namei.h> |
16 | #include <linux/fcntl.h> | ||
17 | #include <linux/net.h> | ||
18 | #include <linux/in.h> | ||
19 | #include <linux/syscalls.h> | ||
20 | #include <linux/unistd.h> | ||
21 | #include <linux/slab.h> | ||
22 | #include <linux/proc_fs.h> | ||
23 | #include <linux/seq_file.h> | ||
24 | #include <linux/pagemap.h> | ||
25 | #include <linux/init.h> | ||
26 | #include <linux/inet.h> | ||
27 | #include <linux/string.h> | ||
28 | #include <linux/ctype.h> | 10 | #include <linux/ctype.h> |
29 | 11 | ||
30 | #include <linux/nfs.h> | ||
31 | #include <linux/nfsd_idmap.h> | 12 | #include <linux/nfsd_idmap.h> |
32 | #include <linux/lockd/bind.h> | ||
33 | #include <linux/sunrpc/svc.h> | ||
34 | #include <linux/sunrpc/svcsock.h> | 13 | #include <linux/sunrpc/svcsock.h> |
35 | #include <linux/nfsd/nfsd.h> | 14 | #include <linux/nfsd/nfsd.h> |
36 | #include <linux/nfsd/cache.h> | 15 | #include <linux/nfsd/cache.h> |
37 | #include <linux/nfsd/xdr.h> | ||
38 | #include <linux/nfsd/syscall.h> | 16 | #include <linux/nfsd/syscall.h> |
39 | #include <linux/lockd/lockd.h> | 17 | #include <linux/lockd/lockd.h> |
40 | #include <linux/sunrpc/clnt.h> | 18 | #include <linux/sunrpc/clnt.h> |
41 | 19 | ||
42 | #include <asm/uaccess.h> | ||
43 | #include <net/ipv6.h> | ||
44 | |||
45 | /* | 20 | /* |
46 | * We have a single directory with 9 nodes in it. | 21 | * We have a single directory with 9 nodes in it. |
47 | */ | 22 | */ |
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index a77efb8c2243..739948165034 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
@@ -9,17 +9,8 @@ | |||
9 | * ... and again Southern-Winter 2001 to support export_operations | 9 | * ... and again Southern-Winter 2001 to support export_operations |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/slab.h> | ||
13 | #include <linux/fs.h> | ||
14 | #include <linux/unistd.h> | ||
15 | #include <linux/string.h> | ||
16 | #include <linux/stat.h> | ||
17 | #include <linux/dcache.h> | ||
18 | #include <linux/exportfs.h> | 12 | #include <linux/exportfs.h> |
19 | #include <linux/mount.h> | ||
20 | 13 | ||
21 | #include <linux/sunrpc/clnt.h> | ||
22 | #include <linux/sunrpc/svc.h> | ||
23 | #include <linux/sunrpc/svcauth_gss.h> | 14 | #include <linux/sunrpc/svcauth_gss.h> |
24 | #include <linux/nfsd/nfsd.h> | 15 | #include <linux/nfsd/nfsd.h> |
25 | #include "vfs.h" | 16 | #include "vfs.h" |
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 6c967e1ba37b..b6bd9e0d7cd0 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c | |||
@@ -7,21 +7,8 @@ | |||
7 | * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de> | 7 | * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de> |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/linkage.h> | ||
11 | #include <linux/time.h> | ||
12 | #include <linux/errno.h> | ||
13 | #include <linux/fs.h> | ||
14 | #include <linux/stat.h> | ||
15 | #include <linux/fcntl.h> | ||
16 | #include <linux/net.h> | ||
17 | #include <linux/in.h> | ||
18 | #include <linux/namei.h> | 10 | #include <linux/namei.h> |
19 | #include <linux/unistd.h> | ||
20 | #include <linux/slab.h> | ||
21 | 11 | ||
22 | #include <linux/sunrpc/clnt.h> | ||
23 | #include <linux/sunrpc/svc.h> | ||
24 | #include <linux/nfsd/nfsd.h> | ||
25 | #include <linux/nfsd/cache.h> | 12 | #include <linux/nfsd/cache.h> |
26 | #include <linux/nfsd/xdr.h> | 13 | #include <linux/nfsd/xdr.h> |
27 | #include "vfs.h" | 14 | #include "vfs.h" |
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 2944b31dcbe6..b2d7ffac0357 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -8,30 +8,15 @@ | |||
8 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> | 8 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/module.h> | ||
12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
13 | #include <linux/time.h> | ||
14 | #include <linux/errno.h> | ||
15 | #include <linux/nfs.h> | ||
16 | #include <linux/in.h> | ||
17 | #include <linux/uio.h> | ||
18 | #include <linux/unistd.h> | ||
19 | #include <linux/slab.h> | ||
20 | #include <linux/smp.h> | ||
21 | #include <linux/freezer.h> | 12 | #include <linux/freezer.h> |
22 | #include <linux/fs_struct.h> | 13 | #include <linux/fs_struct.h> |
23 | #include <linux/kthread.h> | ||
24 | #include <linux/swap.h> | 14 | #include <linux/swap.h> |
25 | 15 | ||
26 | #include <linux/sunrpc/types.h> | ||
27 | #include <linux/sunrpc/stats.h> | 16 | #include <linux/sunrpc/stats.h> |
28 | #include <linux/sunrpc/svc.h> | ||
29 | #include <linux/sunrpc/svcsock.h> | 17 | #include <linux/sunrpc/svcsock.h> |
30 | #include <linux/sunrpc/cache.h> | ||
31 | #include <linux/nfsd/nfsd.h> | 18 | #include <linux/nfsd/nfsd.h> |
32 | #include <linux/nfsd/stats.h> | ||
33 | #include <linux/nfsd/cache.h> | 19 | #include <linux/nfsd/cache.h> |
34 | #include <linux/nfsd/syscall.h> | ||
35 | #include <linux/lockd/bind.h> | 20 | #include <linux/lockd/bind.h> |
36 | #include <linux/nfsacl.h> | 21 | #include <linux/nfsacl.h> |
37 | #include <linux/seq_file.h> | 22 | #include <linux/seq_file.h> |
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c index afd08e2c90a5..5e0603da39e7 100644 --- a/fs/nfsd/nfsxdr.c +++ b/fs/nfsd/nfsxdr.c | |||
@@ -6,15 +6,7 @@ | |||
6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/types.h> | ||
10 | #include <linux/time.h> | ||
11 | #include <linux/nfs.h> | ||
12 | #include <linux/vfs.h> | ||
13 | #include <linux/sunrpc/xdr.h> | ||
14 | #include <linux/sunrpc/svc.h> | ||
15 | #include <linux/nfsd/nfsd.h> | ||
16 | #include <linux/nfsd/xdr.h> | 9 | #include <linux/nfsd/xdr.h> |
17 | #include <linux/mm.h> | ||
18 | #include "auth.h" | 10 | #include "auth.h" |
19 | 11 | ||
20 | #define NFSDDBG_FACILITY NFSDDBG_XDR | 12 | #define NFSDDBG_FACILITY NFSDDBG_XDR |
diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c index 71944cddf680..e3e411e9fe4a 100644 --- a/fs/nfsd/stats.c +++ b/fs/nfsd/stats.c | |||
@@ -23,14 +23,9 @@ | |||
23 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> | 23 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/kernel.h> | ||
27 | #include <linux/time.h> | ||
28 | #include <linux/proc_fs.h> | ||
29 | #include <linux/seq_file.h> | 26 | #include <linux/seq_file.h> |
30 | #include <linux/stat.h> | ||
31 | #include <linux/module.h> | 27 | #include <linux/module.h> |
32 | 28 | ||
33 | #include <linux/sunrpc/svc.h> | ||
34 | #include <linux/sunrpc/stats.h> | 29 | #include <linux/sunrpc/stats.h> |
35 | #include <linux/nfsd/nfsd.h> | 30 | #include <linux/nfsd/nfsd.h> |
36 | #include <linux/nfsd/stats.h> | 31 | #include <linux/nfsd/stats.h> |
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index a7038ede671a..81ce108c114e 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -16,43 +16,23 @@ | |||
16 | * Zerocpy NFS support (C) 2002 Hirokazu Takahashi <taka@valinux.co.jp> | 16 | * Zerocpy NFS support (C) 2002 Hirokazu Takahashi <taka@valinux.co.jp> |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/string.h> | ||
20 | #include <linux/time.h> | ||
21 | #include <linux/errno.h> | ||
22 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
23 | #include <linux/file.h> | 20 | #include <linux/file.h> |
24 | #include <linux/mount.h> | ||
25 | #include <linux/major.h> | ||
26 | #include <linux/splice.h> | 21 | #include <linux/splice.h> |
27 | #include <linux/proc_fs.h> | ||
28 | #include <linux/stat.h> | ||
29 | #include <linux/fcntl.h> | 22 | #include <linux/fcntl.h> |
30 | #include <linux/net.h> | ||
31 | #include <linux/unistd.h> | ||
32 | #include <linux/slab.h> | ||
33 | #include <linux/pagemap.h> | ||
34 | #include <linux/in.h> | ||
35 | #include <linux/module.h> | ||
36 | #include <linux/namei.h> | 23 | #include <linux/namei.h> |
37 | #include <linux/vfs.h> | ||
38 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
39 | #include <linux/sunrpc/svc.h> | ||
40 | #include <linux/nfsd/nfsd.h> | 25 | #include <linux/nfsd/nfsd.h> |
41 | #ifdef CONFIG_NFSD_V3 | 26 | #ifdef CONFIG_NFSD_V3 |
42 | #include <linux/nfs3.h> | ||
43 | #include <linux/nfsd/xdr3.h> | 27 | #include <linux/nfsd/xdr3.h> |
44 | #endif /* CONFIG_NFSD_V3 */ | 28 | #endif /* CONFIG_NFSD_V3 */ |
45 | #include <linux/nfsd/nfsfh.h> | ||
46 | #include <linux/quotaops.h> | 29 | #include <linux/quotaops.h> |
47 | #include <linux/fsnotify.h> | 30 | #include <linux/fsnotify.h> |
48 | #include <linux/posix_acl.h> | ||
49 | #include <linux/posix_acl_xattr.h> | 31 | #include <linux/posix_acl_xattr.h> |
50 | #include <linux/xattr.h> | 32 | #include <linux/xattr.h> |
51 | #ifdef CONFIG_NFSD_V4 | 33 | #ifdef CONFIG_NFSD_V4 |
52 | #include <linux/nfs4.h> | ||
53 | #include <linux/nfs4_acl.h> | 34 | #include <linux/nfs4_acl.h> |
54 | #include <linux/nfsd_idmap.h> | 35 | #include <linux/nfsd_idmap.h> |
55 | #include <linux/security.h> | ||
56 | #endif /* CONFIG_NFSD_V4 */ | 36 | #endif /* CONFIG_NFSD_V4 */ |
57 | #include <linux/jhash.h> | 37 | #include <linux/jhash.h> |
58 | #include <linux/ima.h> | 38 | #include <linux/ima.h> |