diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 17:08:35 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 17:08:35 +0200 |
| commit | 80c1834fc86c2bbacb54a8fc3c04a8b0066b0996 (patch) | |
| tree | 8200248706960af8b779e9144f5b51c670602228 /fs/nfs/client.c | |
| parent | irq_domain: correct a minor wrong comment for linear revmap (diff) | |
| parent | Linux 3.5-rc6 (diff) | |
| download | linux-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.tar.xz linux-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.zip | |
Merge tag 'v3.5-rc6' into irqdomain/next
Linux 3.5-rc6
Diffstat (limited to 'fs/nfs/client.c')
| -rw-r--r-- | fs/nfs/client.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 7d108753af81..f005b5bebdc7 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -207,7 +207,6 @@ error_0: static void nfs4_shutdown_session(struct nfs_client *clp) { if (nfs4_has_session(clp)) { - nfs4_deviceid_purge_client(clp); nfs4_destroy_session(clp->cl_session); nfs4_destroy_clientid(clp); } @@ -544,8 +543,6 @@ nfs_found_client(const struct nfs_client_initdata *cl_init, smp_rmb(); - BUG_ON(clp->cl_cons_state != NFS_CS_READY); - dprintk("<-- %s found nfs_client %p for %s\n", __func__, clp, cl_init->hostname ?: ""); return clp; |