diff options
author | Olga Kornievskaia | 2015-05-15 17:45:31 +0200 |
---|---|---|
committer | Trond Myklebust | 2015-06-01 15:58:02 +0200 |
commit | e8d975e73e5fa05f983fbf2723120edcf68e0b38 (patch) | |
tree | fbc82e514cfcc1973563f5fad0077159691ddaf3 | |
parent | Linux 4.1-rc6 (diff) | |
download | kernel-qcow2-linux-e8d975e73e5fa05f983fbf2723120edcf68e0b38.tar.gz kernel-qcow2-linux-e8d975e73e5fa05f983fbf2723120edcf68e0b38.tar.xz kernel-qcow2-linux-e8d975e73e5fa05f983fbf2723120edcf68e0b38.zip |
fixing infinite OPEN loop in 4.0 stateid recovery
Problem: When an operation like WRITE receives a BAD_STATEID, even though
recovery code clears the RECLAIM_NOGRACE recovery flag before recovering
the open state, because of clearing delegation state for the associated
inode, nfs_inode_find_state_and_recover() gets called and it makes the
same state with RECLAIM_NOGRACE flag again. As a results, when we restart
looking over the open states, we end up in the infinite loop instead of
breaking out in the next test of state flags.
Solution: unset the RECLAIM_NOGRACE set because of
calling of nfs_inode_find_state_and_recover() after returning from calling
recover_open() function.
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | fs/nfs/nfs4state.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 2782cfca2265..ddef1dc80cf7 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1482,6 +1482,8 @@ restart: spin_unlock(&state->state_lock); } nfs4_put_open_state(state); + clear_bit(NFS4CLNT_RECLAIM_NOGRACE, + &state->flags); spin_lock(&sp->so_lock); goto restart; } |