Skip to content

Commit bff6197

Browse files
neilbrownneilbrown
committed
md: move lots of #include lines out of .h files and into .c
This makes the includes more explicit, and is preparation for moving md_k.h to drivers/md/md.h Remove include/raid/md.h as its only remaining use was to #include other files. Signed-off-by: NeilBrown <[email protected]>
1 parent 9202295 commit bff6197

23 files changed

+42
-70
lines changed

‎crypto/xor.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#define BH_TRACE 0
2020
#include <linux/module.h>
21-
#include <linux/raid/md.h>
2221
#include <linux/raid/xor.h>
22+
#include <linux/jiffies.h>
2323
#include <asm/xor.h>
2424

2525
/* The xor routines to use. */

‎drivers/md/bitmap.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* wait if count gets too high, wake when it drops to half.
1717
*/
1818

19+
#include <linux/blkdev.h>
1920
#include <linux/module.h>
2021
#include <linux/errno.h>
2122
#include <linux/slab.h>
@@ -26,7 +27,7 @@
2627
#include <linux/file.h>
2728
#include <linux/mount.h>
2829
#include <linux/buffer_head.h>
29-
#include <linux/raid/md.h>
30+
#include <linux/raid/md_k.h>
3031
#include "bitmap.h"
3132

3233
/* debug macros */

‎drivers/md/faulty.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@
6262
#define ModeShift 5
6363

6464
#define MaxFault 50
65-
#include <linux/raid/md.h>
65+
#include <linux/blkdev.h>
66+
#include <linux/raid/md_u.h>
67+
#include <linux/raid/md_k.h>
68+
#include <linux/seq_file.h>
6669

6770

6871
static void faulty_fail(struct bio *bio, int error)

‎drivers/md/linear.c

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1717
*/
1818

19+
#include <linux/blkdev.h>
20+
#include <linux/raid/md_u.h>
21+
#include <linux/raid/md_k.h>
22+
#include <linux/seq_file.h>
1923
#include "linear.h"
2024

2125
/*

‎drivers/md/linear.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef _LINEAR_H
22
#define _LINEAR_H
33

4-
#include <linux/raid/md.h>
5-
64
struct dev_info {
75
mdk_rdev_t *rdev;
86
sector_t num_sectors;

‎drivers/md/md.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333
*/
3434

3535
#include <linux/kthread.h>
36-
#include <linux/raid/md.h>
36+
#include <linux/blkdev.h>
3737
#include <linux/sysctl.h>
38+
#include <linux/seq_file.h>
3839
#include <linux/buffer_head.h> /* for invalidate_bdev */
3940
#include <linux/poll.h>
4041
#include <linux/ctype.h>
@@ -44,6 +45,9 @@
4445
#include <linux/reboot.h>
4546
#include <linux/file.h>
4647
#include <linux/delay.h>
48+
#include <linux/raid/md_k.h>
49+
#include <linux/raid/md_p.h>
50+
#include <linux/raid/md_u.h>
4751
#include "bitmap.h"
4852

4953
#define DEBUG 0

‎drivers/md/multipath.c

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2020
*/
2121

22+
#include <linux/blkdev.h>
23+
#include <linux/raid/md_u.h>
24+
#include <linux/raid/md_k.h>
25+
#include <linux/seq_file.h>
2226
#include "multipath.h"
2327

2428
#define MAX_WORK_PER_DISK 128

‎drivers/md/multipath.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef _MULTIPATH_H
22
#define _MULTIPATH_H
33

4-
#include <linux/raid/md.h>
5-
64
struct multipath_info {
75
mdk_rdev_t *rdev;
86
};

‎drivers/md/raid0.c

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1919
*/
2020

21+
#include <linux/blkdev.h>
22+
#include <linux/raid/md_k.h>
23+
#include <linux/seq_file.h>
2124
#include "raid0.h"
2225

2326
static void raid0_unplug(struct request_queue *q)

‎drivers/md/raid0.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef _RAID0_H
22
#define _RAID0_H
33

