diff options
| author | Jeff Layton <jlayton@redhat.com> | 2011-07-09 12:21:07 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-07-09 16:29:51 -0400 |
| commit | 20547490c12b0ee3d32152b85e9f9bd183aa7224 (patch) | |
| tree | 98cff812d83763a35e1820faad54e01612947771 | |
| parent | 04db79b015dafcb79371fda6b5c32ffdbd31a2ff (diff) | |
cifs: move bdi_setup_and_register outside of CONFIG_CIFS_DFS_UPCALL
This needs to be done regardless of whether that KConfig option is set
or not.
Reported-by: Sven-Haegar Koch <haegar@sdinet.de>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | 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 46cc0ad03487..511176903e57 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -3002,6 +3002,7 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info) | |||
| 3002 | struct tcon_link *tlink; | 3002 | struct tcon_link *tlink; |
| 3003 | #ifdef CONFIG_CIFS_DFS_UPCALL | 3003 | #ifdef CONFIG_CIFS_DFS_UPCALL |
| 3004 | int referral_walks_count = 0; | 3004 | int referral_walks_count = 0; |
| 3005 | #endif | ||
| 3005 | 3006 | ||
| 3006 | rc = bdi_setup_and_register(&cifs_sb->bdi, "cifs", BDI_CAP_MAP_COPY); | 3007 | rc = bdi_setup_and_register(&cifs_sb->bdi, "cifs", BDI_CAP_MAP_COPY); |
| 3007 | if (rc) | 3008 | if (rc) |
| @@ -3009,6 +3010,7 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info) | |||
| 3009 | 3010 | ||
| 3010 | cifs_sb->bdi.ra_pages = default_backing_dev_info.ra_pages; | 3011 | cifs_sb->bdi.ra_pages = default_backing_dev_info.ra_pages; |
| 3011 | 3012 | ||
| 3013 | #ifdef CONFIG_CIFS_DFS_UPCALL | ||
| 3012 | try_mount_again: | 3014 | try_mount_again: |
| 3013 | /* cleanup activities if we're chasing a referral */ | 3015 | /* cleanup activities if we're chasing a referral */ |
| 3014 | if (referral_walks_count) { | 3016 | if (referral_walks_count) { |
