From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 23 Apr 2013 19:52:14 +0000 (-0400)
Subject: Merge branch 'bugfixes' into linux-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b0212b84fb19cf89305ab96c73abdf3a76d05ef8;p=linux.git

Merge branch 'bugfixes' into linux-next

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

b0212b84fb19cf89305ab96c73abdf3a76d05ef8
diff --cc fs/nfs/nfs4proc.c
index e13b7ccee98de,0ad025eb523bc..3bc847ce48384
--- a/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();
+ 		nfs_release_seqid(opendata->o_arg.seqid);
 -		ret = nfs_may_open(state->inode, state->owner->so_cred, open_mode);
 -		if (ret != 0)
 -			goto out;
 +		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 */