Skip to content

Commit bf0a732

Browse files
YuKuai-huaweiYu Kuai
authored andcommitted
md: only include md-cluster.h if necessary
md-cluster is only supportted by raid1 and raid10, there is no need to include md-cluster.h for other personalities. Also move APIs that is only used in md-cluster.c from md.h to md-cluster.h. Link: https://lore.kernel.org/linux-raid/[email protected] Signed-off-by: Yu Kuai <[email protected]> Reviewed-by: Su Yue <[email protected]>
1 parent 9faab54 commit bf0a732

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

drivers/md/md-bitmap.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
#include <linux/buffer_head.h>
3030
#include <linux/seq_file.h>
3131
#include <trace/events/block.h>
32+
3233
#include "md.h"
3334
#include "md-bitmap.h"
35+
#include "md-cluster.h"
3436

3537
#define BITMAP_MAJOR_LO 3
3638
/* version 4 insists the bitmap is in little-endian order

drivers/md/md-cluster.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ struct md_cluster_operations {
3535
void (*update_size)(struct mddev *mddev, sector_t old_dev_sectors);
3636
};
3737

38+
extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
39+
struct module *module);
40+
extern int unregister_md_cluster_operations(void);
41+
extern int md_setup_cluster(struct mddev *mddev, int nodes);
42+
extern void md_cluster_stop(struct mddev *mddev);
43+
extern void md_reload_sb(struct mddev *mddev, int raid_disk);
44+
3845
#endif /* _MD_CLUSTER_H */

drivers/md/md.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/wait.h>
2020
#include <linux/workqueue.h>
2121
#include <trace/events/block.h>
22-
#include "md-cluster.h"
2322

2423
#define MaxSector (~(sector_t)0)
2524

@@ -845,11 +844,6 @@ static inline void safe_put_page(struct page *p)
845844

846845
extern int register_md_personality(struct md_personality *p);
847846
extern int unregister_md_personality(struct md_personality *p);
848-
extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
849-
struct module *module);
850-
extern int unregister_md_cluster_operations(void);
851-
extern int md_setup_cluster(struct mddev *mddev, int nodes);
852-
extern void md_cluster_stop(struct mddev *mddev);
853847
extern struct md_thread *md_register_thread(
854848
void (*run)(struct md_thread *thread),
855849
struct mddev *mddev,
@@ -906,7 +900,6 @@ extern void md_idle_sync_thread(struct mddev *mddev);
906900
extern void md_frozen_sync_thread(struct mddev *mddev);
907901
extern void md_unfrozen_sync_thread(struct mddev *mddev);
908902

909-
extern void md_reload_sb(struct mddev *mddev, int raid_disk);
910903
extern void md_update_sb(struct mddev *mddev, int force);
911904
extern void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev);
912905
extern void mddev_destroy_serial_pool(struct mddev *mddev,

drivers/md/raid1.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "md.h"
3737
#include "raid1.h"
3838
#include "md-bitmap.h"
39+
#include "md-cluster.h"
3940

4041
#define UNSUPPORTED_MDDEV_FLAGS \
4142
((1L << MD_HAS_JOURNAL) | \

drivers/md/raid10.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "raid10.h"
2525
#include "raid0.h"
2626
#include "md-bitmap.h"
27+
#include "md-cluster.h"
2728

2829
/*
2930
* RAID10 provides a combination of RAID0 and RAID1 functionality.

0 commit comments

Comments
 (0)