---

yaml --- r: 294492 b: refs/heads/master c: 7df529a h: refs/heads/master v: v3
git-mirror · Feb 26, 2012 · 0ea40f0 · 0ea40f0
1 parent 965ecbc
commit 0ea40f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abd96698613eb27415e7028b6100be930920adc6
+refs/heads/master: 7df529af5fb4b4064f8cd62629e259ac79c0b4ca
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
@@ -204,8 +204,11 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
 #ifdef CONFIG_NFS_V4_1
 static void nfs4_shutdown_session(struct nfs_client *clp)
 {
-	if (nfs4_has_session(clp))
+	if (nfs4_has_session(clp)) {
+		nfs4_deviceid_purge_client(clp);
 		nfs4_destroy_session(clp->cl_session);
+	}
+
 }
 #else /* CONFIG_NFS_V4_1 */
 static void nfs4_shutdown_session(struct nfs_client *clp)
@@ -298,8 +301,6 @@ static void nfs_free_client(struct nfs_client *clp)
 	if (clp->cl_machine_cred != NULL)
 		put_rpccred(clp->cl_machine_cred);
 
-	nfs4_deviceid_purge_client(clp);
-
 	put_net(clp->net);
 	kfree(clp->cl_hostname);
 	kfree(clp->server_scope);

diff --git a/trunk/fs/nfs/pnfs.h b/trunk/fs/nfs/pnfs.h
@@ -426,9 +426,6 @@ static inline int pnfs_layoutcommit_inode(struct inode *inode, bool sync)
 	return 0;
 }
 
-static inline void nfs4_deviceid_purge_client(struct nfs_client *ncl)
-{
-}
 #endif /* CONFIG_NFS_V4_1 */
 
 #endif /* FS_NFS_PNFS_H */