~hc/RK356X_SDK_RELEASE.git

summary
commits
tree
docs
forks
compare

blame | history | patch | commit | commitdiff

2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da

 kernel/block/blk-merge.c
.. .. @@ -803,6 +803,8 @@
803 803  	if (!blk_discard_mergable(req))
804 804  		elv_merge_requests(q, req, next);
805 805  
806 +	blk_crypto_rq_put_keyslot(next);
807 +
806 808  	/*
807 809  	 * 'next' is going away, so update stats accordingly
808 810  	 */

..	..	@@ -803,6 +803,8 @@
803	803	if (!blk_discard_mergable(req))
804	804	elv_merge_requests(q, req, next);
805	805
	806	+ blk_crypto_rq_put_keyslot(next);
	807	+
806	808	/*
807	809	* 'next' is going away, so update stats accordingly
808	810	*/