aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-02-28 19:19:59 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-02-28 19:19:59 -0500
commit7aa262b522ee5a7f1bf9b8fe34539b262ba6da0a (patch)
tree9d3ef00b6398d9bd5210800fc3ffcefa68d31e3b /fs/nfs
parentf6488c9ba51d65410e2dbc4345413c0d9120971e (diff)
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>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c1
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)
1158 data->o_arg.fmode); 1158 data->o_arg.fmode);
1159 iput(inode); 1159 iput(inode);
1160out: 1160out:
1161 nfs_release_seqid(data->o_arg.seqid);
1161 return state; 1162 return state;
1162err_put_inode: 1163err_put_inode:
1163 iput(inode); 1164 iput(inode);