aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/client.c7
-rw-r--r--fs/nfs/pnfs.h3
2 files changed, 4 insertions, 6 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 8563585ccce..592b5583aa3 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -204,8 +204,11 @@ error_0:
#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/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 53d593a0a4f..8088d51f495 100644
--- a/fs/nfs/pnfs.h
+++ b/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 */