diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-01 18:20:20 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-01 18:20:20 -0500 |
| commit | 8d3c3ddfa85837e24fad6fa39318617cbb59e843 (patch) | |
| tree | f699dcaac2a11f0c9506ad111ae39fd5e3617c2d /drivers/md/multipath.c | |
| parent | e8b2c3c47a53348aebbbeb5322e32937df958793 (diff) | |
| parent | 6927faf30920b8c03dfa007e732642a1f1f20089 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/md/multipath.c')
| -rw-r--r-- | drivers/md/multipath.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 6d7ddf32ef2e..3a62d440e27b 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
| @@ -435,7 +435,6 @@ static int multipath_run (mddev_t *mddev) | |||
| 435 | * bookkeeping area. [whatever we allocate in multipath_run(), | 435 | * bookkeeping area. [whatever we allocate in multipath_run(), |
| 436 | * should be freed in multipath_stop()] | 436 | * should be freed in multipath_stop()] |
| 437 | */ | 437 | */ |
| 438 | mddev->queue->queue_lock = &mddev->queue->__queue_lock; | ||
| 439 | 438 | ||
| 440 | conf = kzalloc(sizeof(multipath_conf_t), GFP_KERNEL); | 439 | conf = kzalloc(sizeof(multipath_conf_t), GFP_KERNEL); |
| 441 | mddev->private = conf; | 440 | mddev->private = conf; |