summaryrefslogtreecommitdiff
path: root/fs/cifs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-03-21 06:27:54 -0400
committerSteve French <sfrench@us.ibm.com>2012-03-21 11:55:44 -0500
commit815465c4d724e851932843227b4b700d64216cf2 (patch)
tree1ca2e93dad7d66fe8d63d2f9c87ad6f6e3c34239 /fs/cifs
parent6dae51a585008535858c29b489dbf90a913d511b (diff)
downloadlinux-3.10-815465c4d724e851932843227b4b700d64216cf2.tar.gz
linux-3.10-815465c4d724e851932843227b4b700d64216cf2.tar.bz2
linux-3.10-815465c4d724e851932843227b4b700d64216cf2.zip
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>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifsfs.c2
-rw-r--r--fs/cifs/cifsproto.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index f2661610fcf..260025fd8c3 100644
--- 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 47a769e535b..503e73d8bdb 100644
--- 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);