diff --git a/[refs] b/[refs] index 911df23f9066..08050c5e26ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3acada49c2794c5aac21849e2ea05790c6dd2faa +refs/heads/master: 33c17ad5717c887568c1de61f15e5d58ed66d189 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index a48c084f6d3a..3ea827ddf0fe 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -2607,8 +2607,8 @@ noinline int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, if (root->ref_cows) btrfs_drop_extent_cache(inode, new_size & (~mask), (u64)-1, 0); path = btrfs_alloc_path(); - path->reada = -1; BUG_ON(!path); + path->reada = -1; /* FIXME, add redo link to tree so we don't leak on crash */ key.objectid = inode->i_ino;