diff options
Diffstat (limited to 'fs/ceph/super.c')
| -rw-r--r-- | fs/ceph/super.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 2eb43f211325..e86aa9948124 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c | |||
| @@ -403,8 +403,6 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) | |||
| 403 | seq_printf(m, ",mount_timeout=%d", opt->mount_timeout); | 403 | seq_printf(m, ",mount_timeout=%d", opt->mount_timeout); |
| 404 | if (opt->osd_idle_ttl != CEPH_OSD_IDLE_TTL_DEFAULT) | 404 | if (opt->osd_idle_ttl != CEPH_OSD_IDLE_TTL_DEFAULT) |
| 405 | seq_printf(m, ",osd_idle_ttl=%d", opt->osd_idle_ttl); | 405 | seq_printf(m, ",osd_idle_ttl=%d", opt->osd_idle_ttl); |
| 406 | if (opt->osd_timeout != CEPH_OSD_TIMEOUT_DEFAULT) | ||
| 407 | seq_printf(m, ",osdtimeout=%d", opt->osd_timeout); | ||
| 408 | if (opt->osd_keepalive_timeout != CEPH_OSD_KEEPALIVE_DEFAULT) | 406 | if (opt->osd_keepalive_timeout != CEPH_OSD_KEEPALIVE_DEFAULT) |
| 409 | seq_printf(m, ",osdkeepalivetimeout=%d", | 407 | seq_printf(m, ",osdkeepalivetimeout=%d", |
| 410 | opt->osd_keepalive_timeout); | 408 | opt->osd_keepalive_timeout); |
| @@ -849,7 +847,7 @@ static int ceph_register_bdi(struct super_block *sb, | |||
| 849 | fsc->backing_dev_info.ra_pages = | 847 | fsc->backing_dev_info.ra_pages = |
| 850 | default_backing_dev_info.ra_pages; | 848 | default_backing_dev_info.ra_pages; |
| 851 | 849 | ||
| 852 | err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%d", | 850 | err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld", |
| 853 | atomic_long_inc_return(&bdi_seq)); | 851 | atomic_long_inc_return(&bdi_seq)); |
| 854 | if (!err) | 852 | if (!err) |
| 855 | sb->s_bdi = &fsc->backing_dev_info; | 853 | sb->s_bdi = &fsc->backing_dev_info; |
