diff options
| author | Chris Mason <clm@fb.com> | 2017-02-28 14:35:09 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2017-02-28 14:35:09 -0800 |
| commit | e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b (patch) | |
| tree | e0a2b8e21ed58952c13e6d1dc3646eecd1ea211e /fs/btrfs/ctree.c | |
| parent | ef6ebf324216eaea95ff30da5a8e78e2a4311eba (diff) | |
| parent | 20a7db8ab3f2057a518448b1728d504ffadef65e (diff) | |
| download | blackbird-obmc-linux-e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b.tar.gz blackbird-obmc-linux-e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b.zip | |
Merge branch 'for-chris-4.11-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.11
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 1fb60ee77b4a..7dc8844037e0 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -453,8 +453,6 @@ __tree_mod_log_insert(struct btrfs_fs_info *fs_info, struct tree_mod_elem *tm) struct rb_node *parent = NULL; struct tree_mod_elem *cur; - BUG_ON(!tm); - tm->seq = btrfs_inc_tree_mod_seq(fs_info); tm_root = &fs_info->tree_mod_log; |
