diff options
| -rw-r--r-- | drivers/md/md.c | 4 | ||||
| -rw-r--r-- | include/linux/raid/md_k.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index c1613854f38d..3cf089349e77 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -144,7 +144,7 @@ static int start_readonly; | |||
| 144 | * start array, stop array, error, add device, remove device, | 144 | * start array, stop array, error, add device, remove device, |
| 145 | * start build, activate spare | 145 | * start build, activate spare |
| 146 | */ | 146 | */ |
| 147 | DECLARE_WAIT_QUEUE_HEAD(md_event_waiters); | 147 | static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters); |
| 148 | static atomic_t md_event_count; | 148 | static atomic_t md_event_count; |
| 149 | void md_new_event(mddev_t *mddev) | 149 | void md_new_event(mddev_t *mddev) |
| 150 | { | 150 | { |
| @@ -279,7 +279,7 @@ static inline void mddev_unlock(mddev_t * mddev) | |||
| 279 | md_wakeup_thread(mddev->thread); | 279 | md_wakeup_thread(mddev->thread); |
| 280 | } | 280 | } |
| 281 | 281 | ||
| 282 | mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr) | 282 | static mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr) |
| 283 | { | 283 | { |
| 284 | mdk_rdev_t * rdev; | 284 | mdk_rdev_t * rdev; |
| 285 | struct list_head *tmp; | 285 | struct list_head *tmp; |
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h index 12b3203e3419..0fb5af6d622d 100644 --- a/include/linux/raid/md_k.h +++ b/include/linux/raid/md_k.h | |||
| @@ -263,8 +263,6 @@ static inline char * mdname (mddev_t * mddev) | |||
| 263 | return mddev->gendisk ? mddev->gendisk->disk_name : "mdX"; | 263 | return mddev->gendisk ? mddev->gendisk->disk_name : "mdX"; |
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | extern mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr); | ||
| 267 | |||
| 268 | /* | 266 | /* |
| 269 | * iterates through some rdev ringlist. It's safe to remove the | 267 | * iterates through some rdev ringlist. It's safe to remove the |
| 270 | * current 'rdev'. Dont touch 'tmp' though. | 268 | * current 'rdev'. Dont touch 'tmp' though. |
