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

Commit 0e242863 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Greg Kroah-Hartman
Browse files

dm writecache: verify watermark during resume 



commit 41c526c5af46d4c4dab7f72c99000b7fac0b9702 upstream.

Verify the watermark upon resume - so that if the target is reloaded
with lower watermark, it will start the cleanup process immediately.

Fixes: 48debafe ("dm: add writecache target")
Cc: stable@vger.kernel.org # 4.18+
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98423303

drivers/md/dm-writecache.c

+10 −2
Original line number Diff line number Diff line
@@ -631,6 +631,12 @@ static void writecache_add_to_freelist(struct dm_writecache *wc, struct wc_entry 
	wc->freelist_size++;

}



static inline void writecache_verify_watermark(struct dm_writecache *wc)

{

	if (unlikely(wc->freelist_size + wc->writeback_size <= wc->freelist_high_watermark))

		queue_work(wc->writeback_wq, &wc->writeback_work);

}



static struct wc_entry *writecache_pop_from_freelist(struct dm_writecache *wc)

{

	struct wc_entry *e;
@@ -652,8 +658,8 @@ static struct wc_entry *writecache_pop_from_freelist(struct dm_writecache *wc) 
		list_del(&e->lru);

	}

	wc->freelist_size--;

	if (unlikely(wc->freelist_size + wc->writeback_size <= wc->freelist_high_watermark))

		queue_work(wc->writeback_wq, &wc->writeback_work);



	writecache_verify_watermark(wc);



	return e;

}
@@ -967,6 +973,8 @@ static void writecache_resume(struct dm_target *ti) 
		writecache_commit_flushed(wc, false);

	}



	writecache_verify_watermark(wc);



	wc_unlock(wc);

}