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

Commit 1afcb6ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-3.18-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 "Highlights include:

   - stable patches to fix NFSv4.x delegation reclaim error paths
   - fix a bug whereby we were advertising NFSv4.1 but using NFSv4.2
     features
   - fix a use-after-free problem with pNFS block layouts
   - fix a memory leak in the pNFS files O_DIRECT code
   - replace an intrusive and Oops-prone performance fix in the NFSv4
     atomic open code with a safer one-line version and revert the two
     original patches"

* tag 'nfs-for-3.18-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  sunrpc: fix sleeping under rcu_read_lock in gss_stringify_acceptor
  NFS: Don't try to reclaim delegation open state if recovery failed
  NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked
  NFSv4: Fix races between nfs_remove_bad_delegation() and delegation return
  NFSv4.1: nfs41_clear_delegation_stateid shouldn't trust NFS_DELEGATED_STATE
  NFSv4: Ensure that we remove NFSv4.0 delegations when state has expired
  NFS: SEEK is an NFS v4.2 feature
  nfs: Fix use of uninitialized variable in nfs_getattr()
  nfs: Remove bogus assignment
  nfs: remove spurious WARN_ON_ONCE in write path
  pnfs/blocklayout: serialize GETDEVICEINFO calls
  nfs: fix pnfs direct write memory leak
  Revert "NFS: nfs4_do_open should add negative results to the dcache."
  Revert "NFS: remove BUG possibility in nfs4_open_and_get_state"
  NFSv4: Ensure nfs_atomic_open set the dentry verifier on ENOENT
parents 56c381f9 b3ecba09

fs/nfs/blocklayout/blocklayout.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync) 
	loff_t offset = header->args.offset;

	size_t count = header->args.count;

	struct page **pages = header->args.pages;

	int pg_index = pg_index = header->args.pgbase >> PAGE_CACHE_SHIFT;

	int pg_index = header->args.pgbase >> PAGE_CACHE_SHIFT;

	unsigned int pg_len;

	struct blk_plug plug;

	int i;

fs/nfs/blocklayout/rpc_pipefs.c

+9 −5
Original line number Diff line number Diff line
@@ -65,17 +65,18 @@ bl_resolve_deviceid(struct nfs_server *server, struct pnfs_block_volume *b, 


	dprintk("%s CREATING PIPEFS MESSAGE\n", __func__);



	mutex_lock(&nn->bl_mutex);

	bl_pipe_msg.bl_wq = &nn->bl_wq;



	b->simple.len += 4;	/* single volume */

	if (b->simple.len > PAGE_SIZE)

		return -EIO;

		goto out_unlock;



	memset(msg, 0, sizeof(*msg));

	msg->len = sizeof(*bl_msg) + b->simple.len;

	msg->data = kzalloc(msg->len, gfp_mask);

	if (!msg->data)

		goto out;

		goto out_free_data;



	bl_msg = msg->data;

	bl_msg->type = BL_DEVICE_MOUNT,
@@ -87,7 +88,7 @@ bl_resolve_deviceid(struct nfs_server *server, struct pnfs_block_volume *b, 
	rc = rpc_queue_upcall(nn->bl_device_pipe, msg);

	if (rc < 0) {

		remove_wait_queue(&nn->bl_wq, &wq);

		goto out;

		goto out_free_data;

	}



	set_current_state(TASK_UNINTERRUPTIBLE);
@@ -97,12 +98,14 @@ bl_resolve_deviceid(struct nfs_server *server, struct pnfs_block_volume *b, 
	if (reply->status != BL_DEVICE_REQUEST_PROC) {

		printk(KERN_WARNING "%s failed to decode device: %d\n",

			__func__, reply->status);

		goto out;

		goto out_free_data;

	}



	dev = MKDEV(reply->major, reply->minor);

out:

out_free_data:

	kfree(msg->data);

out_unlock:

	mutex_unlock(&nn->bl_mutex);

	return dev;

}
@@ -232,6 +235,7 @@ static int nfs4blocklayout_net_init(struct net *net) 
	struct nfs_net *nn = net_generic(net, nfs_net_id);

	struct dentry *dentry;



	mutex_init(&nn->bl_mutex);

	init_waitqueue_head(&nn->bl_wq);

	nn->bl_device_pipe = rpc_mkpipe_data(&bl_upcall_ops, 0);

	if (IS_ERR(nn->bl_device_pipe))

fs/nfs/delegation.c

+23 −2
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ static int nfs_delegation_claim_opens(struct inode *inode, const nfs4_stateid *s 
			continue;

		if (!test_bit(NFS_DELEGATED_STATE, &state->flags))

			continue;

		if (!nfs4_valid_open_stateid(state))

			continue;

		if (!nfs4_stateid_match(&state->stateid, stateid))

			continue;

		get_nfs_open_context(ctx);
@@ -193,7 +195,11 @@ static int nfs_do_return_delegation(struct inode *inode, struct nfs_delegation * 
{

	int res = 0;



	res = nfs4_proc_delegreturn(inode, delegation->cred, &delegation->stateid, issync);

	if (!test_bit(NFS_DELEGATION_REVOKED, &delegation->flags))

		res = nfs4_proc_delegreturn(inode,

				delegation->cred,

				&delegation->stateid,

				issync);

	nfs_free_delegation(delegation);

	return res;

}
@@ -380,11 +386,13 @@ static int nfs_end_delegation_return(struct inode *inode, struct nfs_delegation 
{

	struct nfs_client *clp = NFS_SERVER(inode)->nfs_client;

	struct nfs_inode *nfsi = NFS_I(inode);

	int err;

	int err = 0;



	if (delegation == NULL)

		return 0;

	do {

		if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags))

			break;

		err = nfs_delegation_claim_opens(inode, &delegation->stateid);

		if (!issync || err != -EAGAIN)

			break;
@@ -605,10 +613,23 @@ static void nfs_client_mark_return_unused_delegation_types(struct nfs_client *cl 
	rcu_read_unlock();

}



static void nfs_revoke_delegation(struct inode *inode)

{

	struct nfs_delegation *delegation;

	rcu_read_lock();

	delegation = rcu_dereference(NFS_I(inode)->delegation);

	if (delegation != NULL) {

		set_bit(NFS_DELEGATION_REVOKED, &delegation->flags);

		nfs_mark_return_delegation(NFS_SERVER(inode), delegation);

	}

	rcu_read_unlock();

}



void nfs_remove_bad_delegation(struct inode *inode)

{

	struct nfs_delegation *delegation;



	nfs_revoke_delegation(inode);

	delegation = nfs_inode_detach_delegation(inode);

	if (delegation) {

		nfs_inode_find_state_and_recover(inode, &delegation->stateid);

fs/nfs/delegation.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ enum { 
	NFS_DELEGATION_RETURN_IF_CLOSED,

	NFS_DELEGATION_REFERENCED,

	NFS_DELEGATION_RETURNING,

	NFS_DELEGATION_REVOKED,

};



int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res);

fs/nfs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -1527,6 +1527,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry, 
		case -ENOENT:

			d_drop(dentry);

			d_add(dentry, NULL);

			nfs_set_verifier(dentry, nfs_save_change_attribute(dir));

			break;

		case -EISDIR:

		case -ENOTDIR: