3.4-stable patches

added patches:
	btrfs-handle-eagain-case-properly-in-btrfs_drop_snapshot.patch

diff --git a/queue-3.4/btrfs-handle-eagain-case-properly-in-btrfs_drop_snapshot.patch b/queue-3.4/btrfs-handle-eagain-case-properly-in-btrfs_drop_snapshot.patch
new file mode 100644 (file)
index 0000000..f6a3554
--- /dev/null
+++ b/queue-3.4/btrfs-handle-eagain-case-properly-in-btrfs_drop_snapshot.patch
@@ -0,0 +1,32 @@
+From 90515e7f5d7d24cbb2a4038a3f1b5cfa2921aa17 Mon Sep 17 00:00:00 2001
+From: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
+Date: Tue, 7 Jan 2014 17:26:58 +0800
+Subject: Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot()
+
+From: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
+
+commit 90515e7f5d7d24cbb2a4038a3f1b5cfa2921aa17 upstream.
+
+We may return early in btrfs_drop_snapshot(), we shouldn't
+call btrfs_std_err() for this case, fix it.
+
+Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
+Signed-off-by: Josef Bacik <jbacik@fb.com>
+Signed-off-by: Chris Mason <clm@fb.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/btrfs/extent-tree.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/btrfs/extent-tree.c
++++ b/fs/btrfs/extent-tree.c
+@@ -7033,7 +7033,7 @@ out:
+        */
+       if (root_dropped == false)
+               btrfs_add_dead_root(root);
+-      if (err)
++      if (err && err != -EAGAIN)
+               btrfs_std_error(root->fs_info, err);
+       return err;
+ }

diff --git a/queue-3.4/series b/queue-3.4/series
index b129e89ce4ab1cf1f3e8ce1e18dd080c7656a266..e05ece6d16e93b5a4abd7a06d980a184369de551 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -33,3 +33,4 @@ kvm-x86-fix-potential-divide-by-0-in-lapic-cve-2013-6367.patch
 usb-core-get-config-and-string-descriptors-for-unauthorized-devices.patch
 scsi-bfa-chinook-quad-port-16g-fc-hba-claim-issue.patch
 target-iscsi-fix-network-portal-creation-race.patch
+btrfs-handle-eagain-case-properly-in-btrfs_drop_snapshot.patch