aboutsummaryrefslogtreecommitdiffstats
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 12:55:44 -0400
commit815465c4d724e851932843227b4b700d64216cf2 (patch)
tree1ca2e93dad7d66fe8d63d2f9c87ad6f6e3c34239
parent6dae51a585008535858c29b489dbf90a913d511b (diff)
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>
-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 f2661610fcf3..260025fd8c3b 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1177,9 +1177,7 @@ exit_cifs(void)
1177 cFYI(DBG2, "exit_cifs"); 1177 cFYI(DBG2, "exit_cifs");
1178 cifs_proc_clean(); 1178 cifs_proc_clean();
1179 cifs_fscache_unregister(); 1179 cifs_fscache_unregister();
1180#ifdef CONFIG_CIFS_DFS_UPCALL
1181 cifs_dfs_release_automount_timer(); 1180 cifs_dfs_release_automount_timer();
1182#endif
1183#ifdef CONFIG_CIFS_ACL 1181#ifdef CONFIG_CIFS_ACL
1184 cifs_destroy_idmaptrees(); 1182 cifs_destroy_idmaptrees();
1185 exit_cifs_idmap(); 1183 exit_cifs_idmap();
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 47a769e535b1..503e73d8bdb7 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,
171 const char *devname); 171 const char *devname);
172extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *); 172extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *);
173extern void cifs_umount(struct cifs_sb_info *); 173extern void cifs_umount(struct cifs_sb_info *);
174
175#if IS_ENABLED(CONFIG_CIFS_DFS_UPCALL)
174extern void cifs_dfs_release_automount_timer(void); 176extern void cifs_dfs_release_automount_timer(void);
177#else /* ! IS_ENABLED(CONFIG_CIFS_DFS_UPCALL) */
178#define cifs_dfs_release_automount_timer() do { } while (0)
179#endif /* ! IS_ENABLED(CONFIG_CIFS_DFS_UPCALL) */
180
175void cifs_proc_init(void); 181void cifs_proc_init(void);
176void cifs_proc_clean(void); 182void cifs_proc_clean(void);
177 183