samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfixes' into linux-next

Browse Source 
Fix up a conflict between the linux-next branch and mainline.
Conflicts:
	fs/nfs/nfs4proc.c
This commit is contained in:
Trond Myklebust
2013-04-23 15:52:14 -04:00
parent bd1d421abc eb04e0ac19
commit b0212b84fb
4 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfs/nfs4proc.c
View File

@@ -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)