Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab96291e authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Split out NFS v3 inode operations 



This patch moves the NFS v3 file and directory inode functions into
files that are only compiled whet CONFIG_NFS_V3 is enabled.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 597d9289

fs/nfs/dir.c

+0 −21
Original line number Diff line number Diff line
@@ -63,27 +63,6 @@ const struct address_space_operations nfs_dir_aops = { 
	.freepage = nfs_readdir_clear_array,

};



#ifdef CONFIG_NFS_V3

const struct inode_operations nfs3_dir_inode_operations = {

	.create		= nfs_create,

	.lookup		= nfs_lookup,

	.link		= nfs_link,

	.unlink		= nfs_unlink,

	.symlink	= nfs_symlink,

	.mkdir		= nfs_mkdir,

	.rmdir		= nfs_rmdir,

	.mknod		= nfs_mknod,

	.rename		= nfs_rename,

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,

	.setattr	= nfs_setattr,

	.listxattr	= nfs3_listxattr,

	.getxattr	= nfs3_getxattr,

	.setxattr	= nfs3_setxattr,

	.removexattr	= nfs3_removexattr,

};

#endif  /* CONFIG_NFS_V3 */



#ifdef CONFIG_NFS_V4



static int nfs_atomic_open(struct inode *, struct dentry *,

fs/nfs/file.c

+0 −12
Original line number Diff line number Diff line
@@ -41,18 +41,6 @@ 


static const struct vm_operations_struct nfs_file_vm_ops;



#ifdef CONFIG_NFS_V3

const struct inode_operations nfs3_file_inode_operations = {

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,

	.setattr	= nfs_setattr,

	.listxattr	= nfs3_listxattr,

	.getxattr	= nfs3_getxattr,

	.setxattr	= nfs3_setxattr,

	.removexattr	= nfs3_removexattr,

};

#endif  /* CONFIG_NFS_v3 */



/* Hack for future NFS swap support */

#ifndef IS_SWAPFILE

# define IS_SWAPFILE(inode)	(0)

fs/nfs/nfs3proc.c

+29 −0
Original line number Diff line number Diff line
@@ -888,6 +888,35 @@ static int nfs3_return_delegation(struct inode *inode) 
	return 0;

}



static const struct inode_operations nfs3_dir_inode_operations = {

	.create		= nfs_create,

	.lookup		= nfs_lookup,

	.link		= nfs_link,

	.unlink		= nfs_unlink,

	.symlink	= nfs_symlink,

	.mkdir		= nfs_mkdir,

	.rmdir		= nfs_rmdir,

	.mknod		= nfs_mknod,

	.rename		= nfs_rename,

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,

	.setattr	= nfs_setattr,

	.listxattr	= nfs3_listxattr,

	.getxattr	= nfs3_getxattr,

	.setxattr	= nfs3_setxattr,

	.removexattr	= nfs3_removexattr,

};



static const struct inode_operations nfs3_file_inode_operations = {

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,

	.setattr	= nfs_setattr,

	.listxattr	= nfs3_listxattr,

	.getxattr	= nfs3_getxattr,

	.setxattr	= nfs3_setxattr,

	.removexattr	= nfs3_removexattr,

};



const struct nfs_rpc_ops nfs_v3_clientops = {

	.version	= 3,			/* protocol version */

	.dentry_ops	= &nfs_dentry_operations,

include/linux/nfs_fs.h

+0 −6
Original line number Diff line number Diff line
@@ -427,9 +427,6 @@ extern __be32 root_nfs_parse_addr(char *name); /*__init*/ 
/*

 * linux/fs/nfs/file.c

 */

#ifdef CONFIG_NFS_V3

extern const struct inode_operations nfs3_file_inode_operations;

#endif /* CONFIG_NFS_V3 */

extern const struct file_operations nfs_file_operations;

#ifdef CONFIG_NFS_V4

extern const struct file_operations nfs4_file_operations;
@@ -484,9 +481,6 @@ extern ssize_t nfs_file_direct_write(struct kiocb *iocb, 
/*

 * linux/fs/nfs/dir.c

 */

#ifdef CONFIG_NFS_V3

extern const struct inode_operations nfs3_dir_inode_operations;

#endif /* CONFIG_NFS_V3 */

extern const struct file_operations nfs_dir_operations;

extern const struct dentry_operations nfs_dentry_operations;