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

Commit e25ba0ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Revert pnfs ugliness from the generic NFS read code path
  SUNRPC: destroy freshly allocated transport in case of sockaddr init error
  NFS: Fix a regression in the referral code
  nfs: move nfs_file_operations declaration to bottom of file.c (try #2)
  nfs: when attempting to open a directory, fall back on normal lookup (try #5)
parents af36d15f 62e4a769

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1468,12 +1468,12 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry 
				res = NULL;

				goto out;

			/* This turned out not to be a regular file */

			case -EISDIR:

			case -ENOTDIR:

				goto no_open;

			case -ELOOP:

				if (!(nd->intent.open.flags & O_NOFOLLOW))

					goto no_open;

			/* case -EISDIR: */

			/* case -EINVAL: */

			default:

				res = ERR_CAST(inode);

fs/nfs/file.c

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


#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;



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 = {

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,
@@ -886,3 +846,54 @@ static int nfs_setlease(struct file *file, long arg, struct file_lock **fl) 
			file->f_path.dentry->d_name.name, arg);

	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

static int

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

{

	/*

	 * NFSv4 opens are handled in d_lookup and d_revalidate. If we get to

	 * this point, then something is very wrong

	 */

	dprintk("NFS: %s called! inode=%p filp=%p\n", __func__, inode, filp);

	return -ENOTDIR;

}



const struct file_operations nfs4_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		= nfs4_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,

};

#endif /* CONFIG_NFS_V4 */

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr) 
		 */

		inode->i_op = NFS_SB(sb)->nfs_client->rpc_ops->file_inode_ops;

		if (S_ISREG(inode->i_mode)) {

			inode->i_fop = &nfs_file_operations;

			inode->i_fop = NFS_SB(sb)->nfs_client->rpc_ops->file_ops;

			inode->i_data.a_ops = &nfs_file_aops;

			inode->i_data.backing_dev_info = &NFS_SB(sb)->backing_dev_info;

		} else if (S_ISDIR(inode->i_mode)) {

fs/nfs/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ extern void nfs_read_prepare(struct rpc_task *task, void *calldata); 
extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,

		struct list_head *head);



extern void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,

		struct inode *inode);

extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);

extern void nfs_readdata_release(struct nfs_read_data *rdata);

fs/nfs/nfs3proc.c

+1 −0
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.dentry_ops	= &nfs_dentry_operations,

	.dir_inode_ops	= &nfs3_dir_inode_operations,

	.file_inode_ops	= &nfs3_file_inode_operations,

	.file_ops	= &nfs_file_operations,

	.getroot	= nfs3_proc_get_root,

	.getattr	= nfs3_proc_getattr,

	.setattr	= nfs3_proc_setattr,