Merge tag 'nfs-for-3.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (8a1f006a) · Commits · 戴 / test

fs/nfs/dir.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -274,6 +274,15 @@ out_eof:
		return -EBADCOOKIE;
		}

		static bool
		nfs_readdir_inode_mapping_valid(struct nfs_inode *nfsi)
		{
		if (nfsi->cache_validity & (NFS_INO_INVALID_ATTR\|NFS_INO_INVALID_DATA))
		return false;
		smp_rmb();
		return !test_bit(NFS_INO_INVALIDATING, &nfsi->flags);
		}

		static
		int nfs_readdir_search_for_cookie(struct nfs_cache_array array, nfs_readdir_descriptor_t desc)
		{
		@@ -287,8 +296,8 @@ int nfs_readdir_search_for_cookie(struct nfs_cache_array *array, nfs_readdir_des
		struct nfs_open_dir_context *ctx = desc->file->private_data;

		new_pos = desc->current_index + i;
		if (ctx->attr_gencount != nfsi->attr_gencount
		\|\| (nfsi->cache_validity & (NFS_INO_INVALID_ATTR\|NFS_INO_INVALID_DATA))) {
		if (ctx->attr_gencount != nfsi->attr_gencount \|\|
		!nfs_readdir_inode_mapping_valid(nfsi)) {
		ctx->duped = 0;
		ctx->attr_gencount = nfsi->attr_gencount;
		} else if (new_pos < desc->ctx->pos) {

fs/nfs/inode.c

+43 −8

Original line number	Diff line number	Diff line
		@@ -977,11 +977,11 @@ static int nfs_invalidate_mapping(struct inode inode, struct address_space map
		if (ret < 0)
		return ret;
		}
		if (S_ISDIR(inode->i_mode)) {
		spin_lock(&inode->i_lock);
		nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
		if (S_ISDIR(inode->i_mode))
		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
		spin_unlock(&inode->i_lock);
		}
		nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);
		nfs_fscache_wait_on_invalidate(inode);

		@@ -1008,6 +1008,7 @@ static bool nfs_mapping_need_revalidate_inode(struct inode *inode)
		int nfs_revalidate_mapping(struct inode inode, struct address_space mapping)
		{
		struct nfs_inode *nfsi = NFS_I(inode);
		unsigned long *bitlock = &nfsi->flags;
		int ret = 0;

		/* swapfiles are not supposed to be shared. */
		@@ -1019,12 +1020,46 @@ int nfs_revalidate_mapping(struct inode inode, struct address_space mapping)
		if (ret < 0)
		goto out;
		}
		if (nfsi->cache_validity & NFS_INO_INVALID_DATA) {

		/*
		* We must clear NFS_INO_INVALID_DATA first to ensure that
		* invalidations that come in while we're shooting down the mappings
		* are respected. But, that leaves a race window where one revalidator
		* can clear the flag, and then another checks it before the mapping
		* gets invalidated. Fix that by serializing access to this part of
		* the function.
		*
		* At the same time, we need to allow other tasks to see whether we
		* might be in the middle of invalidating the pages, so we only set
		* the bit lock here if it looks like we're going to be doing that.
		*/
		for (;;) {
		ret = wait_on_bit(bitlock, NFS_INO_INVALIDATING,
		nfs_wait_bit_killable, TASK_KILLABLE);
		if (ret)
		goto out;
		spin_lock(&inode->i_lock);
		if (test_bit(NFS_INO_INVALIDATING, bitlock)) {
		spin_unlock(&inode->i_lock);
		continue;
		}
		if (nfsi->cache_validity & NFS_INO_INVALID_DATA)
		break;
		spin_unlock(&inode->i_lock);
		goto out;
		}

		set_bit(NFS_INO_INVALIDATING, bitlock);
		smp_wmb();
		nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
		spin_unlock(&inode->i_lock);
		trace_nfs_invalidate_mapping_enter(inode);
		ret = nfs_invalidate_mapping(inode, mapping);
		trace_nfs_invalidate_mapping_exit(inode, ret);
		}

		clear_bit_unlock(NFS_INO_INVALIDATING, bitlock);
		smp_mb__after_clear_bit();
		wake_up_bit(bitlock, NFS_INO_INVALIDATING);
		out:
		return ret;
		}

fs/nfs/nfs4_fs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,7 @@ static inline struct nfs4_session nfs4_get_session(const struct nfs_server ser
		extern int nfs41_setup_sequence(struct nfs4_session *session,
		struct nfs4_sequence_args args, struct nfs4_sequence_res res,
		struct rpc_task *task);
		extern int nfs41_sequence_done(struct rpc_task , struct nfs4_sequence_res );
		extern int nfs4_proc_create_session(struct nfs_client , struct rpc_cred );
		extern int nfs4_proc_destroy_session(struct nfs4_session , struct rpc_cred );
		extern int nfs4_proc_get_lease_time(struct nfs_client *clp,

fs/nfs/nfs4client.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -372,10 +372,7 @@ struct nfs_client nfs4_init_client(struct nfs_client clp,
		__set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
		__set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags);

		error = -EINVAL;
		if (gssd_running(clp->cl_net))
		error = nfs_create_rpc_client(clp, timeparms,
		RPC_AUTH_GSS_KRB5I);
		error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
		if (error == -EINVAL)
		error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);
		if (error < 0)

fs/nfs/nfs4filelayout.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -335,8 +335,10 @@ static void filelayout_read_call_done(struct rpc_task task, void data)
		dprintk("--> %s task->tk_status %d\n", __func__, task->tk_status);

		if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) &&
		task->tk_status == 0)
		task->tk_status == 0) {
		nfs41_sequence_done(task, &rdata->res.seq_res);
		return;
		}

		/* Note this may cause RPC to be resent */
		rdata->header->mds_ops->rpc_call_done(task, data);
		@@ -442,8 +444,10 @@ static void filelayout_write_call_done(struct rpc_task task, void data)
		struct nfs_write_data *wdata = data;

		if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&
		task->tk_status == 0)
		task->tk_status == 0) {
		nfs41_sequence_done(task, &wdata->res.seq_res);
		return;
		}

		/* Note this may cause RPC to be resent */
		wdata->header->mds_ops->rpc_call_done(task, data);

Admin message