diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/md/multipath.c | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/md/multipath.c')
| -rw-r--r-- | drivers/md/multipath.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 42ee1a2dc144..4f4d1f383842 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
| @@ -417,6 +417,7 @@ static int multipath_run (mddev_t *mddev) | |||
| 417 | * bookkeeping area. [whatever we allocate in multipath_run(), | 417 | * bookkeeping area. [whatever we allocate in multipath_run(), |
| 418 | * should be freed in multipath_stop()] | 418 | * should be freed in multipath_stop()] |
| 419 | */ | 419 | */ |
| 420 | mddev->queue->queue_lock = &mddev->queue->__queue_lock; | ||
| 420 | 421 | ||
| 421 | conf = kzalloc(sizeof(multipath_conf_t), GFP_KERNEL); | 422 | conf = kzalloc(sizeof(multipath_conf_t), GFP_KERNEL); |
| 422 | mddev->private = conf; | 423 | mddev->private = conf; |