diff --git a/[refs] b/[refs] index c4affd9a1fa9..a1c465b71dfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4c6f7b75ce9fa3bb78af314e1841af5716bb643 +refs/heads/master: d1d3cd27a32b819a0b0e2b9b6b5f9e80890f9821 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index 8e58a1f90546..bd48bf21118e 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -3846,8 +3846,6 @@ int btrfs_cleanup_transaction(struct btrfs_root *root) while (!list_empty(&list)) { t = list_entry(list.next, struct btrfs_transaction, list); - if (!t) - break; btrfs_destroy_ordered_operations(root);