diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-23 15:52:14 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-23 15:52:14 -0400 |
| commit | b0212b84fb19cf89305ab96c73abdf3a76d05ef8 (patch) | |
| tree | 429daec3f580ad8f4c39e90f212d259b19ba9394 /fs/nfs/nfs4proc.c | |
| parent | bd1d421abcaae1b84ba377ea4c33bba31d654199 (diff) | |
| parent | eb04e0ac198cec3bab407ad220438dfa65c19c67 (diff) | |
Merge branch 'bugfixes' into linux-next
Fix up a conflict between the linux-next branch and mainline.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -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 e13b7ccee98d..3bc847ce4838 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1102,6 +1102,7 @@ static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata) /* Save the delegation */ nfs4_stateid_copy(&stateid, &delegation->stateid); rcu_read_unlock(); + nfs_release_seqid(opendata->o_arg.seqid); if (!opendata->is_recover) { ret = nfs_may_open(state->inode, state->owner->so_cred, open_mode); if (ret != 0) |