From 2ef8812e375828afb246aae8af26f73a6cc2f54b Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 16 Dec 2022 23:30:40 +0000 Subject: [PATCH] ANDROID: dm-default-key: update for blk-crypto changes The prototypes of blk_crypto_evict_key() and blk_crypto_start_using_key() changed, so update the callers in dm-default-key which is not upstream. Bug: 160885805 Change-Id: Ie39a298d8aca77c042f11bbfa25fd9bf50593c52 Signed-off-by: Eric Biggers --- drivers/md/dm-default-key.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/md/dm-default-key.c b/drivers/md/dm-default-key.c index d19f9b0fb8c1..577c5fdb6bbc 100644 --- a/drivers/md/dm-default-key.c +++ b/drivers/md/dm-default-key.c @@ -68,8 +68,7 @@ static void default_key_dtr(struct dm_target *ti) int err; if (dkc->dev) { - err = blk_crypto_evict_key(bdev_get_queue(dkc->dev->bdev), - &dkc->key); + err = blk_crypto_evict_key(dkc->dev->bdev, &dkc->key); if (err && err != -ENOKEY) DMWARN("Failed to evict crypto key: %d", err); dm_put_device(ti, dkc->dev); @@ -245,8 +244,7 @@ static int default_key_ctr(struct dm_target *ti, unsigned int argc, char **argv) goto bad; } - err = blk_crypto_start_using_key(&dkc->key, - bdev_get_queue(dkc->dev->bdev)); + err = blk_crypto_start_using_key(dkc->dev->bdev, &dkc->key); if (err) { ti->error = "Error starting to use blk-crypto"; goto bad;