Commit f7b422b1 authored by David Howells's avatar David Howells Committed by Trond Myklebust
Browse files

NFS: Split fs/nfs/inode.c 



As fs/nfs/inode.c is rather large, heterogenous and unwieldy, the attached
patch splits it up into a number of files:

 (*) fs/nfs/inode.c

     Strictly inode specific functions.

 (*) fs/nfs/super.c

     Superblock management functions for NFS and NFS4, normal access, clones
     and referrals.  The NFS4 superblock functions _could_ move out into a
     separate conditionally compiled file, but it's probably not worth it as
     there're so many common bits.

 (*) fs/nfs/namespace.c

     Some namespace-specific functions have been moved here.

 (*) fs/nfs/nfs4namespace.c

     NFS4-specific namespace functions (this could be merged into the previous
     file).  This file is conditionally compiled.

 (*) fs/nfs/internal.h

     Inter-file declarations, plus a few simple utility functions moved from
     fs/nfs/inode.c.

     Additionally, all the in-.c-file externs have been moved here, and those
     files they were moved from now includes this file.

For the most part, the functions have not been changed, only some multiplexor
functions have changed significantly.

I've also:

 (*) Added some extra banner comments above some functions.

 (*) Rearranged the function order within the files to be more logical and
     better grouped (IMO), though someone may prefer a different order.

 (*) Reduced the number of #ifdefs in .c files.

 (*) Added missing __init and __exit directives.

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
parent 4e5ccf60

fs/nfs/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


obj-$(CONFIG_NFS_FS) += nfs.o



nfs-y 			:= dir.o file.o inode.o nfs2xdr.o pagelist.o \

nfs-y 			:= dir.o file.o inode.o super.o nfs2xdr.o pagelist.o \

			   proc.o read.o symlink.o unlink.o write.o \

			   namespace.o

nfs-$(CONFIG_ROOT_NFS)	+= nfsroot.o mount_clnt.o
@@ -12,7 +12,8 @@ nfs-$(CONFIG_NFS_V3) += nfs3proc.o nfs3xdr.o 
nfs-$(CONFIG_NFS_V3_ACL)	+= nfs3acl.o

nfs-$(CONFIG_NFS_V4)	+= nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o \

			   delegation.o idmap.o \

			   callback.o callback_xdr.o callback_proc.o

			   callback.o callback_xdr.o callback_proc.o \

			   nfs4namespace.o

nfs-$(CONFIG_NFS_DIRECTIO) += direct.o

nfs-$(CONFIG_SYSCTL) += sysctl.o

nfs-objs		:= $(nfs-y)

fs/nfs/callback.c

+0 −2
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp) 
/*

 * Define NFS4 callback program

 */

extern struct svc_version nfs4_callback_version1;



static struct svc_version *nfs4_callback_version[] = {

	[1] = &nfs4_callback_version1,

};

fs/nfs/direct.c

+3 −3
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ out: 
 * nfs_init_directcache - create a slab cache for nfs_direct_req structures

 *

 */

int nfs_init_directcache(void)

int __init nfs_init_directcache(void)

{

	nfs_direct_cachep = kmem_cache_create("nfs_direct_cache",

						sizeof(struct nfs_direct_req),
@@ -906,10 +906,10 @@ int nfs_init_directcache(void) 
}



/**

 * nfs_init_directcache - destroy the slab cache for nfs_direct_req structures

 * nfs_destroy_directcache - destroy the slab cache for nfs_direct_req structures

 *

 */

void nfs_destroy_directcache(void)

void __exit nfs_destroy_directcache(void)

{

	if (kmem_cache_destroy(nfs_direct_cachep))

		printk(KERN_INFO "nfs_direct_cache: not all structures were freed\n");

fs/nfs/inode.c

+19 −1774

File changed.

Preview size limit exceeded, changes collapsed.

fs/nfs/internal.h

0 → 100644
+179 −0
Original line number Diff line number Diff line 
/*

 * NFS internal definitions

 */



#include <linux/mount.h>



struct nfs_clone_mount {

	const struct super_block *sb;

	const struct dentry *dentry;

	struct nfs_fh *fh;

	struct nfs_fattr *fattr;

	char *hostname;

	char *mnt_path;

	struct sockaddr_in *addr;

	rpc_authflavor_t authflavor;

};



/* namespace-nfs4.c */

#ifdef CONFIG_NFS_V4

extern struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry);

#else

static inline

struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry)

{

	return ERR_PTR(-ENOENT);

}

#endif



/* callback_xdr.c */

extern struct svc_version nfs4_callback_version1;



/* pagelist.c */

extern int __init nfs_init_nfspagecache(void);

extern void __exit nfs_destroy_nfspagecache(void);

