Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe7bda27 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: card: Add explicit checks for secure-discard requests"

parents bd2c1e44 ad791dcf

drivers/mmc/card/block.c

+1 −1
Original line number Diff line number Diff line
@@ -4043,7 +4043,7 @@ static int mmc_blk_cmdq_issue_rq(struct mmc_queue *mq, struct request *req) 
		struct mmc_host *host = card->host;

		struct mmc_cmdq_context_info *ctx = &host->cmdq_ctx;



		if ((req_op(req) == REQ_OP_FLUSH || req_op(req) ==  REQ_OP_DISCARD) &&

		if (mmc_req_is_special(req) &&

		    (card->quirks & MMC_QUIRK_CMDQ_EMPTY_BEFORE_DCMD) &&

		    ctx->active_small_sector_read_reqs) {

			ret = wait_event_interruptible(ctx->queue_empty_wq,

drivers/mmc/card/queue.c

+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ static inline void mmc_cmdq_ready_wait(struct mmc_host *host, 
	 */

	wait_event(ctx->wait, kthread_should_stop()

		|| (mmc_peek_request(mq) &&

		!(((req_op(mq->cmdq_req_peeked) == REQ_OP_FLUSH) ||

		   (req_op(mq->cmdq_req_peeked) == REQ_OP_DISCARD))

		!(mmc_req_is_special(mq->cmdq_req_peeked)

		  && test_bit(CMDQ_STATE_DCMD_ACTIVE, &ctx->curr_state))

		&& !(!host->card->part_curr && !mmc_card_suspended(host->card)

		     && mmc_host_halt(host))