From 29fa50f89b38ef7df837733491b52185bcb0f9c9 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 21 Mar 2012 06:27:54 -0400
Subject: [PATCH] --- yaml --- r: 294591 b: refs/heads/master c:
 815465c4d724e851932843227b4b700d64216cf2 h: refs/heads/master i:   294589:
 b34b3d0d5f521fdbc65d8f0805f4e7f77d00a974   294587:
 704203ed162b4be44790ea7d469267d1fe8b0327   294583:
 ac228661a28d3a18851ebc574934135c8f72c7f9   294575:
 f0a5d4e4b8b1649b13a1f2398cd23a186f396b1a   294559:
 09679a280cd7aea04c13ae58bdb28021d9674782   294527:
 b468bf97d9f900a23098d0b24a717daf1c4f9fbf v: v3

---
 [refs]                    | 2 +-
 trunk/fs/cifs/cifsfs.c    | 2 --
 trunk/fs/cifs/cifsproto.h | 6 ++++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a8d478f8ac20..0d7d7b644853 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dae51a585008535858c29b489dbf90a913d511b
+refs/heads/master: 815465c4d724e851932843227b4b700d64216cf2
diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c
index f2661610fcf3..260025fd8c3b 100644
--- a/trunk/fs/cifs/cifsfs.c
+++ b/trunk/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/trunk/fs/cifs/cifsproto.h b/trunk/fs/cifs/cifsproto.h
index 47a769e535b1..503e73d8bdb7 100644
--- a/trunk/fs/cifs/cifsproto.h
+++ b/trunk/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);