iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSv4.1: Don't call nfs4_deviceid_purge_client() unless we're NFSv4.1

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-02-26 17:34:22 -05:00
parent abd9669861
commit 7df529af5f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfs/client.c
View File

@ -204,8 +204,11 @@ error_0:
#ifdef CONFIG_NFS_V4_1 #ifdef CONFIG_NFS_V4_1
static void nfs4_shutdown_session(struct nfs_client *clp) 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); nfs4_destroy_session(clp->cl_session);
}
} }
#else /* CONFIG_NFS_V4_1 */ #else /* CONFIG_NFS_V4_1 */
static void nfs4_shutdown_session(struct nfs_client *clp) 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) if (clp->cl_machine_cred != NULL)
put_rpccred(clp->cl_machine_cred); put_rpccred(clp->cl_machine_cred);
nfs4_deviceid_purge_client(clp);
put_net(clp->net); put_net(clp->net);
kfree(clp->cl_hostname); kfree(clp->cl_hostname);
kfree(clp->server_scope); kfree(clp->server_scope);

3
fs/nfs/pnfs.h
View File

@ -426,9 +426,6 @@ static inline int pnfs_layoutcommit_inode(struct inode *inode, bool sync)
return 0; return 0;
} }
static inline void nfs4_deviceid_purge_client(struct nfs_client *ncl)
{
}
#endif /* CONFIG_NFS_V4_1 */ #endif /* CONFIG_NFS_V4_1 */
#endif /* FS_NFS_PNFS_H */ #endif /* FS_NFS_PNFS_H */