diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-03-01 01:19:59 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-03-01 01:19:59 +0100 |
| commit | 7aa262b522ee5a7f1bf9b8fe34539b262ba6da0a (patch) | |
| tree | 9d3ef00b6398d9bd5210800fc3ffcefa68d31e3b | |
| parent | nfs: don't allow nfs_find_actor to match inodes of the wrong type (diff) | |
| download | linux-7aa262b522ee5a7f1bf9b8fe34539b262ba6da0a.tar.xz linux-7aa262b522ee5a7f1bf9b8fe34539b262ba6da0a.zip | |
NFSv4: Fix another open/open_recovery deadlock
If we don't release the open seqid before we wait for state recovery,
then we may end up deadlocking the state recovery thread.
This patch addresses a new deadlock that was introduced by
commit c21443c2c792cd9b463646d982b0fe48aa6feb0f (NFSv4: Fix a reboot
recovery race when opening a file)
Reported-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/nfs/nfs4proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 655237fc46df..37eb38566fbc 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1158,6 +1158,7 @@ _nfs4_opendata_to_nfs4_state(struct nfs4_opendata *data) data->o_arg.fmode); iput(inode); out: + nfs_release_seqid(data->o_arg.seqid); return state; err_put_inode: iput(inode); |