diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:07 +0800 |
| commit | 42f45c9abdea541a9f966553b5e71dd576d432f9 (patch) | |
| tree | e9189f804b03d19696b0944a5a34ea9427177646 /drivers/md/dm-snap.c | |
| parent | 4d8fd56f051e5eea61209de4a3cb0619283a30af (diff) | |
| parent | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-15.03-androidlinux-linaro-lsk-v3.10-android
Diffstat (limited to 'drivers/md/dm-snap.c')
| -rw-r--r-- | drivers/md/dm-snap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index 944690bafd93..d892a05c84f4 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -1439,8 +1439,6 @@ out: full_bio->bi_end_io = pe->full_bio_end_io; full_bio->bi_private = pe->full_bio_private; } - free_pending_exception(pe); - increment_pending_exceptions_done_count(); up_write(&s->lock); @@ -1457,6 +1455,8 @@ out: } retry_origin_bios(s, origin_bios); + + free_pending_exception(pe); } static void commit_callback(void *context, int success) |