forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: Move private headers to source directory

Browse source 
Lots of include/linux/nfsd/* headers are only used by
nfsd module. Move them to the source directory

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Boaz Harrosh 2009-12-03 20:30:56 +02:00 • committed by J. Bruce Fields
commit 9a74af2133
26 changed files with 52 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/nfsd/auth.c
View file

@ -5,7 +5,7 @@
*/ */
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/nfsd/nfsd.h> #include "nfsd.h"
#include "auth.h" #include "auth.h"
int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp) int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)

0
include/linux/nfsd/cache.h → fs/nfsd/cache.h
View file

3
fs/nfsd/export.c
View file

@ -18,10 +18,11 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/exportfs.h> #include <linux/exportfs.h>
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/syscall.h> #include <linux/nfsd/syscall.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include "nfsd.h"
#define NFSDDBG_FACILITY NFSDDBG_EXPORT #define NFSDDBG_FACILITY NFSDDBG_EXPORT
typedef struct auth_domain svc_client; typedef struct auth_domain svc_client;

2
fs/nfsd/lockd.c
View file

@ -9,8 +9,8 @@
*/ */
#include <linux/file.h> #include <linux/file.h>
#include <linux/nfsd/nfsd.h>
#include <linux/lockd/bind.h> #include <linux/lockd/bind.h>
#include "nfsd.h"
#include "vfs.h" #include "vfs.h"
#define NFSDDBG_FACILITY NFSDDBG_LOCKD #define NFSDDBG_FACILITY NFSDDBG_LOCKD

7
fs/nfsd/nfs2acl.c
View file

@ -6,10 +6,11 @@
* Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de> * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
*/ */
#include <linux/nfsd/nfsd.h> #include "nfsd.h"
#include <linux/nfsd/cache.h> /* FIXME: nfsacl.h is a broken header */
#include <linux/nfsd/xdr3.h>
#include <linux/nfsacl.h> #include <linux/nfsacl.h>
#include "cache.h"
#include "xdr3.h"
#include "vfs.h" #include "vfs.h"
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC

7
fs/nfsd/nfs3acl.c
View file

@ -6,10 +6,11 @@
* Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de> * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
*/ */
#include <linux/nfsd/nfsd.h> #include "nfsd.h"
#include <linux/nfsd/cache.h> /* FIXME: nfsacl.h is a broken header */
#include <linux/nfsd/xdr3.h>
#include <linux/nfsacl.h> #include <linux/nfsacl.h>
#include "cache.h"
#include "xdr3.h"
#include "vfs.h" #include "vfs.h"
#define RETURN_STATUS(st) { resp->status = (st); return (st); } #define RETURN_STATUS(st) { resp->status = (st); return (st); }

4
fs/nfsd/nfs3proc.c
View file

@ -10,8 +10,8 @@
#include <linux/ext2_fs.h> #include <linux/ext2_fs.h>
#include <linux/magic.h> #include <linux/magic.h>
#include <linux/nfsd/cache.h> #include "cache.h"
#include <linux/nfsd/xdr3.h> #include "xdr3.h"
#include "vfs.h" #include "vfs.h"
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC

2
fs/nfsd/nfs3xdr.c
View file

@ -9,7 +9,7 @@
*/ */
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/nfsd/xdr3.h> #include "xdr3.h"
#include "auth.h" #include "auth.h"
#define NFSDDBG_FACILITY NFSDDBG_XDR #define NFSDDBG_FACILITY NFSDDBG_XDR

4
fs/nfsd/nfs4callback.c
View file

@ -34,8 +34,8 @@
*/ */
#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/clnt.h>
#include <linux/nfsd/nfsd.h> #include "nfsd.h"
#include <linux/nfsd/state.h> #include "state.h"
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC

4
fs/nfsd/nfs4proc.c
View file

@ -36,8 +36,8 @@
*/ */
#include <linux/file.h> #include <linux/file.h>
#include <linux/nfsd/cache.h> #include "cache.h"
#include <linux/nfsd/xdr4.h> #include "xdr4.h"
#include "vfs.h" #include "vfs.h"
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC

5
fs/nfsd/nfs4recover.c
View file

@ -33,12 +33,13 @@
* *
*/ */
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/state.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/sched.h> #include <linux/sched.h>
#include "nfsd.h"
#include "state.h"
#include "vfs.h" #include "vfs.h"
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC

2
fs/nfsd/nfs4state.c
View file

@ -36,11 +36,11 @@
#include <linux/file.h> #include <linux/file.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/nfsd/xdr4.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/svcauth_gss.h>
#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/clnt.h>
#include "xdr4.h"
#include "vfs.h" #include "vfs.h"
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC

3
fs/nfsd/nfs4xdr.c
View file

@ -43,10 +43,11 @@
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/statfs.h> #include <linux/statfs.h>
#include <linux/utsname.h> #include <linux/utsname.h>
#include <linux/nfsd/xdr4.h>
#include <linux/nfsd_idmap.h> #include <linux/nfsd_idmap.h>
#include <linux/nfs4_acl.h> #include <linux/nfs4_acl.h>
#include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/svcauth_gss.h>
#include "xdr4.h"
#include "vfs.h" #include "vfs.h"
#define NFSDDBG_FACILITY NFSDDBG_XDR #define NFSDDBG_FACILITY NFSDDBG_XDR

4
fs/nfsd/nfscache.c
View file

