3.4-stable patches

added patches:
	dm-snapshot-fix-error-return-code-in-snapshot_ctr.patch

diff --git a/queue-3.4/dm-snapshot-fix-error-return-code-in-snapshot_ctr.patch b/queue-3.4/dm-snapshot-fix-error-return-code-in-snapshot_ctr.patch
new file mode 100644 (file)
index 0000000..48dd2ed
--- /dev/null
+++ b/queue-3.4/dm-snapshot-fix-error-return-code-in-snapshot_ctr.patch
@@ -0,0 +1,30 @@
+From 09e8b813897a0f85bb401435d009228644c81214 Mon Sep 17 00:00:00 2001
+From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
+Date: Fri, 10 May 2013 14:37:15 +0100
+Subject: dm snapshot: fix error return code in snapshot_ctr
+
+From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
+
+commit 09e8b813897a0f85bb401435d009228644c81214 upstream.
+
+Return -ENOMEM instead of success if unable to allocate pending
+exception mempool in snapshot_ctr.
+
+Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
+Signed-off-by: Alasdair G Kergon <agk@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/md/dm-snap.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/md/dm-snap.c
++++ b/drivers/md/dm-snap.c
+@@ -1117,6 +1117,7 @@ static int snapshot_ctr(struct dm_target
+       s->pending_pool = mempool_create_slab_pool(MIN_IOS, pending_cache);
+       if (!s->pending_pool) {
+               ti->error = "Could not allocate mempool for pending exceptions";
++              r = -ENOMEM;
+               goto bad_pending_pool;
+       }
+ 

diff --git a/queue-3.4/series b/queue-3.4/series
index c3080673112b42754c526f53edea13994eba36dc..0ba74b6d36089f51bb47b9f1a72d51269c12e72a 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -3,3 +3,4 @@ arm-omap-rx-51-change-probe-order-of-touchscreen-and-panel-spi-devices.patch
 asoc-wm8994-missing-break-in-wm8994_aif3_hw_params.patch
 acpica-fix-possible-buffer-overflow-during-a-field-unit-read-operation.patch
 alsa-hda-fix-oops-caused-by-dereference-null-pointer.patch
+dm-snapshot-fix-error-return-code-in-snapshot_ctr.patch