diff options
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/bitmap.h | 2 | ||||
-rw-r--r-- | drivers/md/dm-region-hash.c | 2 | ||||
-rw-r--r-- | drivers/md/faulty.c | 2 | ||||
-rw-r--r-- | drivers/md/md.c | 2 | ||||
-rw-r--r-- | drivers/md/md.h | 2 | ||||
-rw-r--r-- | drivers/md/raid10.c | 6 | ||||
-rw-r--r-- | drivers/md/raid10.h | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h index 931a7a7c3796..d0aeaf46d932 100644 --- a/drivers/md/bitmap.h +++ b/drivers/md/bitmap.h | |||
@@ -45,7 +45,7 @@ | |||
45 | * | 45 | * |
46 | * The counter counts pending write requests, plus the on-disk bit. | 46 | * The counter counts pending write requests, plus the on-disk bit. |
47 | * When the counter is '1' and the resync bits are clear, the on-disk | 47 | * When the counter is '1' and the resync bits are clear, the on-disk |
48 | * bit can be cleared aswell, thus setting the counter to 0. | 48 | * bit can be cleared as well, thus setting the counter to 0. |
49 | * When we set a bit, or in the counter (to start a write), if the fields is | 49 | * When we set a bit, or in the counter (to start a write), if the fields is |
50 | * 0, we first set the disk bit and set the counter to 1. | 50 | * 0, we first set the disk bit and set the counter to 1. |
51 | * | 51 | * |
diff --git a/drivers/md/dm-region-hash.c b/drivers/md/dm-region-hash.c index dad011aed0c9..7771ed212182 100644 --- a/drivers/md/dm-region-hash.c +++ b/drivers/md/dm-region-hash.c | |||
@@ -419,7 +419,7 @@ void dm_rh_mark_nosync(struct dm_region_hash *rh, struct bio *bio) | |||
419 | /* | 419 | /* |
420 | * Possible cases: | 420 | * Possible cases: |
421 | * 1) DM_RH_DIRTY | 421 | * 1) DM_RH_DIRTY |
422 | * 2) DM_RH_NOSYNC: was dirty, other preceeding writes failed | 422 | * 2) DM_RH_NOSYNC: was dirty, other preceding writes failed |
423 | * 3) DM_RH_RECOVERING: flushing pending writes | 423 | * 3) DM_RH_RECOVERING: flushing pending writes |
424 | * Either case, the region should have not been connected to list. | 424 | * Either case, the region should have not been connected to list. |
425 | */ | 425 | */ |
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c index 339fdc670751..23078dabb6df 100644 --- a/drivers/md/faulty.c +++ b/drivers/md/faulty.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * | 30 | * |
31 | * Different modes can be active at a time, but only | 31 | * Different modes can be active at a time, but only |
32 | * one can be set at array creation. Others can be added later. | 32 | * one can be set at array creation. Others can be added later. |
33 | * A mode can be one-shot or recurrent with the recurrance being | 33 | * A mode can be one-shot or recurrent with the recurrence being |
34 | * once in every N requests. | 34 | * once in every N requests. |
35 | * The bottom 5 bits of the "layout" indicate the mode. The | 35 | * The bottom 5 bits of the "layout" indicate the mode. The |
36 | * remainder indicate a period, or 0 for one-shot. | 36 | * remainder indicate a period, or 0 for one-shot. |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 8b66e04c2ea6..b12b3776c0c0 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -6266,7 +6266,7 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev) | |||
6266 | * rt is a sector_t, so could be 32bit or 64bit. | 6266 | * rt is a sector_t, so could be 32bit or 64bit. |
6267 | * So we divide before multiply in case it is 32bit and close | 6267 | * So we divide before multiply in case it is 32bit and close |
6268 | * to the limit. | 6268 | * to the limit. |
6269 | * We scale the divisor (db) by 32 to avoid loosing precision | 6269 | * We scale the divisor (db) by 32 to avoid losing precision |
6270 | * near the end of resync when the number of remaining sectors | 6270 | * near the end of resync when the number of remaining sectors |
6271 | * is close to 'db'. | 6271 | * is close to 'db'. |
6272 | * We then divide rt by 32 after multiplying by db to compensate. | 6272 | * We then divide rt by 32 after multiplying by db to compensate. |
diff --git a/drivers/md/md.h b/drivers/md/md.h index 12215d437fcc..52b407369e13 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h | |||
@@ -94,7 +94,7 @@ struct mdk_rdev_s | |||
94 | #define In_sync 2 /* device is in_sync with rest of array */ | 94 | #define In_sync 2 /* device is in_sync with rest of array */ |
95 | #define WriteMostly 4 /* Avoid reading if at all possible */ | 95 | #define WriteMostly 4 /* Avoid reading if at all possible */ |
96 | #define AutoDetected 7 /* added by auto-detect */ | 96 | #define AutoDetected 7 /* added by auto-detect */ |
97 | #define Blocked 8 /* An error occured on an externally | 97 | #define Blocked 8 /* An error occurred on an externally |
98 | * managed array, don't allow writes | 98 | * managed array, don't allow writes |
99 | * until it is cleared */ | 99 | * until it is cleared */ |
100 | wait_queue_head_t blocked_wait; | 100 | wait_queue_head_t blocked_wait; |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index f7b62370b374..2da83d566592 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * RAID-10 support for md. | 6 | * RAID-10 support for md. |
7 | * | 7 | * |
8 | * Base on code in raid1.c. See raid1.c for futher copyright information. | 8 | * Base on code in raid1.c. See raid1.c for further copyright information. |
9 | * | 9 | * |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
@@ -340,14 +340,14 @@ static void raid10_end_write_request(struct bio *bio, int error) | |||
340 | 340 | ||
341 | /* | 341 | /* |
342 | * RAID10 layout manager | 342 | * RAID10 layout manager |
343 | * Aswell as the chunksize and raid_disks count, there are two | 343 | * As well as the chunksize and raid_disks count, there are two |
344 | * parameters: near_copies and far_copies. | 344 | * parameters: near_copies and far_copies. |
345 | * near_copies * far_copies must be <= raid_disks. | 345 | * near_copies * far_copies must be <= raid_disks. |
346 | * Normally one of these will be 1. | 346 | * Normally one of these will be 1. |
347 | * If both are 1, we get raid0. | 347 | * If both are 1, we get raid0. |
348 | * If near_copies == raid_disks, we get raid1. | 348 | * If near_copies == raid_disks, we get raid1. |
349 | * | 349 | * |
350 | * Chunks are layed out in raid0 style with near_copies copies of the | 350 | * Chunks are laid out in raid0 style with near_copies copies of the |
351 | * first chunk, followed by near_copies copies of the next chunk and | 351 | * first chunk, followed by near_copies copies of the next chunk and |
352 | * so on. | 352 | * so on. |
353 | * If far_copies > 1, then after 1/far_copies of the array has been assigned | 353 | * If far_copies > 1, then after 1/far_copies of the array has been assigned |
diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h index 2316ac2e8e21..944b1104d3b4 100644 --- a/drivers/md/raid10.h +++ b/drivers/md/raid10.h | |||
@@ -17,8 +17,8 @@ struct r10_private_data_s { | |||
17 | spinlock_t device_lock; | 17 | spinlock_t device_lock; |
18 | 18 | ||
19 | /* geometry */ | 19 | /* geometry */ |
20 | int near_copies; /* number of copies layed out raid0 style */ | 20 | int near_copies; /* number of copies laid out raid0 style */ |
21 | int far_copies; /* number of copies layed out | 21 | int far_copies; /* number of copies laid out |
22 | * at large strides across drives | 22 | * at large strides across drives |
23 | */ | 23 | */ |
24 | int far_offset; /* far_copies are offset by 1 stripe | 24 | int far_offset; /* far_copies are offset by 1 stripe |