mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
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>
This commit is contained in:
parent
5e11934d13
commit
ba683031fa
1 changed files with 1 additions and 4 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue