diff options
author | 2013-10-07 15:43:04 +0100 | |
---|---|---|
committer | 2013-10-07 15:43:04 +0100 | |
commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/md/dm-snap-persistent.c | |
parent | ARM: bL_switcher: Add query interface to discover CPU affinities (diff) | |
parent | ARM: add support for bit sliced AES using NEON instructions (diff) | |
download | wireguard-linux-a56e74f546b64be93731e42d83baf5b538cc1b11.tar.xz wireguard-linux-a56e74f546b64be93731e42d83baf5b538cc1b11.zip |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
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; } |