a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFSv4: Fix a locking regression in nfs4_set_mode_locked()

Browse Source 
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:
Trond Myklebust 2007-07-27 10:23:05 -04:00
parent 5e11934d13
commit ba683031fa
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfs/nfs4state.c
View File

@ -341,8 +341,6 @@ nfs4_state_set_mode_locked(struct nfs4_state *state, mode_t mode)
else else
list_move_tail(&state->open_states, &state->owner->so_states); list_move_tail(&state->open_states, &state->owner->so_states);
} }
if (mode == 0)
list_del_init(&state->inode_states);
state->state = mode; 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)) if (!atomic_dec_and_lock(&state->count, &owner->so_lock))
return; return;
spin_lock(&inode->i_lock); 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); list_del(&state->open_states);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
spin_unlock(&owner->so_lock); spin_unlock(&owner->so_lock);