Re: [PATCH] cifs: move bdi_setup_and_register outside of CONFIG_CIFS_DFS_UPCALL
From: Steve French
Date: Sat Jul 09 2011 - 18:13:51 EST
looks correct; merged
On Sat, Jul 9, 2011 at 11:21 AM, Jeff Layton <jlayton@xxxxxxxxxx> wrote:
> This needs to be done regardless of whether that KConfig option is set
> or not.
>
> Reported-by: Sven-Haegar Koch <haegar@xxxxxxxxx>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> ---
> fs/cifs/connect.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index fea9ecf..dd695c5 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -3011,6 +3011,7 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info)
> struct tcon_link *tlink;
> #ifdef CONFIG_CIFS_DFS_UPCALL
> int referral_walks_count = 0;
> +#endif
>
> rc = bdi_setup_and_register(&cifs_sb->bdi, "cifs", BDI_CAP_MAP_COPY);
> if (rc)
> @@ -3018,6 +3019,7 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info)
>
> cifs_sb->bdi.ra_pages = default_backing_dev_info.ra_pages;
>
> +#ifdef CONFIG_CIFS_DFS_UPCALL
> try_mount_again:
> /* cleanup activities if we're chasing a referral */
> if (referral_walks_count) {
> --
> 1.7.6
>
>
--
Thanks,
Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/