Return-Path: From: NeilBrown To: Trond Myklebust , Anna Schumaker , Jeff Layton Date: Wed, 12 Oct 2016 13:39:18 +1100 Subject: [PATCH 4/5] NFSv4: enhance nfs4_copy_lock_stateid to use a flock stateid if there is one Cc: Benjamin Coddington , Linux NFS Mailing List Message-ID: <147623995861.19592.803121432289194657.stgit@noble> In-Reply-To: <147623977637.19592.12766016823334433969.stgit@noble> References: <147623977637.19592.12766016823334433969.stgit@noble> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" List-ID: A process can have two possible lock owner for a given open file: a per-process Posix lock owner and a per-open-file flock owner Use both of these when searching for a suitable stateid to use. With this patch, READ/WRITE requests will use the correct stateid if a flock lock is active. Signed-off-by: NeilBrown --- fs/nfs/nfs4state.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 94a6631e7938..fbef37fd5704 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -800,11 +800,13 @@ void nfs4_close_sync(struct nfs4_state *state, fmode_t fmode) * that is compatible with current->files */ static struct nfs4_lock_state * -__nfs4_find_lock_state(struct nfs4_state *state, fl_owner_t fl_owner) +__nfs4_find_lock_state(struct nfs4_state *state, + fl_owner_t fl_owner, fl_owner_t fl_owner2) { struct nfs4_lock_state *pos; list_for_each_entry(pos, &state->lock_states, ls_locks) { - if (pos->ls_owner != fl_owner) + if (pos->ls_owner != fl_owner && + pos->ls_owner != fl_owner2) continue; atomic_inc(&pos->ls_count); return pos; @@ -857,7 +859,7 @@ static struct nfs4_lock_state *nfs4_get_lock_state(struct nfs4_state *state, fl_ for(;;) { spin_lock(&state->state_lock); - lsp = __nfs4_find_lock_state(state, owner); + lsp = __nfs4_find_lock_state(state, owner, 0); if (lsp != NULL) break; if (new != NULL) { @@ -946,18 +948,21 @@ static int nfs4_copy_lock_stateid(nfs4_stateid *dst, * and we can choose a lock context relevant for the current process */ struct nfs4_lock_state *lsp; - fl_owner_t fl_owner; + fl_owner_t fl_owner, fl_flock_owner; int ret = -ENOENT; if (test_bit(LK_STATE_IN_USE, &state->flags) == 0) goto out; - if (l_ctx == NULL) + if (l_ctx == NULL) { fl_owner = current->files; - else + fl_flock_owner = 0; + } else { fl_owner = l_ctx->lockowner.l_owner; + fl_flock_owner = l_ctx->open_context->flock_owner; + } spin_lock(&state->state_lock); - lsp = __nfs4_find_lock_state(state, fl_owner); + lsp = __nfs4_find_lock_state(state, fl_owner, fl_flock_owner); if (lsp && test_bit(NFS_LOCK_LOST, &lsp->ls_flags)) ret = -EIO; else if (lsp != NULL && test_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags) != 0) {