mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
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 <ebiggers@google.com>
This commit is contained in:
committed by
Treehugger Robot
parent
3ec40c5b27
commit
2ef8812e37
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user