Commit 815465c4 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

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: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 6dae51a5

fs/cifs/cifsfs.c

+0 −2
Original line number Diff line number Diff line
@@ -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();

fs/cifs/cifsproto.h

+6 −0
Original line number Diff line number Diff line
@@ -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);