summaryrefslogtreecommitdiffstats
path: root/fs/ceph/addr.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2017-04-12 06:24:33 -0400
committerJens Axboe <axboe@fb.com>2017-04-20 14:09:55 -0400
commit09dc9fc24ba714a6d29349e49ec616edcb3ce560 (patch)
treee3a6a84f7d906230225180b551c0cb4adcf37b40 /fs/ceph/addr.c
parent9e11ceee23f25b6bb03de97ad1b729784f09538c (diff)
ceph: Convert to separately allocated bdi
Allocate struct backing_dev_info separately instead of embedding it inside client structure. This unifies handling of bdi among users. CC: Ilya Dryomov <idryomov@gmail.com> CC: "Yan, Zheng" <zyan@redhat.com> CC: Sage Weil <sage@redhat.com> CC: ceph-devel@vger.kernel.org Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/ceph/addr.c')
-rw-r--r--fs/ceph/addr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 1a3e1b40799a..9ecb2fd348cb 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -578,7 +578,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)
578 writeback_stat = atomic_long_inc_return(&fsc->writeback_count); 578 writeback_stat = atomic_long_inc_return(&fsc->writeback_count);
579 if (writeback_stat > 579 if (writeback_stat >
580 CONGESTION_ON_THRESH(fsc->mount_options->congestion_kb)) 580 CONGESTION_ON_THRESH(fsc->mount_options->congestion_kb))
581 set_bdi_congested(&fsc->backing_dev_info, BLK_RW_ASYNC); 581 set_bdi_congested(inode_to_bdi(inode), BLK_RW_ASYNC);
582 582
583 set_page_writeback(page); 583 set_page_writeback(page);
584 err = ceph_osdc_writepages(osdc, ceph_vino(inode), 584 err = ceph_osdc_writepages(osdc, ceph_vino(inode),
@@ -700,7 +700,7 @@ static void writepages_finish(struct ceph_osd_request *req)
700 if (atomic_long_dec_return(&fsc->writeback_count) < 700 if (atomic_long_dec_return(&fsc->writeback_count) <
701 CONGESTION_OFF_THRESH( 701 CONGESTION_OFF_THRESH(
702 fsc->mount_options->congestion_kb)) 702 fsc->mount_options->congestion_kb))
703 clear_bdi_congested(&fsc->backing_dev_info, 703 clear_bdi_congested(inode_to_bdi(inode),
704 BLK_RW_ASYNC); 704 BLK_RW_ASYNC);
705 705
706 if (rc < 0) 706 if (rc < 0)
@@ -979,7 +979,7 @@ get_more_pages:
979 if (atomic_long_inc_return(&fsc->writeback_count) > 979 if (atomic_long_inc_return(&fsc->writeback_count) >
980 CONGESTION_ON_THRESH( 980 CONGESTION_ON_THRESH(
981 fsc->mount_options->congestion_kb)) { 981 fsc->mount_options->congestion_kb)) {
982 set_bdi_congested(&fsc->backing_dev_info, 982 set_bdi_congested(inode_to_bdi(inode),
983 BLK_RW_ASYNC); 983 BLK_RW_ASYNC);
984 } 984 }
985 985