 59953fba87
			
		
	
	
	59953fba87
	
	
	
		
			
			Highlights include:
 
 Stable patches:
 - Fix a regression in /proc/self/mountstats
 - Fix the pNFS flexfiles O_DIRECT support
 - Fix high load average due to callback thread sleeping
 
 Bugfixes:
 - Various patches to fix the pNFS layoutcommit support
 - Do not cache pNFS deviceids unless server notifications are enabled
 - Fix a SUNRPC transport reconnection regression
 - make debugfs file creation failure non-fatal in SUNRPC
 - Another fix for circular directory warnings on NFSv4 "junctioned" mountpoints
 - Fix locking around NFSv4.2 fallocate() support
 - Truncating NFSv4 file opens should also sync O_DIRECT writes
 - Prevent infinite loop in rpcrdma_ep_create()
 
 Features:
 - Various improvements to the RDMA transport code's handling of memory
   registration
 - Various code cleanups
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVOmT6AAoJEGcL54qWCgDyrhYQAMPKXB55jrdOR/7UVSF/xPML
 7OjMGHvBnTn/y0pNIyLyS1PjTZZsD/WZjoW9EFGpTv727qQNVoFxFRLNUcgi3NoL
 1YledCkLf7Q32aqod93SRRFPc9hzBoKhOZpOzBuWaAviyAB3KLi70DWAq9qRReYM
 prXUQQjpW5FLU+B2ifaVc2RCnu/rZ2c02YdR2XdtkBaAJxuhB2vR8IY1evwjCv3R
 5zyLDd9zSDDoArdpUzM97cxZPcYRSqbOwgTKvaaRnDDq/mKbKMZaqmEfjblwzNFt
 b43FbveJzZ3hlPADIpmaiMHjRTbxWjIKc9K1sOF2FPfcuPe2yM3DMAxDegUkEveS
 7fkbv/qRZ30NqfchGanX/pmBlLOcdI76qe/bwhN19wCnw48O1eeHi1HK8rWGhU+E
 qcrRZ3ZS2ufP/MVBuhauy0qU9Q4wcEtm7NGGP1231ZtmfjHKyBa4pLirNfG1AlJt
 dK7tBrknVx+WVm/UddJp/fEsxbP0+fki6TwzioHUSWcz8rDVYF6PFT/QPM54SX2h
 0oqwvu6d/uShpkVRm+fbje8FHmUxKdgqDsCYX2fNjWskh1oXSPsItvjqmTmTlE0i
 EBmBwVwI0uB1ZQ3PrJLadhRcO3ZJmLQ5gNj456dstvWy6UQds1xyIQ/DgvmlzxWO
 E9t0l18xHGRwbndsDa8f
 =j5dP
 -----END PGP SIGNATURE-----
Merge tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client updates from Trond Myklebust:
 "Another set of mainly bugfixes and a couple of cleanups.  No new
  functionality in this round.
  Highlights include:
  Stable patches:
   - Fix a regression in /proc/self/mountstats
   - Fix the pNFS flexfiles O_DIRECT support
   - Fix high load average due to callback thread sleeping
  Bugfixes:
   - Various patches to fix the pNFS layoutcommit support
   - Do not cache pNFS deviceids unless server notifications are enabled
   - Fix a SUNRPC transport reconnection regression
   - make debugfs file creation failure non-fatal in SUNRPC
   - Another fix for circular directory warnings on NFSv4 "junctioned"
     mountpoints
   - Fix locking around NFSv4.2 fallocate() support
   - Truncating NFSv4 file opens should also sync O_DIRECT writes
   - Prevent infinite loop in rpcrdma_ep_create()
  Features:
   - Various improvements to the RDMA transport code's handling of
     memory registration
   - Various code cleanups"
* tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (55 commits)
  fs/nfs: fix new compiler warning about boolean in switch
  nfs: Remove unneeded casts in nfs
  NFS: Don't attempt to decode missing directory entries
  Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"
  NFS: Rename idmap.c to nfs4idmap.c
  NFS: Move nfs_idmap.h into fs/nfs/
  NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h
  NFS: Add a stub for GETDEVICELIST
  nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes
  nfs: fix DIO good bytes calculation
  nfs: Fetch MOUNTED_ON_FILEID when updating an inode
  sunrpc: make debugfs file creation failure non-fatal
  nfs: fix high load average due to callback thread sleeping
  NFS: Reduce time spent holding the i_mutex during fallocate()
  NFS: Don't zap caches on fallocate()
  xprtrdma: Make rpcrdma_{un}map_one() into inline functions
  xprtrdma: Handle non-SEND completions via a callout
  xprtrdma: Add "open" memreg op
  xprtrdma: Add "destroy MRs" memreg op
  xprtrdma: Add "reset MRs" memreg op
  ...
		
	
			
		
			
				
	
	
		
			189 lines
		
	
	
	
		
			4.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			189 lines
		
	
	
	
		
			4.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  *  linux/fs/nfs/file.c
 | |
