Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf6d7d49 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove invalid null checks from btrfs_cleanup_dirty_bgs 



list_first_entry is essentially a wrapper over cotnainer_of. The latter
can never return null even if it's working on inconsistent list since it
will either crash or return some offset in the wrong struct.
Additionally, for the dirty_bgs list the iteration is done under
dirty_bgs_lock which ensures consistency of the list.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8f2ceaa7

fs/btrfs/disk-io.c

+0 −9
Original line number Diff line number Diff line
@@ -4327,11 +4327,6 @@ void btrfs_cleanup_dirty_bgs(struct btrfs_transaction *cur_trans, 
		cache = list_first_entry(&cur_trans->dirty_bgs,

					 struct btrfs_block_group_cache,

					 dirty_list);

		if (!cache) {

			btrfs_err(fs_info, "orphan block group dirty_bgs list");

			spin_unlock(&cur_trans->dirty_bgs_lock);

			return;

		}



		if (!list_empty(&cache->io_list)) {

			spin_unlock(&cur_trans->dirty_bgs_lock);
@@ -4355,10 +4350,6 @@ void btrfs_cleanup_dirty_bgs(struct btrfs_transaction *cur_trans, 
		cache = list_first_entry(&cur_trans->io_bgs,

					 struct btrfs_block_group_cache,

					 io_list);

		if (!cache) {

			btrfs_err(fs_info, "orphan block group on io_bgs list");

			return;

		}



		list_del_init(&cache->io_list);

		spin_lock(&cache->lock);