ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

blk-crypto: drop the NULL check from blk_crypto_put_keyslot()

Browse Source 
Now that all callers of blk_crypto_put_keyslot() check for NULL before
calling it, there is no need for blk_crypto_put_keyslot() to do the NULL
check itself.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20230315183907.53675-2-ebiggers@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Eric Biggers
2023-03-15 11:39:07 -07:00
committed by Jens Axboe
parent 5b8562f0e8
commit 4cf2c3ab2c
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
block/blk-crypto-profile.c
View File

@@ -227,14 +227,13 @@ EXPORT_SYMBOL_GPL(blk_crypto_keyslot_index);
* @profile: the crypto profile of the device the key will be used on * @profile: the crypto profile of the device the key will be used on
* @key: the key that will be used * @key: the key that will be used
* @slot_ptr: If a keyslot is allocated, an opaque pointer to the keyslot struct * @slot_ptr: If a keyslot is allocated, an opaque pointer to the keyslot struct
* will be stored here; otherwise NULL will be stored here. * will be stored here. blk_crypto_put_keyslot() must be called
* later to release it. Otherwise, NULL will be stored here.
* *
* If the device has keyslots, this gets a keyslot that's been programmed with * If the device has keyslots, this gets a keyslot that's been programmed with
* the specified key. If the key is already in a slot, this reuses it; * the specified key. If the key is already in a slot, this reuses it;
* otherwise this waits for a slot to become idle and programs the key into it. * otherwise this waits for a slot to become idle and programs the key into it.
* *
* This must be paired with a call to blk_crypto_put_keyslot().
*
* Context: Process context. Takes and releases profile->lock. * Context: Process context. Takes and releases profile->lock.
* Return: BLK_STS_OK on success, meaning that either a keyslot was allocated or * Return: BLK_STS_OK on success, meaning that either a keyslot was allocated or
* one wasn't needed; or a blk_status_t error on failure. * one wasn't needed; or a blk_status_t error on failure.
@@ -312,20 +311,15 @@ success:
/** /**
* blk_crypto_put_keyslot() - Release a reference to a keyslot * blk_crypto_put_keyslot() - Release a reference to a keyslot
* @slot: The keyslot to release the reference of (may be NULL). * @slot: The keyslot to release the reference of
* *
* Context: Any context. * Context: Any context.
*/ */
void blk_crypto_put_keyslot(struct blk_crypto_keyslot *slot) void blk_crypto_put_keyslot(struct blk_crypto_keyslot *slot)
{ {
struct blk_crypto_profile *profile; struct blk_crypto_profile *profile = slot->profile;
unsigned long flags; unsigned long flags;
if (!slot)
return;
profile = slot->profile;
if (atomic_dec_and_lock_irqsave(&slot->slot_refs, if (atomic_dec_and_lock_irqsave(&slot->slot_refs,
&profile->idle_slots_lock, flags)) { &profile->idle_slots_lock, flags)) {
list_add_tail(&slot->idle_slot_node, &profile->idle_slots); list_add_tail(&slot->idle_slot_node, &profile->idle_slots);