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

Commit bf9011c7 authored by Omar Sandoval's avatar Omar Sandoval Committed by Greg Kroah-Hartman
Browse files

btrfs: don't prematurely free work in scrub_missing_raid56_worker() 



[ Upstream commit 57d4f0b863272ba04ba85f86bfdc0f976f0af91c ]

Currently, scrub_missing_raid56_worker() puts and potentially frees
sblock (which embeds the work item) and then submits a bio through
scrub_wr_submit(). This is another potential instance of the bug in
"btrfs: don't prematurely free work in run_ordered_work()". Fix it by
dropping the reference after we submit the bio.

Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ff90b89e

fs/btrfs/scrub.c

+1 −2
Original line number Diff line number Diff line
@@ -2145,14 +2145,13 @@ static void scrub_missing_raid56_worker(struct btrfs_work *work) 
		scrub_write_block_to_dev_replace(sblock);

	}



	scrub_block_put(sblock);



	if (sctx->is_dev_replace && sctx->flush_all_writes) {

		mutex_lock(&sctx->wr_lock);

		scrub_wr_submit(sctx);

		mutex_unlock(&sctx->wr_lock);

	}



	scrub_block_put(sblock);

	scrub_pending_bio_dec(sctx);

}