[kernel] r22504 - in dists/trunk/linux: . debian debian/patches debian/patches/bugfix/all
Ben Hutchings
benh at moszumanska.debian.org
Mon Apr 13 01:18:26 UTC 2015
Author: benh
Date: Mon Apr 13 01:18:26 2015
New Revision: 22504
Log:
Merge changes from sid up to 3.16.7-ckt9-2
Added:
dists/trunk/linux/debian/patches/bugfix/all/btrfs-simplify-insert_orphan_item.patch
- copied unchanged from r22503, dists/sid/linux/debian/patches/bugfix/all/btrfs-simplify-insert_orphan_item.patch
Modified:
dists/trunk/linux/ (props changed)
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/patches/series
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Mon Apr 13 01:10:04 2015 (r22503)
+++ dists/trunk/linux/debian/changelog Mon Apr 13 01:18:26 2015 (r22504)
@@ -250,6 +250,12 @@
-- maximilian attems <maks at debian.org> Thu, 18 Sep 2014 23:50:00 +0200
+linux (3.16.7-ckt9-2) unstable; urgency=medium
+
+ * btrfs: simplify insert_orphan_item (Closes: #782362)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 13 Apr 2015 02:01:54 +0100
+
linux (3.16.7-ckt9-1) unstable; urgency=medium
* New upstream stable update:
Copied: dists/trunk/linux/debian/patches/bugfix/all/btrfs-simplify-insert_orphan_item.patch (from r22503, dists/sid/linux/debian/patches/bugfix/all/btrfs-simplify-insert_orphan_item.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/btrfs-simplify-insert_orphan_item.patch Mon Apr 13 01:18:26 2015 (r22504, copy of r22503, dists/sid/linux/debian/patches/bugfix/all/btrfs-simplify-insert_orphan_item.patch)
@@ -0,0 +1,42 @@
+From: David Sterba <dsterba at suse.cz>
+Date: Fri, 2 Jan 2015 19:12:57 +0100
+Subject: btrfs: simplify insert_orphan_item
+Origin: https://git.kernel.org/linus/9c4f61f01d269815bb7c37be3ede59c5587747c6
+Bug-Debian: https://bugs.debian.org/782362
+
+We can search and add the orphan item in one go,
+btrfs_insert_orphan_item will find out if the item already exists.
+
+Signed-off-by: David Sterba <dsterba at suse.cz>
+---
+ fs/btrfs/tree-log.c | 16 ++++------------
+ 1 file changed, 4 insertions(+), 12 deletions(-)
+
+--- a/fs/btrfs/tree-log.c
++++ b/fs/btrfs/tree-log.c
+@@ -1263,21 +1263,13 @@ out:
+ }
+
+ static int insert_orphan_item(struct btrfs_trans_handle *trans,
+- struct btrfs_root *root, u64 offset)
++ struct btrfs_root *root, u64 ino)
+ {
+ int ret;
+- struct btrfs_path *path;
+
+- path = btrfs_alloc_path();
+- if (!path)
+- return -ENOMEM;
+-
+- ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID,
+- offset, BTRFS_ORPHAN_ITEM_KEY, NULL);
+- if (ret > 0)
+- ret = btrfs_insert_orphan_item(trans, root, offset);
+-
+- btrfs_free_path(path);
++ ret = btrfs_insert_orphan_item(trans, root, ino);
++ if (ret == -EEXIST)
++ ret = 0;
+
+ return ret;
+ }
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Mon Apr 13 01:10:04 2015 (r22503)
+++ dists/trunk/linux/debian/patches/series Mon Apr 13 01:18:26 2015 (r22504)
@@ -88,3 +88,5 @@
features/all/psmouse/input-psmouse-ensure-that-focaltech-reports-consiste.patch
features/all/psmouse/input-psmouse-disable-changing-resolution-rate-scale.patch
features/all/psmouse/input-psmouse-disable-palm-detection-in-the-focaltec.patch
+
+bugfix/all/btrfs-simplify-insert_orphan_item.patch
More information about the Kernel-svn-changes
mailing list