mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
NFSv4: change nfs4_select_rw_stateid to take a lock_context inplace of lock_owner
The only time that a lock_context is not immediately available is in setattr, and now that it has an open_context, it can easily find one with nfs_get_lock_context. This removes the need for the on-stack nfs_lockowner. This change is preparation for correctly support flock stateids. Signed-off-by: NeilBrown <neilb@suse.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
29b59f9416
commit
1739347549
3 changed files with 12 additions and 16 deletions
|
@ -457,7 +457,7 @@ extern void nfs41_handle_server_scope(struct nfs_client *,
|
||||||
extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp);
|
extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp);
|
||||||
extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl);
|
extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl);
|
||||||
extern int nfs4_select_rw_stateid(struct nfs4_state *, fmode_t,
|
extern int nfs4_select_rw_stateid(struct nfs4_state *, fmode_t,
|
||||||
const struct nfs_lockowner *, nfs4_stateid *,
|
const struct nfs_lock_context *, nfs4_stateid *,
|
||||||
struct rpc_cred **);
|
struct rpc_cred **);
|
||||||
|
|
||||||
extern struct nfs_seqid *nfs_alloc_seqid(struct nfs_seqid_counter *counter, gfp_t gfp_mask);
|
extern struct nfs_seqid *nfs_alloc_seqid(struct nfs_seqid_counter *counter, gfp_t gfp_mask);
|
||||||
|
|
|
@ -2945,12 +2945,13 @@ static int _nfs4_do_setattr(struct inode *inode,
|
||||||
if (nfs4_copy_delegation_stateid(inode, fmode, &arg->stateid, &delegation_cred)) {
|
if (nfs4_copy_delegation_stateid(inode, fmode, &arg->stateid, &delegation_cred)) {
|
||||||
/* Use that stateid */
|
/* Use that stateid */
|
||||||
} else if (truncate && ctx != NULL) {
|
} else if (truncate && ctx != NULL) {
|
||||||
struct nfs_lockowner lockowner = {
|
struct nfs_lock_context *l_ctx;
|
||||||
.l_owner = current->files,
|
|
||||||
};
|
|
||||||
if (!nfs4_valid_open_stateid(ctx->state))
|
if (!nfs4_valid_open_stateid(ctx->state))
|
||||||
return -EBADF;
|
return -EBADF;
|
||||||
if (nfs4_select_rw_stateid(ctx->state, FMODE_WRITE, &lockowner,
|
l_ctx = nfs_get_lock_context(ctx);
|
||||||
|
if (IS_ERR(l_ctx))
|
||||||
|
return PTR_ERR(l_ctx);
|
||||||
|
if (nfs4_select_rw_stateid(ctx->state, FMODE_WRITE, l_ctx,
|
||||||
&arg->stateid, &delegation_cred) == -EIO)
|
&arg->stateid, &delegation_cred) == -EIO)
|
||||||
return -EBADF;
|
return -EBADF;
|
||||||
} else
|
} else
|
||||||
|
@ -4576,11 +4577,7 @@ int nfs4_set_rw_stateid(nfs4_stateid *stateid,
|
||||||
const struct nfs_lock_context *l_ctx,
|
const struct nfs_lock_context *l_ctx,
|
||||||
fmode_t fmode)
|
fmode_t fmode)
|
||||||
{
|
{
|
||||||
const struct nfs_lockowner *lockowner = NULL;
|
return nfs4_select_rw_stateid(ctx->state, fmode, l_ctx, stateid, NULL);
|
||||||
|
|
||||||
if (l_ctx != NULL)
|
|
||||||
lockowner = &l_ctx->lockowner;
|
|
||||||
return nfs4_select_rw_stateid(ctx->state, fmode, lockowner, stateid, NULL);
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(nfs4_set_rw_stateid);
|
EXPORT_SYMBOL_GPL(nfs4_set_rw_stateid);
|
||||||
|
|
||||||
|
|
|
@ -939,20 +939,19 @@ int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl)
|
||||||
|
|
||||||
static int nfs4_copy_lock_stateid(nfs4_stateid *dst,
|
static int nfs4_copy_lock_stateid(nfs4_stateid *dst,
|
||||||
struct nfs4_state *state,
|
struct nfs4_state *state,
|
||||||
const struct nfs_lockowner *lockowner)
|
const struct nfs_lock_context *l_ctx)
|
||||||
{
|
{
|
||||||
struct nfs4_lock_state *lsp;
|
struct nfs4_lock_state *lsp;
|
||||||
fl_owner_t fl_owner;
|
fl_owner_t fl_owner;
|
||||||
int ret = -ENOENT;
|
int ret = -ENOENT;
|
||||||
|
|
||||||
|
if (l_ctx == NULL)
|
||||||
if (lockowner == NULL)
|
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (test_bit(LK_STATE_IN_USE, &state->flags) == 0)
|
if (test_bit(LK_STATE_IN_USE, &state->flags) == 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
fl_owner = lockowner->l_owner;
|
fl_owner = l_ctx->lockowner.l_owner;
|
||||||
spin_lock(&state->state_lock);
|
spin_lock(&state->state_lock);
|
||||||
lsp = __nfs4_find_lock_state(state, fl_owner);
|
lsp = __nfs4_find_lock_state(state, fl_owner);
|
||||||
if (lsp && test_bit(NFS_LOCK_LOST, &lsp->ls_flags))
|
if (lsp && test_bit(NFS_LOCK_LOST, &lsp->ls_flags))
|
||||||
|
@ -986,7 +985,7 @@ static void nfs4_copy_open_stateid(nfs4_stateid *dst, struct nfs4_state *state)
|
||||||
* requests.
|
* requests.
|
||||||
*/
|
*/
|
||||||
int nfs4_select_rw_stateid(struct nfs4_state *state,
|
int nfs4_select_rw_stateid(struct nfs4_state *state,
|
||||||
fmode_t fmode, const struct nfs_lockowner *lockowner,
|
fmode_t fmode, const struct nfs_lock_context *l_ctx,
|
||||||
nfs4_stateid *dst, struct rpc_cred **cred)
|
nfs4_stateid *dst, struct rpc_cred **cred)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -995,7 +994,7 @@ int nfs4_select_rw_stateid(struct nfs4_state *state,
|
||||||
return -EIO;
|
return -EIO;
|
||||||
if (cred != NULL)
|
if (cred != NULL)
|
||||||
*cred = NULL;
|
*cred = NULL;
|
||||||
ret = nfs4_copy_lock_stateid(dst, state, lockowner);
|
ret = nfs4_copy_lock_stateid(dst, state, l_ctx);
|
||||||
if (ret == -EIO)
|
if (ret == -EIO)
|
||||||
/* A lost lock - don't even consider delegations */
|
/* A lost lock - don't even consider delegations */
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in a new issue