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

Commit 878e580e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull NFS client fixes from Trond Myklebust:
 "Highlights:
   - NFSv3 stable fix for another POSIX ACL regression
   - NFSv4 stable fix for a regression with OPEN_DOWNGRADE
   - NFSv4 stable fix for bad close() behaviour when holding a delegation"

* tag 'nfs-for-3.17-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv3: Fix another acl regression
  NFSv4: Don't clear the open state when we just did an OPEN_DOWNGRADE
  NFSv4: Fix problems with close in the presence of a delegation
parents 848298c6 f87d928f

fs/nfs/nfs3acl.c

+4 −1
Original line number Diff line number Diff line
@@ -129,7 +129,10 @@ static int __nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, 
		.rpc_argp	= &args,

		.rpc_resp	= &fattr,

	};

	int status;

	int status = 0;



	if (acl == NULL && (!S_ISDIR(inode->i_mode) || dfacl == NULL))

		goto out;



	status = -EOPNOTSUPP;

	if (!nfs_server_capable(inode, NFS_CAP_ACLS))

fs/nfs/nfs4proc.c

+17 −9
Original line number Diff line number Diff line
@@ -2560,6 +2560,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) 
	struct nfs4_closedata *calldata = data;

	struct nfs4_state *state = calldata->state;

	struct nfs_server *server = NFS_SERVER(calldata->inode);

	nfs4_stateid *res_stateid = NULL;



	dprintk("%s: begin!\n", __func__);

	if (!nfs4_sequence_done(task, &calldata->res.seq_res))
@@ -2570,12 +2571,12 @@ static void nfs4_close_done(struct rpc_task *task, void *data) 
	 */

	switch (task->tk_status) {

		case 0:

			if (calldata->roc)

			res_stateid = &calldata->res.stateid;

			if (calldata->arg.fmode == 0 && calldata->roc)

				pnfs_roc_set_barrier(state->inode,

						     calldata->roc_barrier);

			nfs_clear_open_stateid(state, &calldata->res.stateid, 0);

			renew_lease(server, calldata->timestamp);

			goto out_release;

			break;

		case -NFS4ERR_ADMIN_REVOKED:

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_OLD_STATEID:
@@ -2589,7 +2590,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) 
				goto out_release;

			}

	}

	nfs_clear_open_stateid(state, NULL, calldata->arg.fmode);

	nfs_clear_open_stateid(state, res_stateid, calldata->arg.fmode);

out_release:

	nfs_release_seqid(calldata->arg.seqid);

	nfs_refresh_inode(calldata->inode, calldata->res.fattr);
@@ -2601,6 +2602,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) 
	struct nfs4_closedata *calldata = data;

	struct nfs4_state *state = calldata->state;

	struct inode *inode = calldata->inode;

	bool is_rdonly, is_wronly, is_rdwr;

	int call_close = 0;



	dprintk("%s: begin!\n", __func__);
@@ -2608,18 +2610,24 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) 
		goto out_wait;



	task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN_DOWNGRADE];

	calldata->arg.fmode = FMODE_READ|FMODE_WRITE;

	spin_lock(&state->owner->so_lock);

	is_rdwr = test_bit(NFS_O_RDWR_STATE, &state->flags);

	is_rdonly = test_bit(NFS_O_RDONLY_STATE, &state->flags);

	is_wronly = test_bit(NFS_O_WRONLY_STATE, &state->flags);

	/* Calculate the current open share mode */

	calldata->arg.fmode = 0;

	if (is_rdonly || is_rdwr)

		calldata->arg.fmode |= FMODE_READ;

	if (is_wronly || is_rdwr)

		calldata->arg.fmode |= FMODE_WRITE;

	/* Calculate the change in open mode */

	if (state->n_rdwr == 0) {

		if (state->n_rdonly == 0) {

			call_close |= test_bit(NFS_O_RDONLY_STATE, &state->flags);

			call_close |= test_bit(NFS_O_RDWR_STATE, &state->flags);

			call_close |= is_rdonly || is_rdwr;

			calldata->arg.fmode &= ~FMODE_READ;

		}

		if (state->n_wronly == 0) {

			call_close |= test_bit(NFS_O_WRONLY_STATE, &state->flags);

			call_close |= test_bit(NFS_O_RDWR_STATE, &state->flags);

			call_close |= is_wronly || is_rdwr;

			calldata->arg.fmode &= ~FMODE_WRITE;

		}

	}