Commit 7a9cdc4c authored Nov 27, 2014 by Joe Thornber Committed by Greg Kroah-Hartman Jan 08, 2015

dm cache: dirty flag was mistakenly being cleared when promoting via overwrite



commit 1e32134a5a404e80bfb47fad8a94e9bbfcbdacc5 upstream.

If the incoming bio is a WRITE and completely covers a block then we
don't bother to do any copying for a promotion operation.  Once this is
done the cache block and origin block will be different, so we need to
set it to 'dirty'.

Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 4df99e3c

drivers/md/dm-cache-target.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -951,10 +951,14 @@ static void migration_success_post_commit(struct dm_cache_migration *mg)
		}

		} else {
		if (mg->requeue_holder) {
		clear_dirty(cache, mg->new_oblock, mg->cblock);
		if (mg->requeue_holder)
		cell_defer(cache, mg->new_ocell, true);
		else {
		} else {
		/*
		* The block was promoted via an overwrite, so it's dirty.
		*/
		set_dirty(cache, mg->new_oblock, mg->cblock);
		bio_endio(mg->new_ocell->holder, 0);
		cell_defer(cache, mg->new_ocell, false);
		}