diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/md/multipath.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
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; |