diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 08:20:56 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 08:20:56 +0100 |
commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /drivers/md/multipath.c | |
parent | Input: qt2160 - fix qt2160_write() implementation (diff) | |
parent | Linux 3.7-rc3 (diff) | |
download | linux-53279f36dccffc26ff536003fd6bb97cc21c3b82.tar.xz linux-53279f36dccffc26ff536003fd6bb97cc21c3b82.zip |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'drivers/md/multipath.c')
-rw-r--r-- | drivers/md/multipath.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 61a1833ebaf3..1642eae75a33 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c @@ -335,8 +335,9 @@ abort: * 3. Performs writes following reads for array syncronising. */ -static void multipathd (struct mddev *mddev) +static void multipathd(struct md_thread *thread) { + struct mddev *mddev = thread->mddev; struct multipath_bh *mp_bh; struct bio *bio; unsigned long flags; |