summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-04-12 00:16:17 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-04-12 00:16:17 -0700
commit66db15b4577185624ae95ffe99a66305c8c63ef7 (patch)
tree31e3f279641ed3bea024d66c57e2ad4b13b2dfbb /include/linux
parentb1c72a96797037b7e62c1fc02bfefbb157ff5f48 (diff)
[PATCH] unplugging: md update
From: Neil Brown <neilb@cse.unsw.edu.au> I've made a bunch of changes to the 'md' bits - largely moving the unplugging into the individual personalities which know more about which drives are actually in use.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/raid/md_k.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 42c973c53d04..0b6b5e6f34eb 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -315,7 +315,7 @@ typedef struct mdk_thread_s {
#define THREAD_WAKEUP 0
-#define __wait_event_lock_irq(wq, condition, lock) \
+#define __wait_event_lock_irq(wq, condition, lock, cmd) \
do { \
wait_queue_t __wait; \
init_waitqueue_entry(&__wait, current); \
@@ -326,6 +326,7 @@ do { \
if (condition) \
break; \
spin_unlock_irq(&lock); \
+ cmd; \
schedule(); \
spin_lock_irq(&lock); \
} \
@@ -333,11 +334,11 @@ do { \
remove_wait_queue(&wq, &__wait); \
} while (0)
-#define wait_event_lock_irq(wq, condition, lock) \
+#define wait_event_lock_irq(wq, condition, lock, cmd) \
do { \
if (condition) \
break; \
- __wait_event_lock_irq(wq, condition, lock); \
+ __wait_event_lock_irq(wq, condition, lock, cmd); \
} while (0)
#endif