From: Yu Kuai <yukuai3@xxxxxxxxxx> These helpers are used inside md-bitmap.c, prepare to build it as kernel module first, and perhaps mark it as deprecated after new lockless bitmap is introduced. Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx> --- drivers/md/md.c | 15 ++++++--------- drivers/md/md.h | 10 +++++++++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index aad9b87cafa0..d16a3d0f2b90 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -252,6 +252,7 @@ void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev) } } } +EXPORT_SYMBOL_GPL(mddev_create_serial_pool); /* * Free resource from rdev(s), and destroy serial_info_pool under conditions: @@ -291,6 +292,7 @@ void mddev_destroy_serial_pool(struct mddev *mddev, struct md_rdev *rdev) } } } +EXPORT_SYMBOL_GPL(mddev_destroy_serial_pool); static struct ctl_table_header *raid_table_header; @@ -972,15 +974,7 @@ void md_super_write(struct mddev *mddev, struct md_rdev *rdev, atomic_inc(&mddev->pending_writes); submit_bio(bio); } - -int md_super_wait(struct mddev *mddev) -{ - /* wait for all superblock writes that were scheduled to complete */ - wait_event(mddev->sb_wait, atomic_read(&mddev->pending_writes)==0); - if (test_and_clear_bit(MD_SB_NEED_REWRITE, &mddev->sb_flags)) - return -EAGAIN; - return 0; -} +EXPORT_SYMBOL_GPL(md_super_write); int sync_page_io(struct md_rdev *rdev, sector_t sector, int size, struct page *page, blk_opf_t opf, bool metadata_op) @@ -3793,6 +3787,7 @@ int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale) *res = result * int_pow(10, scale - decimals); return 0; } +EXPORT_SYMBOL_GPL(strict_strtoul_scaled); static ssize_t safe_delay_show(struct mddev *mddev, char *page) @@ -8556,6 +8551,7 @@ int md_setup_cluster(struct mddev *mddev, int nodes) mddev->safemode_delay = 0; return ret; } +EXPORT_SYMBOL_GPL(md_setup_cluster); void md_cluster_stop(struct mddev *mddev) { @@ -8564,6 +8560,7 @@ void md_cluster_stop(struct mddev *mddev) md_cluster_ops->leave(mddev); module_put(md_cluster_mod); } +EXPORT_SYMBOL_GPL(md_cluster_stop); static int is_mddev_idle(struct mddev *mddev, int init) { diff --git a/drivers/md/md.h b/drivers/md/md.h index a53af8818923..5eaac1d84523 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -869,7 +869,6 @@ void md_free_cloned_bio(struct bio *bio); extern bool __must_check md_flush_request(struct mddev *mddev, struct bio *bio); extern void md_super_write(struct mddev *mddev, struct md_rdev *rdev, sector_t sector, int size, struct page *page); -extern int md_super_wait(struct mddev *mddev); extern int sync_page_io(struct md_rdev *rdev, sector_t sector, int size, struct page *page, blk_opf_t opf, bool metadata_op); extern void md_do_sync(struct md_thread *thread); @@ -994,6 +993,15 @@ static inline bool mddev_is_dm(struct mddev *mddev) return !mddev->gendisk; } +static inline int md_super_wait(struct mddev *mddev) +{ + /* wait for all superblock writes that were scheduled to complete */ + wait_event(mddev->sb_wait, atomic_read(&mddev->pending_writes) == 0); + if (test_and_clear_bit(MD_SB_NEED_REWRITE, &mddev->sb_flags)) + return -EAGAIN; + return 0; +} + static inline void mddev_trace_remap(struct mddev *mddev, struct bio *bio, sector_t sector) { -- 2.39.2