diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 18:27:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 18:27:03 -0700 |
| commit | d7173493683853047d6efc8d4454c70469a7b033 (patch) | |
| tree | 8e6dac16d3104494b5cc2f33756c582ecdc3b753 /drivers/md/dm-snap-persistent.c | |
| parent | 80d26236c7c583ea2f43b68008ab7e067102c62c (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | linux-d7173493683853047d6efc8d4454c70469a7b033.tar.gz linux-d7173493683853047d6efc8d4454c70469a7b033.tar.bz2 linux-d7173493683853047d6efc8d4454c70469a7b033.zip | |
Merge 3.12-rc3 into char-misc-next
We need/want the mei fixes in here so we can apply other updates that
are depending on them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/dm-snap-persistent.c')
| -rw-r--r-- | drivers/md/dm-snap-persistent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c index 3ac415675b6c..4caa8e6d59d7 100644 --- a/drivers/md/dm-snap-persistent.c +++ b/drivers/md/dm-snap-persistent.c @@ -256,7 +256,7 @@ static int chunk_io(struct pstore *ps, void *area, chunk_t chunk, int rw, */ INIT_WORK_ONSTACK(&req.work, do_metadata); queue_work(ps->metadata_wq, &req.work); - flush_work(&req.work); + flush_workqueue(ps->metadata_wq); return req.result; } |