diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-05-29 17:34:46 (GMT) |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-06-06 20:24:44 (GMT) |
| commit | c45ffdd26961302ec5eeac7311553d6f1e348e9c (patch) | |
| tree | 2e7afeafe15c0a6c3886cd16a4cc601337ee3ea5 /fs/nfs/nfs4proc.c | |
| parent | 275bb307865a316cef390e01e6ab5e21e97023a2 (diff) | |
| download | linux-fsl-qoriq-c45ffdd26961302ec5eeac7311553d6f1e348e9c.tar.xz | |
NFSv4: Close another NFSv4 recovery race
State recovery currently relies on being able to find a valid
nfs_open_context in the inode->open_files list.
We therefore need to put the nfs_open_context on the list while
we're still protected by the sp->so_reclaim_seqcount in order
to avoid reboot races.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index aaf2c13..65467ab 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2002,8 +2002,11 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, goto out; ctx->state = state; - if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq)) - nfs4_schedule_stateid_recovery(server, state); + if (dentry->d_inode == state->inode) { + nfs_inode_attach_open_context(ctx); + if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq)) + nfs4_schedule_stateid_recovery(server, state); + } out: return ret; } |