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 <neilb@suse.de>
master
NeilBrown 14 years ago
parent 92022950c6
commit bff61975b3
  1. 2
      crypto/xor.c
  2. 3
      drivers/md/bitmap.c
  3. 5
      drivers/md/faulty.c
  4. 4
      drivers/md/linear.c
  5. 2
      drivers/md/linear.h
  6. 6
      drivers/md/md.c
  7. 4
      drivers/md/multipath.c
  8. 2
      drivers/md/multipath.h
  9. 3
      drivers/md/raid0.c
  10. 2
      drivers/md/raid0.h
  11. 5
      drivers/md/raid1.c
  12. 2
      drivers/md/raid1.h
  13. 5
      drivers/md/raid10.c
  14. 2
      drivers/md/raid10.h
  15. 8
      drivers/md/raid5.c
  16. 1
      drivers/md/raid5.h
  17. 6
      drivers/md/raid6.h
  18. 2
      fs/compat_ioctl.c
  19. 39
      include/linux/raid/md.h
  20. 3
      include/linux/raid/md_k.h
  21. 2
      include/linux/raid/xor.h
  22. 1
      init/do_mounts.h
  23. 3
      init/do_mounts_md.c

@ -18,8 +18,8 @@
#define BH_TRACE 0
#include <linux/module.h>
#include <linux/raid/md.h>
#include <linux/raid/xor.h>
#include <linux/jiffies.h>
#include <asm/xor.h>
/* The xor routines to use. */

@ -16,6 +16,7 @@
* wait if count gets too high, wake when it drops to half.
*/
#include <linux/blkdev.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/slab.h>
@ -26,7 +27,7 @@
#include <linux/file.h>
#include <linux/mount.h>
#include <linux/buffer_head.h>
#include <linux/raid/md.h>
#include <linux/raid/md_k.h>
#include "bitmap.h"
/* debug macros */

@ -62,7 +62,10 @@
#define ModeShift 5
#define MaxFault 50
#include <linux/raid/md.h>
#include <linux/blkdev.h>
#include <linux/raid/md_u.h>
#include <linux/raid/md_k.h>
#include <linux/seq_file.h>
static void faulty_fail(struct bio *bio, int error)

@ -16,6 +16,10 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/blkdev.h>
#include <linux/raid/md_u.h>
#include <linux/raid/md_k.h>
#include <linux/seq_file.h>
#include "linear.h"
/*

@ -1,8 +1,6 @@
#ifndef _LINEAR_H
#define _LINEAR_H
#include <linux/raid/md.h>
struct dev_info {
mdk_rdev_t *rdev;
sector_t num_sectors;

@ -33,8 +33,9 @@
*/
#include <linux/kthread.h>
#include <linux/raid/md.h>
#include <linux/blkdev.h>
#include <linux/sysctl.h>
#include <linux/seq_file.h>
#include <linux/buffer_head.h> /* for invalidate_bdev */
#include <linux/poll.h>
#include <linux/ctype.h>
@ -44,6 +45,9 @@
#include <linux/reboot.h>
#include <linux/file.h>
#include <linux/delay.h>
#include <linux/raid/md_k.h>
#include <linux/raid/md_p.h>
#include <linux/raid/md_u.h>
#include "bitmap.h"
#define DEBUG 0

@ -19,6 +19,10 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/blkdev.h>
#include <linux/raid/md_u.h>
#include <linux/raid/md_k.h>
#include <linux/seq_file.h>
#include "multipath.h"
#define MAX_WORK_PER_DISK 128

@ -1,8 +1,6 @@
#ifndef _MULTIPATH_H
#define _MULTIPATH_H
#include <linux/raid/md.h>
struct multipath_info {
mdk_rdev_t *rdev;
};

@ -18,6 +18,9 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/blkdev.h>
#include <linux/raid/md_k.h>
#include <linux/seq_file.h>
#include "raid0.h"
static void raid0_unplug(struct request_queue *q)

