Merge branch 'bugfixes' into linux-next

Fix up a conflict between the linux-next branch and mainline.
Conflicts:
	fs/nfs/nfs4proc.c

diff --cc fs/nfs/nfs4client.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
index e13b7ccee98de41e73c1f4236d0dcc6fe43272d8,0ad025eb523bc6b651d82497c29a0d27ebdf3dac..3bc847ce483845488ad5720789cadfcb27e0d6fb
--- 1/fs/nfs/nfs4proc.c
--- 2/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@@ -1102,11 -1046,10 +1102,12 @@@ static struct nfs4_state *nfs4_try_open
                /* Save the delegation */
                nfs4_stateid_copy(&stateid, &delegation->stateid);
                rcu_read_unlock();
 -              ret = nfs_may_open(state->inode, state->owner->so_cred, open_mode);
 -              if (ret != 0)
 -                      goto out;
+               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)
 +                              goto out;
 +              }
                ret = -EAGAIN;
  
                /* Try to update the stateid using the delegation */

diff --cc fs/nfs/nfs4state.c
Simple merge

diff --cc net/sunrpc/clnt.c
Simple merge