xiaomi-sm8450/android_kernel_xiaomi_sm8450
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

8
fs/nfs/nfs4state.c
View File

@@ -1897,7 +1897,13 @@ again:
status = PTR_ERR(clnt);
break;
}
clp->cl_rpcclient = clnt;
/* Note: this is safe because we haven't yet marked the
* client as ready, so we are the only user of
* clp->cl_rpcclient
*/
clnt = xchg(&clp->cl_rpcclient, clnt);
rpc_shutdown_client(clnt);
clnt = clp->cl_rpcclient;
goto again;
case -NFS4ERR_MINOR_VERS_MISMATCH: