diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 04:28:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 04:28:46 -0400 |
| commit | 10e6962765f8213941eaa1cbb9de425ff0689e2e (patch) | |
| tree | c277e4ac5b2b7156152454578c39e90da5127dd8 /drivers/md/raid1.h | |
| parent | af07ce3e77d3b24ab1d71fcc5833d41800f23b2b (diff) | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
Merge commit 'v3.0-rc5' into perf/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/md/raid1.h')
| -rw-r--r-- | drivers/md/raid1.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/raid1.h b/drivers/md/raid1.h index 5fc4ca1af863..e743a64fac4f 100644 --- a/drivers/md/raid1.h +++ b/drivers/md/raid1.h | |||
| @@ -126,4 +126,6 @@ struct r1bio_s { | |||
| 126 | */ | 126 | */ |
| 127 | #define R1BIO_Returned 6 | 127 | #define R1BIO_Returned 6 |
| 128 | 128 | ||
| 129 | extern int md_raid1_congested(mddev_t *mddev, int bits); | ||
| 130 | |||
| 129 | #endif | 131 | #endif |