@ -1,8 +1,6 @@
#ifndef _RAID0_H
#define _RAID0_H
#include <linux/raid/md.h>
struct strip_zone
{
sector_t zone_start; /* Zone offset in md_dev (in sectors) */

@ -31,8 +31,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "dm-bio-list.h"
#include <linux/delay.h>
#include <linux/blkdev.h>
#include <linux/raid/md_k.h>
#include <linux/seq_file.h>
#include "dm-bio-list.h"
#include "raid1.h"
#include "bitmap.h"

@ -1,8 +1,6 @@
#ifndef _RAID1_H
#define _RAID1_H
#include <linux/raid/md.h>
typedef struct mirror_info mirror_info_t;
struct mirror_info {

@ -18,8 +18,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "dm-bio-list.h"
#include <linux/delay.h>
#include <linux/blkdev.h>
#include <linux/raid/md_k.h>
#include <linux/seq_file.h>
#include "dm-bio-list.h"
#include "raid10.h"
#include "bitmap.h"

@ -1,8 +1,6 @@
#ifndef _RAID10_H
#define _RAID10_H
#include <linux/raid/md.h>
typedef struct mirror_info mirror_info_t;
struct mirror_info {

@ -43,8 +43,12 @@
* miss any bits.
*/
#include <linux/blkdev.h>
#include <linux/raid/md_k.h>
#include <linux/kthread.h>
#include <linux/async_tx.h>
#include <linux/seq_file.h>
#include "raid5.h"
#include "raid6.h"
#include "bitmap.h"
@ -1467,7 +1471,7 @@ static void copy_data(int frombio, struct bio *bio,
static void compute_parity6(struct stripe_head *sh, int method)
{
raid6_conf_t *conf = sh->raid_conf;
raid5_conf_t *conf = sh->raid_conf;
int i, pd_idx = sh->pd_idx, qd_idx, d0_idx, disks = sh->disks, count;
struct bio *chosen;
/**** 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)
static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page)
{
raid6_conf_t *conf = sh->raid_conf;
raid5_conf_t *conf = sh->raid_conf;
int disks = sh->disks;
struct bio *return_bi = NULL;
int i, pd_idx = sh->pd_idx;

@ -1,7 +1,6 @@
#ifndef _RAID5_H
#define _RAID5_H
#include <linux/raid/md.h>
#include <linux/raid/xor.h>
/*

@ -17,11 +17,7 @@
/* Set to 1 to use kernel-wide empty_zero_page */
#define RAID6_USE_EMPTY_ZERO_PAGE 0
#include <linux/raid/md.h>
#include "raid5.h"
typedef raid5_conf_t raid6_conf_t; /* Same configuration */
#include <linux/blkdev.h>
/* Additional compute_parity mode -- updates the parity w/o LOCKING */
#define UPDATE_PARITY 4

@ -23,7 +23,7 @@
#include <linux/if.h>
#include <linux/if_bridge.h>
#include <linux/slab.h>
#include <linux/raid/md.h>
#include <linux/raid/md_u.h>
#include <linux/kd.h>
#include <linux/route.h>
#include <linux/in6.h>

@ -1,39 +0,0 @@
/*
md.h : Multiple Devices driver for Linux
Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman
Copyright (C) 1994-96 Marc ZYNGIER
<zyngier@ufr-info-p7.ibp.fr> or
<maz@gloups.fdn.fr>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
You should have received a copy of the GNU General Public License
(for example /usr/src/linux/COPYING); if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef _MD_H
#define _MD_H
#include <linux/blkdev.h>
#include <linux/seq_file.h>
/*
* 'md_p.h' holds the 'physical' layout of RAID devices
* 'md_u.h' holds the user <=> kernel API
*
* 'md_k.h' holds kernel internal definitions
*/
#include <linux/raid/md_p.h>
#include <linux/raid/md_u.h>
#include <linux/raid/md_k.h>
#ifdef CONFIG_MD
#endif /* CONFIG_MD */
#endif

@ -15,9 +15,6 @@
#ifndef _MD_K_H
#define _MD_K_H
/* and dm-bio-list.h is not under include/linux because.... ??? */
#include "../../../drivers/md/dm-bio-list.h"
#ifdef CONFIG_BLOCK
#define MaxSector (~(sector_t)0)

@ -1,8 +1,6 @@
#ifndef _XOR_H
#define _XOR_H
#include <linux/raid/md.h>
#define MAX_XOR_BLOCKS 4
extern void xor_blocks(unsigned int count, unsigned int bytes,

@ -1,4 +1,5 @@
#include <linux/kernel.h>
#include <linux/blkdev.h>
#include <linux/init.h>
#include <linux/syscalls.h>
#include <linux/unistd.h>

@ -1,5 +1,6 @@
#include <linux/delay.h>
#include <linux/raid/md.h>
#include <linux/raid/md_u.h>
#include <linux/raid/md_p.h>
#include "do_mounts.h"

Loading…
Cancel
Save