diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-04-23 02:32:37 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-04-23 02:32:37 -0300 |
| commit | e5c51d506969bdd5e41af965c5116b43d6e4974f (patch) | |
| tree | dd338f78deb755b58f71f8a39d2f89d909f26e9d /libre/linux-libre/0001-fix-btrfs-mount-deadlock.patch | |
| parent | 8a08adf09118feefe83205c37debbff312c9af71 (diff) | |
linux-libre-3.19.5_gnu-1: updating version
Diffstat (limited to 'libre/linux-libre/0001-fix-btrfs-mount-deadlock.patch')
| -rw-r--r-- | libre/linux-libre/0001-fix-btrfs-mount-deadlock.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/libre/linux-libre/0001-fix-btrfs-mount-deadlock.patch b/libre/linux-libre/0001-fix-btrfs-mount-deadlock.patch deleted file mode 100644 index 9430d5833..000000000 --- a/libre/linux-libre/0001-fix-btrfs-mount-deadlock.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9c4f61f01d269815bb7c37be3ede59c5587747c6 Mon Sep 17 00:00:00 2001 -From: David Sterba <dsterba@suse.cz> -Date: Fri, 2 Jan 2015 19:12:57 +0100 -Subject: btrfs: simplify insert_orphan_item - -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@suse.cz> - -diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c -index 5be45c1..25a1c36 100644 ---- a/fs/btrfs/tree-log.c -+++ b/fs/btrfs/tree-log.c -@@ -1254,21 +1254,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; - } --- -cgit v0.10.2 - |