diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-07-27 10:23:05 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-08-07 15:13:18 -0400 |
| commit | ba683031fae115d61c6b5f4c675cc27f6e9576d2 (patch) | |
| tree | 561bdd11d1b9c5982fa2317c6c0afeb99ab44e5b /fs/nfs/nfs4state.c | |
| parent | 5e11934d13c9a3bcb0cadad6c7a7de5c32660422 (diff) | |
| download | linux-3.10-ba683031fae115d61c6b5f4c675cc27f6e9576d2.tar.gz linux-3.10-ba683031fae115d61c6b5f4c675cc27f6e9576d2.tar.bz2 linux-3.10-ba683031fae115d61c6b5f4c675cc27f6e9576d2.zip | |
NFSv4: Fix a locking regression in nfs4_set_mode_locked()
We don't really need to clear &state->inode_states inside
nfs4_set_mode_locked, and doing so without holding the inode->i_lock would
in any case be a bug...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index e9662ba81d8..3e4adf8c831 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -341,8 +341,6 @@ nfs4_state_set_mode_locked(struct nfs4_state *state, mode_t mode) else list_move_tail(&state->open_states, &state->owner->so_states); } - if (mode == 0) - list_del_init(&state->inode_states); state->state = mode; } @@ -415,8 +413,7 @@ void nfs4_put_open_state(struct nfs4_state *state) if (!atomic_dec_and_lock(&state->count, &owner->so_lock)) return; spin_lock(&inode->i_lock); - if (!list_empty(&state->inode_states)) - list_del(&state->inode_states); + list_del(&state->inode_states); list_del(&state->open_states); spin_unlock(&inode->i_lock); spin_unlock(&owner->so_lock); |