NFSv4: Retrieve attributes _before_ calling delegreturn (e144cbcc) · Commits · 戴 / test

fs/nfs/nfs4proc.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4138,8 +4138,9 @@ static int _nfs4_proc_delegreturn(struct inode inode, struct rpc_cred cred, co
	if (status != 0)		if (status != 0)
	goto out;		goto out;
	status = data->rpc_status;		status = data->rpc_status;
	if (status != 0)		if (status == 0)
	goto out;		nfs_post_op_update_inode_force_wcc(inode, &data->fattr);
			else
	nfs_refresh_inode(inode, &data->fattr);		nfs_refresh_inode(inode, &data->fattr);
	out:		out:
	rpc_put_task(task);		rpc_put_task(task);

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2602,8 +2602,8 @@ static void nfs4_xdr_enc_delegreturn(struct rpc_rqst *req,
	encode_compound_hdr(xdr, req, &hdr);		encode_compound_hdr(xdr, req, &hdr);
	encode_sequence(xdr, &args->seq_args, &hdr);		encode_sequence(xdr, &args->seq_args, &hdr);
	encode_putfh(xdr, args->fhandle, &hdr);		encode_putfh(xdr, args->fhandle, &hdr);
	encode_delegreturn(xdr, args->stateid, &hdr);
	encode_getfattr(xdr, args->bitmask, &hdr);		encode_getfattr(xdr, args->bitmask, &hdr);
			encode_delegreturn(xdr, args->stateid, &hdr);
	encode_nops(&hdr);		encode_nops(&hdr);
	}		}

	@@ -6527,10 +6527,10 @@ static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp,
	status = decode_putfh(xdr);		status = decode_putfh(xdr);
	if (status != 0)		if (status != 0)
	goto out;		goto out;
	status = decode_delegreturn(xdr);		status = decode_getfattr(xdr, res->fattr, res->server);
	if (status != 0)		if (status != 0)
	goto out;		goto out;
	decode_getfattr(xdr, res->fattr, res->server);		status = decode_delegreturn(xdr);
	out:		out:
	return status;		return status;
	}		}