4-
#include <linux/raid/md.h>
5-
64
struct strip_zone
75
{
86
sector_t zone_start; /* Zone offset in md_dev (in sectors) */

‎drivers/md/raid1.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@
3131
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
3232
*/
3333

34-
#include "dm-bio-list.h"
3534
#include <linux/delay.h>
35+
#include <linux/blkdev.h>
36+
#include <linux/raid/md_k.h>
37+
#include <linux/seq_file.h>
38+
#include "dm-bio-list.h"
3639
#include "raid1.h"
3740
#include "bitmap.h"
3841

‎drivers/md/raid1.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef _RAID1_H
22
#define _RAID1_H
33

4-
#include <linux/raid/md.h>
5-
64
typedef struct mirror_info mirror_info_t;
75

86
struct mirror_info {

‎drivers/md/raid10.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1919
*/
2020

21-
#include "dm-bio-list.h"
2221
#include <linux/delay.h>
22+
#include <linux/blkdev.h>
23+
#include <linux/raid/md_k.h>
24+
#include <linux/seq_file.h>
25+
#include "dm-bio-list.h"
2326
#include "raid10.h"
2427
#include "bitmap.h"
2528

‎drivers/md/raid10.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef _RAID10_H
22
#define _RAID10_H
33

4-
#include <linux/raid/md.h>
5-
64
typedef struct mirror_info mirror_info_t;
75

86
struct mirror_info {

‎drivers/md/raid5.c

+6-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@
4343
* miss any bits.
4444
*/
4545

46+
#include <linux/blkdev.h>
47+
#include <linux/raid/md_k.h>
4648
#include <linux/kthread.h>
4749
#include <linux/async_tx.h>
50+
#include <linux/seq_file.h>
51+
#include "raid5.h"
4852
#include "raid6.h"
4953
#include "bitmap.h"
5054

@@ -1467,7 +1471,7 @@ static void copy_data(int frombio, struct bio *bio,
14671471

14681472
static void compute_parity6(struct stripe_head *sh, int method)
14691473
{
1470-
raid6_conf_t *conf = sh->raid_conf;
1474+
raid5_conf_t *conf = sh->raid_conf;
14711475
int i, pd_idx = sh->pd_idx, qd_idx, d0_idx, disks = sh->disks, count;
14721476
struct bio *chosen;
14731477
/**** FIX THIS: This could be very bad if disks is close to 256 ****/
@@ -2795,7 +2799,7 @@ static bool handle_stripe5(struct stripe_head *sh)
27952799

27962800
static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page)
27972801
{
2798-
raid6_conf_t *conf = sh->raid_conf;
2802+
raid5_conf_t *conf = sh->raid_conf;
27992803
int disks = sh->disks;
28002804
struct bio *return_bi = NULL;
28012805
int i, pd_idx = sh->pd_idx;

‎drivers/md/raid5.h

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef _RAID5_H
22
#define _RAID5_H
33

4-
#include <linux/raid/md.h>
54
#include <linux/raid/xor.h>
65

76
/*

‎drivers/md/raid6.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717

1818
/* Set to 1 to use kernel-wide empty_zero_page */
1919
#define RAID6_USE_EMPTY_ZERO_PAGE 0
20-
21-
#include <linux/raid/md.h>
22-
#include "raid5.h"
23-
24-
typedef raid5_conf_t raid6_conf_t; /* Same configuration */
20+
#include <linux/blkdev.h>
2521

2622
/* Additional compute_parity mode -- updates the parity w/o LOCKING */
2723
#define UPDATE_PARITY 4

‎fs/compat_ioctl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <linux/if.h>
2424
#include <linux/if_bridge.h>
2525
#include <linux/slab.h>
26-
#include <linux/raid/md.h>
26+
#include <linux/raid/md_u.h>
2727
#include <linux/kd.h>
2828
#include <linux/route.h>
2929
#include <linux/in6.h>

‎include/linux/raid/md.h

-39
This file was deleted.

‎include/linux/raid/md_k.h

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
#ifndef _MD_K_H
1616
#define _MD_K_H
1717

18-
/* and dm-bio-list.h is not under include/linux because.... ??? */
19-
#include "../../../drivers/md/dm-bio-list.h"
20-
2118
#ifdef CONFIG_BLOCK
2219

2320
#define MaxSector (~(sector_t)0)

‎include/linux/raid/xor.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef _XOR_H
22
#define _XOR_H
33

4-
#include <linux/raid/md.h>
5-
64
#define MAX_XOR_BLOCKS 4
75

86
extern void xor_blocks(unsigned int count, unsigned int bytes,

‎init/do_mounts.h

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <linux/kernel.h>
2+
#include <linux/blkdev.h>
23
#include <linux/init.h>
34
#include <linux/syscalls.h>
45
#include <linux/unistd.h>

‎init/do_mounts_md.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <linux/delay.h>
2-
#include <linux/raid/md.h>
2+
#include <linux/raid/md_u.h>
3+
#include <linux/raid/md_p.h>
34

45
#include "do_mounts.h"
56

0 commit comments

Comments
 (0)