@ -10,8 +10,8 @@
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
*/ */
#include <linux/nfsd/nfsd.h> #include "nfsd.h"
#include <linux/nfsd/cache.h> #include "cache.h"
/* Size of reply cache. Common values are: /* Size of reply cache. Common values are:
* 4.3BSD: 128 * 4.3BSD: 128

5
fs/nfsd/nfsctl.c
View file

@ -11,12 +11,13 @@
#include <linux/nfsd_idmap.h> #include <linux/nfsd_idmap.h>
#include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/svcsock.h>
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/cache.h>
#include <linux/nfsd/syscall.h> #include <linux/nfsd/syscall.h>
#include <linux/lockd/lockd.h> #include <linux/lockd/lockd.h>
#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/clnt.h>
#include "nfsd.h"
#include "cache.h"
/* /*
* We have a single directory with 9 nodes in it. * We have a single directory with 9 nodes in it.
*/ */

0
include/linux/nfsd/nfsd.h → fs/nfsd/nfsd.h
View file

2
fs/nfsd/nfsfh.c
View file

@ -12,7 +12,7 @@
#include <linux/exportfs.h> #include <linux/exportfs.h>
#include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/svcauth_gss.h>
#include <linux/nfsd/nfsd.h> #include "nfsd.h"
#include "vfs.h" #include "vfs.h"
#include "auth.h" #include "auth.h"

4
fs/nfsd/nfsproc.c
View file

@ -9,8 +9,8 @@
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/nfsd/cache.h> #include "cache.h"
#include <linux/nfsd/xdr.h> #include "xdr.h"
#include "vfs.h" #include "vfs.h"
typedef struct svc_rqst svc_rqst; typedef struct svc_rqst svc_rqst;

4
fs/nfsd/nfssvc.c
View file

@ -15,11 +15,11 @@
#include <linux/sunrpc/stats.h> #include <linux/sunrpc/stats.h>
#include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/svcsock.h>
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/cache.h>
#include <linux/lockd/bind.h> #include <linux/lockd/bind.h>
#include <linux/nfsacl.h> #include <linux/nfsacl.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "nfsd.h"
#include "cache.h"
#include "vfs.h" #include "vfs.h"
#define NFSDDBG_FACILITY NFSDDBG_SVC #define NFSDDBG_FACILITY NFSDDBG_SVC

2
fs/nfsd/nfsxdr.c
View file

@ -6,7 +6,7 @@
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
*/ */
#include <linux/nfsd/xdr.h> #include "xdr.h"
#include "auth.h" #include "auth.h"
#define NFSDDBG_FACILITY NFSDDBG_XDR #define NFSDDBG_FACILITY NFSDDBG_XDR

0
include/linux/nfsd/state.h → fs/nfsd/state.h
View file

4
fs/nfsd/stats.c
View file

@ -25,11 +25,11 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/sunrpc/stats.h> #include <linux/sunrpc/stats.h>
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/stats.h> #include <linux/nfsd/stats.h>
#include "nfsd.h"
struct nfsd_stats nfsdstats; struct nfsd_stats nfsdstats;
struct svc_stat nfsd_svcstats = { struct svc_stat nfsd_svcstats = {
.program = &nfsd_program, .program = &nfsd_program,

18
fs/nfsd/vfs.c
View file

@ -22,23 +22,25 @@
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/delay.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/quotaops.h>
#include <linux/fsnotify.h> #include <linux/fsnotify.h>
#include <linux/posix_acl_xattr.h> #include <linux/posix_acl_xattr.h>
#include <linux/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 #ifdef CONFIG_NFSD_V4
#include <linux/nfs4_acl.h> #include <linux/nfs4_acl.h>
#include <linux/nfsd_idmap.h> #include <linux/nfsd_idmap.h>
#endif /* CONFIG_NFSD_V4 */ #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 #define NFSDDBG_FACILITY NFSDDBG_FILEOP

2
include/linux/nfsd/xdr.h → fs/nfsd/xdr.h
View file

@ -8,7 +8,7 @@
#define LINUX_NFSD_H #define LINUX_NFSD_H
#include <linux/vfs.h> #include <linux/vfs.h>
#include <linux/nfsd/nfsd.h> #include "nfsd.h"
struct nfsd_fhandle { struct nfsd_fhandle {
struct svc_fh fh; struct svc_fh fh;

2
include/linux/nfsd/xdr3.h → fs/nfsd/xdr3.h
View file

@ -9,7 +9,7 @@
#ifndef _LINUX_NFSD_XDR3_H #ifndef _LINUX_NFSD_XDR3_H
#define _LINUX_NFSD_XDR3_H #define _LINUX_NFSD_XDR3_H
#include <linux/nfsd/xdr.h> #include "xdr.h"
struct nfsd3_sattrargs { struct nfsd3_sattrargs {
struct svc_fh fh; struct svc_fh fh;

4
include/linux/nfsd/xdr4.h → fs/nfsd/xdr4.h
View file

@ -39,8 +39,8 @@
#ifndef _LINUX_NFSD_XDR4_H #ifndef _LINUX_NFSD_XDR4_H
#define _LINUX_NFSD_XDR4_H #define _LINUX_NFSD_XDR4_H
#include <linux/nfsd/state.h> #include "state.h"
#include <linux/nfsd/nfsd.h> #include "nfsd.h"
#define NFSD4_MAX_TAGLEN 128 #define NFSD4_MAX_TAGLEN 128
#define XDR_LEN(n) (((n) + 3) & ~3) #define XDR_LEN(n) (((n) + 3) & ~3)