diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-02-26 17:34:22 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-02-26 17:34:22 -0500 |
| commit | 7df529af5fb4b4064f8cd62629e259ac79c0b4ca (patch) | |
| tree | ca2995f28fb5c487926d88d6a9f2fb710667dca9 | |
| parent | abd96698613eb27415e7028b6100be930920adc6 (diff) | |
| download | linux-7df529af5fb4b4064f8cd62629e259ac79c0b4ca.tar.bz2 | |
NFSv4.1: Don't call nfs4_deviceid_purge_client() unless we're NFSv4.1
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/nfs/client.c | 7 | ||||
| -rw-r--r-- | fs/nfs/pnfs.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 8563585cccec..592b5583aa3a 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 53d593a0a4f2..8088d51f495e 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 */ |