Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / fs / btrfs / ctree.c

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index f54511dd287ebcb29cda0377c952fca694b52c39..58acdec5eccf1e8c5f9d6e60d68f2358ce5e808d 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
                free_extent_buffer(buf);
                add_root_to_dirty_list(root);
        } else {
-               if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
-                       parent_start = parent->start;
-               else
+               if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
+                       if (parent)
+                               parent_start = parent->start;
+                       else
+                               parent_start = 0;
+               } else
                        parent_start = 0;
 
                WARN_ON(trans->transid != btrfs_header_generation(parent));