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

Commit 0486958f authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

nfs: move nfs_file_operations declaration to bottom of file.c (try #2) 



...a remove a set of forward declarations.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1788ea6e

fs/nfs/file.c

+19 −40
Original line number Original line Diff line number Diff line
@@ -40,48 +40,8 @@ 




#define NFSDBG_FACILITY		NFSDBG_FILE

#define NFSDBG_FACILITY		NFSDBG_FILE





static int nfs_file_open(struct inode *, struct file *);

static int nfs_file_release(struct inode *, struct file *);

static loff_t nfs_file_llseek(struct file *file, loff_t offset, int origin);

static int  nfs_file_mmap(struct file *, struct vm_area_struct *);

static ssize_t nfs_file_splice_read(struct file *filp, loff_t *ppos,

					struct pipe_inode_info *pipe,

					size_t count, unsigned int flags);

static ssize_t nfs_file_read(struct kiocb *, const struct iovec *iov,

				unsigned long nr_segs, loff_t pos);

static ssize_t nfs_file_splice_write(struct pipe_inode_info *pipe,

					struct file *filp, loff_t *ppos,

					size_t count, unsigned int flags);

static ssize_t nfs_file_write(struct kiocb *, const struct iovec *iov,

				unsigned long nr_segs, loff_t pos);

static int  nfs_file_flush(struct file *, fl_owner_t id);

static int  nfs_file_fsync(struct file *, loff_t, loff_t, int datasync);

static int nfs_check_flags(int flags);

static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl);

static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl);

static int nfs_setlease(struct file *file, long arg, struct file_lock **fl);



static const struct vm_operations_struct nfs_file_vm_ops;

static const struct vm_operations_struct nfs_file_vm_ops;





const struct file_operations nfs_file_operations = {

	.llseek		= nfs_file_llseek,

	.read		= do_sync_read,

	.write		= do_sync_write,

	.aio_read	= nfs_file_read,

	.aio_write	= nfs_file_write,

	.mmap		= nfs_file_mmap,

	.open		= nfs_file_open,

	.flush		= nfs_file_flush,

	.release	= nfs_file_release,

	.fsync		= nfs_file_fsync,

	.lock		= nfs_lock,

	.flock		= nfs_flock,

	.splice_read	= nfs_file_splice_read,

	.splice_write	= nfs_file_splice_write,

	.check_flags	= nfs_check_flags,

	.setlease	= nfs_setlease,

};



const struct inode_operations nfs_file_inode_operations = {

const struct inode_operations nfs_file_inode_operations = {

	.permission	= nfs_permission,

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,

	.getattr	= nfs_getattr,
@@ -887,6 +847,25 @@ static int nfs_setlease(struct file *file, long arg, struct file_lock **fl) 
	return -EINVAL;

	return -EINVAL;

}

}





const struct file_operations nfs_file_operations = {

	.llseek		= nfs_file_llseek,

	.read		= do_sync_read,

	.write		= do_sync_write,

	.aio_read	= nfs_file_read,

	.aio_write	= nfs_file_write,

	.mmap		= nfs_file_mmap,

	.open		= nfs_file_open,

	.flush		= nfs_file_flush,

	.release	= nfs_file_release,

	.fsync		= nfs_file_fsync,

	.lock		= nfs_lock,

	.flock		= nfs_flock,

	.splice_read	= nfs_file_splice_read,

	.splice_write	= nfs_file_splice_write,

	.check_flags	= nfs_check_flags,

	.setlease	= nfs_setlease,

};



#ifdef CONFIG_NFS_V4

#ifdef CONFIG_NFS_V4

static int

static int

nfs4_file_open(struct inode *inode, struct file *filp)

nfs4_file_open(struct inode *inode, struct file *filp)