History

md: move headers out of include/linux/raid/

Move the headers with the local structures for the disciplines and bitmap.h into drivers/md/ so that they are more easily grepable for hacking and not far away. md.h is left where it is for now as there are some uses from the outside.

Christoph Hellwig committed 17 years ago

Commit ef740c31 parent 2a40a8a16 files · +13 −14Browse files

Unified · Split

16 files
  1. drivers/md/bitmap.c +1 −1
  2. drivers/md/bitmap.h +0 −0
  3. drivers/md/linear.c +1 −1
  4. drivers/md/linear.h +0 −0
  5. drivers/md/md.c +1 −1
  6. drivers/md/multipath.c +1 −1
  7. drivers/md/multipath.h +0 −0
  8. drivers/md/raid0.c +1 −1
  9. drivers/md/raid0.h +0 −0
  10. drivers/md/raid1.c +2 −2
  11. drivers/md/raid1.h +0 −0
  12. drivers/md/raid10.c +2 −2
  13. drivers/md/raid10.h +0 −0
  14. drivers/md/raid5.c +2 −3
  15. drivers/md/raid5.h +1 −1
  16. drivers/md/raid6.h +1 −1
drivers/md/bitmap.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27#include <linux/mount.h>27#include <linux/mount.h>
28#include <linux/buffer_head.h>28#include <linux/buffer_head.h>
29#include <linux/raid/md.h>29#include <linux/raid/md.h>
30#include <linux/raid/bitmap.h>30#include "bitmap.h"
31 31
32/* debug macros */32/* debug macros */
33 33
drivers/md/bitmap.hrenamed from include/linux/raid/bitmap.h+0−0

File renamed without changes.

drivers/md/linear.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
16 Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 16 Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17*/17*/
18 18
19#include <linux/raid/linear.h>19#include "linear.h"
20 20
21/*21/*
22 * find which device holds a particular offset 22 * find which device holds a particular offset
drivers/md/linear.hrenamed from include/linux/raid/linear.h+0−0

File renamed without changes.

drivers/md/md.c+1−1
@@ -34,7 +34,6 @@ · 33 unmodified lines
34 34
35#include <linux/kthread.h>35#include <linux/kthread.h>
36#include <linux/raid/md.h>36#include <linux/raid/md.h>
37#include <linux/raid/bitmap.h>
38#include <linux/sysctl.h>37#include <linux/sysctl.h>
39#include <linux/buffer_head.h> /* for invalidate_bdev */38#include <linux/buffer_head.h> /* for invalidate_bdev */
40#include <linux/poll.h>39#include <linux/poll.h>
@@ -45,6 +44,7 @@ · 4 unmodified lines
45#include <linux/reboot.h>44#include <linux/reboot.h>
46#include <linux/file.h>45#include <linux/file.h>
47#include <linux/delay.h>46#include <linux/delay.h>
47#include "bitmap.h"
48 48
49/* 63 partitions with the alternate major number (mdp) */49/* 63 partitions with the alternate major number (mdp) */
50#define MdpMinorShift 650#define MdpMinorShift 6
drivers/md/multipath.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
19 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.19 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 */20 */
21 21
22#include <linux/raid/multipath.h>22#include "multipath.h"
23 23
24#define MAX_WORK_PER_DISK 12824#define MAX_WORK_PER_DISK 128
25 25
drivers/md/multipath.hrenamed from include/linux/raid/multipath.h+0−0

File renamed without changes.

drivers/md/raid0.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
18 Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 18 Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19*/19*/
20 20
21#include <linux/raid/raid0.h>21#include "raid0.h"
22 22
23static void raid0_unplug(struct request_queue *q)23static void raid0_unplug(struct request_queue *q)
24{24{
drivers/md/raid0.hrenamed from include/linux/raid/raid0.h+0−0

File renamed without changes.

drivers/md/raid1.c+2−2
@@ -33,8 +33,8 @@ · 32 unmodified lines
33 33
34#include "dm-bio-list.h"34#include "dm-bio-list.h"
35#include <linux/delay.h>35#include <linux/delay.h>
36#include <linux/raid/raid1.h>36#include "raid1.h"
37#include <linux/raid/bitmap.h>37#include "bitmap.h"
38 38
39#define DEBUG 039#define DEBUG 0
40#if DEBUG40#if DEBUG
drivers/md/raid1.hrenamed from include/linux/raid/raid1.h+0−0

File renamed without changes.

drivers/md/raid10.c+2−2
@@ -20,8 +20,8 @@ · 19 unmodified lines
20 20
21#include "dm-bio-list.h"21#include "dm-bio-list.h"
22#include <linux/delay.h>22#include <linux/delay.h>
23#include <linux/raid/raid10.h>23#include "raid10.h"
24#include <linux/raid/bitmap.h>24#include "bitmap.h"
25 25
26/*26/*
27 * RAID10 provides a combination of RAID0 and RAID1 functionality.27 * RAID10 provides a combination of RAID0 and RAID1 functionality.
drivers/md/raid10.hrenamed from include/linux/raid/raid10.h+0−0

File renamed without changes.

drivers/md/raid5.c+2−3
@@ -44,10 +44,9 @@ · 43 unmodified lines
44 */44 */
45 45
46#include <linux/kthread.h>46#include <linux/kthread.h>
47#include "raid6.h"
48
49#include <linux/raid/bitmap.h>
50#include <linux/async_tx.h>47#include <linux/async_tx.h>
48#include "raid6.h"
49#include "bitmap.h"
51 50
52/*51/*
53 * Stripe cache52 * Stripe cache
drivers/md/raid5.hrenamed from include/linux/raid/raid5.h+1−1
@@ -319,7 +319,7 @@ struct r6_state { · 318 unmodified lines
319 * PREREAD_ACTIVE is set, else we set DELAYED which will send it to the delayed queue.319 * PREREAD_ACTIVE is set, else we set DELAYED which will send it to the delayed queue.
320 * HANDLE gets cleared if stripe_handle leave nothing locked.320 * HANDLE gets cleared if stripe_handle leave nothing locked.
321 */321 */
322 322
323 323
324struct disk_info {324struct disk_info {
325 mdk_rdev_t *rdev;325 mdk_rdev_t *rdev;
drivers/md/raid6.h+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
19#define RAID6_USE_EMPTY_ZERO_PAGE 019#define RAID6_USE_EMPTY_ZERO_PAGE 0
20 20
21#include <linux/raid/md.h>21#include <linux/raid/md.h>
22#include <linux/raid/raid5.h>22#include "raid5.h"
23 23
24typedef raid5_conf_t raid6_conf_t; /* Same configuration */24typedef raid5_conf_t raid6_conf_t; /* Same configuration */
25 25