|  *
 | |
|  *  Copyright (C) 1992  Rick Sladkey
 | |
|  */
 | |
| #include <linux/fs.h>
 | |
| #include <linux/falloc.h>
 | |
| #include <linux/nfs_fs.h>
 | |
| #include "internal.h"
 | |
| #include "fscache.h"
 | |
| #include "pnfs.h"
 | |
| 
 | |
| #include "nfstrace.h"
 | |
| 
 | |
| #ifdef CONFIG_NFS_V4_2
 | |
| #include "nfs42.h"
 | |
| #endif
 | |
| 
 | |
| #define NFSDBG_FACILITY		NFSDBG_FILE
 | |
| 
 | |
| static int
 | |
| nfs4_file_open(struct inode *inode, struct file *filp)
 | |
| {
 | |
| 	struct nfs_open_context *ctx;
 | |
| 	struct dentry *dentry = filp->f_path.dentry;
 | |
| 	struct dentry *parent = NULL;
 | |
| 	struct inode *dir;
 | |
| 	unsigned openflags = filp->f_flags;
 | |
| 	struct iattr attr;
 | |
| 	int opened = 0;
 | |
| 	int err;
 | |
| 
 | |
| 	/*
 | |
| 	 * If no cached dentry exists or if it's negative, NFSv4 handled the
 | |
| 	 * opens in ->lookup() or ->create().
 | |
| 	 *
 | |
| 	 * We only get this far for a cached positive dentry.  We skipped
 | |
| 	 * revalidation, so handle it here by dropping the dentry and returning
 | |
| 	 * -EOPENSTALE.  The VFS will retry the lookup/create/open.
 | |
| 	 */
 | |
| 
 | |
| 	dprintk("NFS: open file(%pd2)\n", dentry);
 | |
| 
 | |
| 	if ((openflags & O_ACCMODE) == 3)
 | |
| 		openflags--;
 | |
| 
 | |
| 	/* We can't create new files here */
 | |
| 	openflags &= ~(O_CREAT|O_EXCL);
 | |
| 
 | |
| 	parent = dget_parent(dentry);
 | |
| 	dir = d_inode(parent);
 | |
| 
 | |
| 	ctx = alloc_nfs_open_context(filp->f_path.dentry, filp->f_mode);
 | |
| 	err = PTR_ERR(ctx);
 | |
| 	if (IS_ERR(ctx))
 | |
| 		goto out;
 | |
| 
 | |
| 	attr.ia_valid = ATTR_OPEN;
 | |
| 	if (openflags & O_TRUNC) {
 | |
| 		attr.ia_valid |= ATTR_SIZE;
 | |
| 		attr.ia_size = 0;
 | |
| 		nfs_sync_inode(inode);
 | |
| 	}
 | |
| 
 | |
| 	inode = NFS_PROTO(dir)->open_context(dir, ctx, openflags, &attr, &opened);
 | |
| 	if (IS_ERR(inode)) {
 | |
| 		err = PTR_ERR(inode);
 | |
| 		switch (err) {
 | |
| 		case -EPERM:
 | |
| 		case -EACCES:
 | |
| 		case -EDQUOT:
 | |
| 		case -ENOSPC:
 | |
| 		case -EROFS:
 | |
| 			goto out_put_ctx;
 | |
| 		default:
 | |
| 			goto out_drop;
 | |
| 		}
 | |
| 	}
 | |
| 	if (inode != d_inode(dentry))
 | |
| 		goto out_drop;
 | |
| 
 | |
| 	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
 | |
| 	nfs_file_set_open_context(filp, ctx);
 | |
| 	nfs_fscache_open_file(inode, filp);
 | |
| 	err = 0;
 | |
| 
 | |
| out_put_ctx:
 | |
| 	put_nfs_open_context(ctx);
 | |
| out:
 | |
| 	dput(parent);
 | |
| 	return err;
 | |
| 
 | |
| out_drop:
 | |
| 	d_drop(dentry);
 | |
| 	err = -EOPENSTALE;
 | |
| 	goto out_put_ctx;
 | |
| }
 | |
