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

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

NFS: Split out NFS v4 inode operations 



The NFS v4 file inode operations are already already in nfs4proc.c, so
this patch just needs to move the directory operations to the same file.

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

fs/nfs/dir.c

+3 −30
Original line number Diff line number Diff line
@@ -63,33 +63,6 @@ const struct address_space_operations nfs_dir_aops = { 
	.freepage = nfs_readdir_clear_array,

};



#ifdef CONFIG_NFS_V4



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

			   struct file *, unsigned, umode_t,

			   int *);

const struct inode_operations nfs4_dir_inode_operations = {

	.create		= nfs_create,

	.lookup		= nfs_lookup,

	.atomic_open	= nfs_atomic_open,

	.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,

	.getxattr	= generic_getxattr,

	.setxattr	= generic_setxattr,

	.listxattr	= generic_listxattr,

	.removexattr	= generic_removexattr,

};



#endif /* CONFIG_NFS_V4 */



static struct nfs_open_dir_context *alloc_nfs_open_dir_context(struct inode *dir, struct rpc_cred *cred)

{

	struct nfs_open_dir_context *ctx;
@@ -1352,7 +1325,7 @@ static int nfs_finish_open(struct nfs_open_context *ctx, 
	return err;

}



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

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

		    struct file *file, unsigned open_flags,

		    umode_t mode, int *opened)

{

fs/nfs/nfs4_fs.h

+4 −1
Original line number Diff line number Diff line
@@ -200,7 +200,10 @@ struct nfs4_state_maintenance_ops { 
};



extern const struct dentry_operations nfs4_dentry_operations;

extern const struct inode_operations nfs4_dir_inode_operations;



/* dir.c */

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

		    unsigned, umode_t, int *);



/* write.c */

int nfs4_write_inode(struct inode *, struct writeback_control *);

fs/nfs/nfs4proc.c

+20 −0
Original line number Diff line number Diff line
@@ -6832,6 +6832,26 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = { 
#endif

};



const struct inode_operations nfs4_dir_inode_operations = {

	.create		= nfs_create,

	.lookup		= nfs_lookup,

	.atomic_open	= nfs_atomic_open,

	.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,

	.getxattr	= generic_getxattr,

	.setxattr	= generic_setxattr,

	.listxattr	= generic_listxattr,

	.removexattr	= generic_removexattr,

};



static const struct inode_operations nfs4_file_inode_operations = {

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,