Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2012-04-13 17:53:16 +0200
committerJiri Kosina <jkosina@suse.cz>2012-04-17 12:27:57 +0200
commit3829766176e350799927800b899778b0335060ce (patch)
treec73138b595e71f2c29e9bffb22d7c62643346ff7
parentb0f31e30b79a6247920231984c8617045668993f (diff)
- patches.suse/btrfs-8061-handle-errors-from-read_tree_block.patch:rpm-3.0.26-0.7
fix broken condition (bnc#756821)
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.suse/btrfs-8061-handle-errors-from-read_tree_block.patch2
2 files changed, 7 insertions, 1 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 48be132e1b..c7b8574dc7 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Apr 13 17:50:11 CEST 2012 - dsterba@suse.cz
+
+- patches.suse/btrfs-8061-handle-errors-from-read_tree_block.patch:
+ fix broken condition (bnc#756821)
+
+-------------------------------------------------------------------
Thu Mar 29 12:46:34 CEST 2012 - tiwai@suse.de
- patches.drivers/drm-i915-suspend-fbdev-device-around-suspend-hiberna:
diff --git a/patches.suse/btrfs-8061-handle-errors-from-read_tree_block.patch b/patches.suse/btrfs-8061-handle-errors-from-read_tree_block.patch
index 639466c1f3..3adde45399 100644
--- a/patches.suse/btrfs-8061-handle-errors-from-read_tree_block.patch
+++ b/patches.suse/btrfs-8061-handle-errors-from-read_tree_block.patch
@@ -119,7 +119,7 @@ Index: linux-3.0-SLE11-SP2/fs/btrfs/relocation.c
bytenr = btrfs_node_blockptr(eb, path->slots[i]);
blocksize = btrfs_level_size(root, i - 1);
eb = read_tree_block(root, bytenr, blocksize, ptr_gen);
-+ BUG_ON(eb);
++ BUG_ON(!eb);
BUG_ON(btrfs_header_level(eb) != i - 1);
path->nodes[i - 1] = eb;
path->slots[i - 1] = 0;