| 
 | |
| static int
 | |
| nfs4_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 | |
| {
 | |
| 	int ret;
 | |
| 	struct inode *inode = file_inode(file);
 | |
| 
 | |
| 	trace_nfs_fsync_enter(inode);
 | |
| 
 | |
| 	nfs_inode_dio_wait(inode);
 | |
| 	do {
 | |
| 		ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
 | |
| 		if (ret != 0)
 | |
| 			break;
 | |
| 		mutex_lock(&inode->i_mutex);
 | |
| 		ret = nfs_file_fsync_commit(file, start, end, datasync);
 | |
| 		if (!ret)
 | |
| 			ret = pnfs_sync_inode(inode, !!datasync);
 | |
| 		mutex_unlock(&inode->i_mutex);
 | |
| 		/*
 | |
| 		 * If nfs_file_fsync_commit detected a server reboot, then
 | |
| 		 * resend all dirty pages that might have been covered by
 | |
| 		 * the NFS_CONTEXT_RESEND_WRITES flag
 | |
| 		 */
 | |
| 		start = 0;
 | |
| 		end = LLONG_MAX;
 | |
| 	} while (ret == -EAGAIN);
 | |
| 
 | |
| 	trace_nfs_fsync_exit(inode, ret);
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| #ifdef CONFIG_NFS_V4_2
 | |
| static loff_t nfs4_file_llseek(struct file *filep, loff_t offset, int whence)
 | |
| {
 | |
| 	loff_t ret;
 | |
| 
 | |
| 	switch (whence) {
 | |
| 	case SEEK_HOLE:
 | |
| 	case SEEK_DATA:
 | |
| 		ret = nfs42_proc_llseek(filep, offset, whence);
 | |
| 		if (ret != -ENOTSUPP)
 | |
| 			return ret;
 | |
| 	default:
 | |
| 		return nfs_file_llseek(filep, offset, whence);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static long nfs42_fallocate(struct file *filep, int mode, loff_t offset, loff_t len)
 | |
| {
 | |
| 	struct inode *inode = file_inode(filep);
 | |
| 	long ret;
 | |
| 
 | |
| 	if (!S_ISREG(inode->i_mode))
 | |
| 		return -EOPNOTSUPP;
 | |
| 
 | |
| 	if ((mode != 0) && (mode != (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE)))
 | |
| 		return -EOPNOTSUPP;
 | |
| 
 | |
| 	ret = inode_newsize_ok(inode, offset + len);
 | |
| 	if (ret < 0)
 | |
| 		return ret;
 | |
| 
 | |
| 	if (mode & FALLOC_FL_PUNCH_HOLE)
 | |
| 		return nfs42_proc_deallocate(filep, offset, len);
 | |
| 	return nfs42_proc_allocate(filep, offset, len);
 | |
| }
 | |
| #endif /* CONFIG_NFS_V4_2 */
 | |
| 
 | |
| const struct file_operations nfs4_file_operations = {
 | |
| #ifdef CONFIG_NFS_V4_2
 | |
| 	.llseek		= nfs4_file_llseek,
 | |
| #else
 | |
| 	.llseek		= nfs_file_llseek,
 | |
| #endif
 | |
| 	.read_iter	= nfs_file_read,
 | |
| 	.write_iter	= nfs_file_write,
 | |
| 	.mmap		= nfs_file_mmap,
 | |
| 	.open		= nfs4_file_open,
 | |
| 	.flush		= nfs_file_flush,
 | |
| 	.release	= nfs_file_release,
 | |
| 	.fsync		= nfs4_file_fsync,
 | |
| 	.lock		= nfs_lock,
 | |
| 	.flock		= nfs_flock,
 | |
| 	.splice_read	= nfs_file_splice_read,
 | |
| 	.splice_write	= iter_file_splice_write,
 | |
| #ifdef CONFIG_NFS_V4_2
 | |
| 	.fallocate	= nfs42_fallocate,
 | |
| #endif /* CONFIG_NFS_V4_2 */
 | |
| 	.check_flags	= nfs_check_flags,
 | |
| 	.setlease	= simple_nosetlease,
 | |
| };
 |