cifs: clean up call to cifs_dfs_release_automount_timer()

Take the #ifdef junk out of the code, and turn it into a noop macro
when CONFIG_CIFS_DFS_UPCALL isn't defined.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index f2661610fcf313d4dbb0683f798ded779e34abf9..260025fd8c3b25a622f556fadeb20f4c2bb1b1ce 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1177,9 +1177,7 @@ exit_cifs(void)
        cFYI(DBG2, "exit_cifs");
        cifs_proc_clean();
        cifs_fscache_unregister();
-#ifdef CONFIG_CIFS_DFS_UPCALL
        cifs_dfs_release_automount_timer();
-#endif
 #ifdef CONFIG_CIFS_ACL
        cifs_destroy_idmaptrees();
        exit_cifs_idmap();

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 47a769e535b1533a47231a99750aa5f384fc64a1..503e73d8bdb7beddab4e2f495a2467e7efd17de1 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -171,7 +171,13 @@ extern struct smb_vol *cifs_get_volume_info(char *mount_data,
                                            const char *devname);
 extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *);
 extern void cifs_umount(struct cifs_sb_info *);
+
+#if IS_ENABLED(CONFIG_CIFS_DFS_UPCALL)
 extern void cifs_dfs_release_automount_timer(void);
+#else /* ! IS_ENABLED(CONFIG_CIFS_DFS_UPCALL) */
+#define cifs_dfs_release_automount_timer()     do { } while (0)
+#endif /* ! IS_ENABLED(CONFIG_CIFS_DFS_UPCALL) */
+
 void cifs_proc_init(void);
 void cifs_proc_clean(void);