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

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

Merge tag 'nfs-for-4.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull more NFS client updates from Trond Myklebust:
 "Highlights include:

   - further attribute cache improvements to make revalidation more fine
     grained

   - NFSv4 locking improvements

  Bugfixes:

   - nfs4_fl_prepare_ds must be careful about reporting success in files
     layout

   - pNFS/flexfiles: Instead of marking a device inactive, remove it
     from the cache"

* tag 'nfs-for-4.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Retry the DELEGRETURN if the embedded GETATTR is rejected with EACCES
  NFS: Retry the CLOSE if the embedded GETATTR is rejected with EACCES
  NFSv4: Place the GETATTR operation before the CLOSE
  NFSv4: Also ask for attributes when downgrading to a READ-only state
  NFS: Don't abuse NFS_INO_REVAL_FORCED in nfs_post_op_update_inode_locked()
  pNFS: Return RW layouts on OPEN_DOWNGRADE
  NFSv4: Add encode/decode of the layoutreturn op in OPEN_DOWNGRADE
  NFS: Don't disconnect open-owner on NFS4ERR_BAD_SEQID
  NFSv4: ensure __nfs4_find_lock_state returns consistent result.
  NFSv4.1: nfs4_fl_prepare_ds must be careful about reporting success.
  pNFS/flexfiles: delete deviceid, don't mark inactive
  NFS: Clean up nfs_attribute_timeout()
  NFS: Remove unused function nfs_revalidate_inode_rcu()
  NFS: Fix and clean up the access cache validity checking
  NFS: Only look at the change attribute cache state in nfs_weak_revalidate()
  NFS: Clean up cache validity checking
  NFS: Don't revalidate the file on close if we hold a delegation
  NFSv4: Don't discard the attributes returned by asynchronous DELEGRETURN
  NFSv4: Update the attribute cache info in update_changeattr
parents d5db84a8 8ac2b422

fs/nfs/dir.c

+12 −11
Original line number Diff line number Diff line
@@ -1273,8 +1273,8 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags) 
 */

static int nfs_weak_revalidate(struct dentry *dentry, unsigned int flags)

{

	int error;

	struct inode *inode = d_inode(dentry);

	int error = 0;



	/*

	 * I believe we can only get a negative dentry here in the case of a
@@ -1293,7 +1293,8 @@ static int nfs_weak_revalidate(struct dentry *dentry, unsigned int flags) 
		return 0;

	}



	error = nfs_revalidate_inode(NFS_SERVER(inode), inode);

	if (nfs_mapping_need_revalidate_inode(inode))

		error = __nfs_revalidate_inode(NFS_SERVER(inode), inode);

	dfprintk(LOOKUPCACHE, "NFS: %s: inode %lu is %s\n",

			__func__, inode->i_ino, error ? "invalid" : "valid");

	return !error;
@@ -2285,8 +2286,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str 
		if (cache == NULL)

			goto out;

		/* Found an entry, is our attribute cache valid? */

		if (!nfs_attribute_cache_expired(inode) &&

		    !(nfsi->cache_validity & NFS_INO_INVALID_ATTR))

		if (!nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS))

			break;

		err = -ECHILD;

		if (!may_block)
@@ -2334,12 +2334,12 @@ static int nfs_access_get_cached_rcu(struct inode *inode, struct rpc_cred *cred, 
		cache = NULL;

	if (cache == NULL)

		goto out;

	err = nfs_revalidate_inode_rcu(NFS_SERVER(inode), inode);

	if (err)

	if (nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS))

		goto out;

	res->jiffies = cache->jiffies;

	res->cred = cache->cred;

	res->mask = cache->mask;

	err = 0;

out:

	rcu_read_unlock();

	return err;
@@ -2491,12 +2491,13 @@ EXPORT_SYMBOL_GPL(nfs_may_open); 
static int nfs_execute_ok(struct inode *inode, int mask)

{

	struct nfs_server *server = NFS_SERVER(inode);

	int ret;

	int ret = 0;



	if (nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS)) {

		if (mask & MAY_NOT_BLOCK)

		ret = nfs_revalidate_inode_rcu(server, inode);

	else

		ret = nfs_revalidate_inode(server, inode);

			return -ECHILD;

		ret = __nfs_revalidate_inode(server, inode);

	}

	if (ret == 0 && !execute_ok(inode))

		ret = -EACCES;

	return ret;

fs/nfs/file.c

+1 −11
Original line number Diff line number Diff line
@@ -101,21 +101,11 @@ EXPORT_SYMBOL_GPL(nfs_file_release); 
static int nfs_revalidate_file_size(struct inode *inode, struct file *filp)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct nfs_inode *nfsi = NFS_I(inode);

	const unsigned long force_reval = NFS_INO_REVAL_PAGECACHE|NFS_INO_REVAL_FORCED;

	unsigned long cache_validity = nfsi->cache_validity;



	if (NFS_PROTO(inode)->have_delegation(inode, FMODE_READ) &&

	    (cache_validity & force_reval) != force_reval)

		goto out_noreval;



	if (filp->f_flags & O_DIRECT)

		goto force_reval;

	if (nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE)

		goto force_reval;

	if (nfs_attribute_timeout(inode))

	if (nfs_check_cache_invalid(inode, NFS_INO_REVAL_PAGECACHE))

		goto force_reval;

out_noreval:

	return 0;

force_reval:

	return __nfs_revalidate_inode(server, inode);

fs/nfs/filelayout/filelayoutdev.c

+2 −1
Original line number Diff line number Diff line
@@ -282,7 +282,8 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) 
			     s->nfs_client->cl_minorversion);



out_test_devid:

	if (filelayout_test_devid_unavailable(devid))

	if (ret->ds_clp == NULL ||

	    filelayout_test_devid_unavailable(devid))

		ret = NULL;

out:

	return ret;

fs/nfs/flexfilelayout/flexfilelayout.c

+4 −2
Original line number Diff line number Diff line
@@ -1126,7 +1126,8 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task, 
	case -EPIPE:

		dprintk("%s DS connection error %d\n", __func__,

			task->tk_status);

		nfs4_mark_deviceid_unavailable(devid);

		nfs4_delete_deviceid(devid->ld, devid->nfs_client,

				&devid->deviceid);

		rpc_wake_up(&tbl->slot_tbl_waitq);

		/* fall through */

	default:
@@ -1175,7 +1176,8 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task, 
	default:

		dprintk("%s DS connection error %d\n", __func__,

			task->tk_status);

		nfs4_mark_deviceid_unavailable(devid);

		nfs4_delete_deviceid(devid->ld, devid->nfs_client,

				&devid->deviceid);

	}

	/* FIXME: Need to prevent infinite looping here. */

	return -NFS4ERR_RESET_TO_PNFS;

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev, 
static void ff_layout_mark_devid_invalid(struct pnfs_layout_segment *lseg,

		struct nfs4_deviceid_node *devid)

{

	nfs4_mark_deviceid_unavailable(devid);

	nfs4_delete_deviceid(devid->ld, devid->nfs_client, &devid->deviceid);

	if (!ff_layout_has_available_ds(lseg))

		pnfs_error_mark_layout_for_return(lseg->pls_layout->plh_inode,

				lseg);