On Fri, Feb 17, 2012 at 8:31 AM, Jeff Layton <jlayton@xxxxxxxxxx> wrote:
> 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@xxxxxxxxxx>
> ---
> fs/cifs/cifsfs.c | 2 --
> fs/cifs/cifsproto.h | 6 ++++++
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index b1fd382..f5fa651 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -1182,9 +1182,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 6f4e243..121b949 100644
> --- a/fs/cifs/cifsproto.h
> +++ b/fs/cifs/cifsproto.h
> @@ -168,7 +168,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);
>
> --
> 1.7.7.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Looks correct.
Acked-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