extern int __init nfs_init_readpagecache(void);

extern void __exit nfs_destroy_readpagecache(void);

extern int __init nfs_init_writepagecache(void);

extern void __exit nfs_destroy_writepagecache(void);



#ifdef CONFIG_NFS_DIRECTIO

extern int __init nfs_init_directcache(void);

extern void __exit nfs_destroy_directcache(void);

#else

#define nfs_init_directcache() (0)

#define nfs_destroy_directcache() do {} while(0)

#endif



/* nfs2xdr.c */

extern struct rpc_procinfo nfs_procedures[];

extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int);



/* nfs3xdr.c */

extern struct rpc_procinfo nfs3_procedures[];

extern u32 *nfs3_decode_dirent(u32 *, struct nfs_entry *, int);



/* nfs4xdr.c */

extern int nfs_stat_to_errno(int);

extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus);



/* nfs4proc.c */

extern struct rpc_procinfo nfs4_procedures[];



extern int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,

				  struct nfs4_fs_locations *fs_locations,

				  struct page *page);



/* inode.c */

extern struct inode *nfs_alloc_inode(struct super_block *sb);

extern void nfs_destroy_inode(struct inode *);

extern int nfs_write_inode(struct inode *,int);

extern void nfs_clear_inode(struct inode *);

#ifdef CONFIG_NFS_V4

extern void nfs4_clear_inode(struct inode *);

#endif



/* super.c */

extern struct file_system_type nfs_referral_nfs4_fs_type;

extern struct file_system_type clone_nfs_fs_type;

#ifdef CONFIG_NFS_V4

extern struct file_system_type clone_nfs4_fs_type;

#endif

#ifdef CONFIG_PROC_FS

extern struct rpc_stat nfs_rpcstat;

#endif

extern int __init register_nfs_fs(void);

extern void __exit unregister_nfs_fs(void);



/* namespace.c */

extern char *nfs_path(const char *base, const struct dentry *dentry,

		      char *buffer, ssize_t buflen);



/*

 * Determine the mount path as a string

 */

static inline char *nfs4_path(const struct dentry *dentry, char *buffer, ssize_t buflen)

{

	return nfs_path(NFS_SB(dentry->d_sb)->mnt_path, dentry, buffer, buflen);

}



/*

 * Determine the device name as a string

 */

static inline char *nfs_devname(const struct vfsmount *mnt_parent,

			 const struct dentry *dentry,

			 char *buffer, ssize_t buflen)

{

	return nfs_path(mnt_parent->mnt_devname, dentry, buffer, buflen);

}



/*

 * Determine the actual block size (and log2 thereof)

 */

static inline

unsigned long nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp)

{

	/* make sure blocksize is a power of two */

	if ((bsize & (bsize - 1)) || nrbitsp) {

		unsigned char	nrbits;



		for (nrbits = 31; nrbits && !(bsize & (1 << nrbits)); nrbits--)

			;

		bsize = 1 << nrbits;

		if (nrbitsp)

			*nrbitsp = nrbits;

	}



	return bsize;

}



/*

 * Calculate the number of 512byte blocks used.

 */

static inline unsigned long nfs_calc_block_size(u64 tsize)

{

	loff_t used = (tsize + 511) >> 9;

	return (used > ULONG_MAX) ? ULONG_MAX : used;

}



/*

 * Compute and set NFS server blocksize

 */

static inline

unsigned long nfs_block_size(unsigned long bsize, unsigned char *nrbitsp)

{

	if (bsize < NFS_MIN_FILE_IO_SIZE)

		bsize = NFS_DEF_FILE_IO_SIZE;

	else if (bsize >= NFS_MAX_FILE_IO_SIZE)

		bsize = NFS_MAX_FILE_IO_SIZE;



	return nfs_block_bits(bsize, nrbitsp);

}



/*

 * Determine the maximum file size for a superblock

 */

static inline

void nfs_super_set_maxbytes(struct super_block *sb, __u64 maxfilesize)

{

	sb->s_maxbytes = (loff_t)maxfilesize;

	if (sb->s_maxbytes > MAX_LFS_FILESIZE || sb->s_maxbytes <= 0)

		sb->s_maxbytes = MAX_LFS_FILESIZE;

}



/*

 * Check if the string represents a "valid" IPv4 address

 */

static inline int valid_ipaddr4(const char *buf)

{

	int rc, count, in[4];



	rc = sscanf(buf, "%d.%d.%d.%d", &in[0], &in[1], &in[2], &in[3]);

	if (rc != 4)

		return -EINVAL;

	for (count = 0; count < 4; count++) {

		if (in[count] > 255)

			return -EINVAL;

	}

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE