From b7f362d6413ebd0167ac5a9f09ad5dca5490ac1a Mon Sep 17 00:00:00 2001

From: Mikulas Patocka <mpatocka@redhat.com>

Date: Mon, 8 Aug 2022 10:50:10 -0400

Subject: [PATCH] dm writecache: fix smatch warning about invalid return from

 writecache_map

Git-commit: b7f362d6413ebd0167ac5a9f09ad5dca5490ac1a

Patch-mainline: v6.0-rc1

References: jsc#PED-2765

There's a smatch warning "inconsistent returns '&wc->lock'" in

dm-writecache. The reason for the warning is that writecache_map()

doesn't drop the lock on the impossible path.

Fix this warning by adding wc_unlock() after the BUG statement (so

that it will be compiled-away anyway).

Fixes: df699cc16ea5e ("dm writecache: report invalid return from writecache_map helpers")

Reported-by: kernel test robot <lkp@intel.com>

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

Signed-off-by: Mike Snitzer <snitzer@kernel.org>

Signed-off-by: Coly Li <colyli@suse.de>

---

 drivers/md/dm-writecache.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c

index ead008ea38f2..03fe2c5d5e32 100644

--- a/drivers/md/dm-writecache.c

+++ b/drivers/md/dm-writecache.c

@@ -1598,7 +1598,8 @@ static int writecache_map(struct dm_target *ti, struct bio *bio)

 	default:

 		BUG();

-		return -1;

+		wc_unlock(wc);

+		return DM_MAPIO_KILL;

 	}

 }

-- 

2.35.3