From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f98.google.com (mail-qv1-f98.google.com [209.85.219.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F620227E97 for ; Wed, 30 Apr 2025 22:52:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.98 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746053567; cv=none; b=h9jACFgSn6S1j6ZArMH/dFL3jQapY0X7JTqBuhV33l4z6v48qoL1mPq/GNdFfqD5mPI33zUJzBQRFvpn3K+PKvsI46datkkxTOJQ63SZIs7H+7gGe8OF7zyHCjG+5e9KSF9U2oPxTz1UdG7R+RDc5js+BlYWNOuMPh7dCKOUU/4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746053567; c=relaxed/simple; bh=nXCg+pXbRoR81xflleG9ocvd7Z1Tja2d5kz5BHY9Lik=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hYX/+qYe6hiiN80vNc5adcfFRdVyfg3i1Ff/0vFt5SzhCN1kqtma1mZwExUVvebmPGhnPHn/NyVu7iGf7QP9qDGheQ0Wx9Gz9SKhyTVkgtB8anIVaFAP9ku0/n+YyNTd38QOwLf/4lLypyOem7n+2v4nSAelX72r1GI88yZstl0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=KAyJdyeZ; arc=none smtp.client-ip=209.85.219.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="KAyJdyeZ" Received: by mail-qv1-f98.google.com with SMTP id 6a1803df08f44-6f2af1e6d16so551296d6.3 for ; Wed, 30 Apr 2025 15:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1746053564; x=1746658364; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w2c2dCDfSwBPxUeqKnIelTKrQEoECHUUK99fQC7EIqE=; b=KAyJdyeZ9JgtstAAPiaiMP2xQqfoVvDeguNGkjrVMaGnE2cdj7OJSvWCmh+Fh+woNz yYYBn6ox6DoLpGgktf1dafxOw+3+4ymQnEr5ykD33AJnsihF7C/bbyuZ9QdOCZmZ9g0B GlhKT6z2KkbaSqSA0Z+nurOscadT2udI4whoOmKMHzW8tyPWQsRYPeE+LqnVduw6k9yw JaBCelbK8/hosIhDx06Ow5DzfMLjzpOGw16G7WzScWXT93E4WrLleLEI0tgeodJZJ257 ZRY/vu0va/nQWkU1oCo7AXJR0s+maCLLTtCYic7lpPNWld2/DddeGxmC7hygQ0dW+fPR lBkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746053564; x=1746658364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w2c2dCDfSwBPxUeqKnIelTKrQEoECHUUK99fQC7EIqE=; b=URwQywj60BTIsphLLPOSx3eiMZrg1QWg4tvyiFqgcdHFeMQsWlbRHNaeKBuyFzu/uA 0UlWS9CGTJqYT2pXNuXyrQG1q7ey/Al2G+75FLv7l5z5kzUrG0e1SF1GAvWf3pt1ulzZ PtOHgxE4Hy0ZwLP20CUYkZYzj14b1X9rvPSGmQKcV5hm6Q+4nkfpGEzvN6kxpa9v+uFc 1Z6GWB6RxTUK+BSh7l2FYx/DuscJlUmiwZ096o9QV9JGhSTjzgtcbqu3V38C4GLmEj17 vjzXwvSJK5ztHbTwipWGvQYZdsLz7YsZclzpWIDXh48+AFRdqgTsfsJR0iiAG3apO8UW y6iQ== X-Forwarded-Encrypted: i=1; AJvYcCX3SPYaFyYINCKqij1Gx2OGBrJoGuMfCd4ED/xP69JjSlPVr9/j8GdBtXdnbbCOeGgLXeIvErCoGylX0g==@vger.kernel.org X-Gm-Message-State: AOJu0Yy8JFj58zSiVXsQvyqQHFrRY61IcSjd0kTHx6sBDFlVyAiPdu51 1iAWNDEjXZO6//1MmvIHee8+frteRJQp8hB6jRhXLdxLcfaJ6SHOTOm9n5kAjJ4RGB4OWZR+fPW Ubse6mbcgnOSQwBXTFkijLtK6Kfw74gyX3feArBooZUQZZ/tH X-Gm-Gg: ASbGncudyhGwBVtgxJ1o21yWcATPN5mS9qA/trNilt0ZD3yieVYRhs8UeN2+1GLUEIt 4NBkQNp7RFGLgtExC/ez6bgKuq1zRSa351bWMZoc6e3vdXcOYxKpuCkmArC28o9+ZSfNRLXcomi +Zp7K5yTy3/Dh6xhAT1QZha0nZVwZtoyagSVdPX9eLsSffjy4ECjfQcerwSoEo0uuysgOtgrWag SG0JeWbfd1i8Bt5yZaYQrwjvn4+5WvvdqV5lNmnEblHUlbdj6wK81vsUXOJop+LPvgm0EBuKwnS kb9u/pnecxJJfAbPXY4Ml3yniSCSDQ== X-Google-Smtp-Source: AGHT+IESWiXXlmdqbgJMpyGebdlLbXn8F07CDFuUX/F5hmqRKqmz+YwqsOelqF64p4S+Y6KzAphRZ8TJYC+G X-Received: by 2002:ad4:4eef:0:b0:6d8:99b2:63c7 with SMTP id 6a1803df08f44-6f4ff62b7a2mr21508726d6.9.1746053564282; Wed, 30 Apr 2025 15:52:44 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-6f4fe822198sm1264146d6.65.2025.04.30.15.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 15:52:44 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id A3CFB34022D; Wed, 30 Apr 2025 16:52:43 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id A2634E41CC0; Wed, 30 Apr 2025 16:52:43 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: Uday Shankar , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 3/9] ublk: remove misleading "ubq" in "ubq_complete_io_cmd()" Date: Wed, 30 Apr 2025 16:52:28 -0600 Message-ID: <20250430225234.2676781-4-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250430225234.2676781-1-csander@purestorage.com> References: <20250430225234.2676781-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ubq_complete_io_cmd() doesn't interact with a ublk queue, so "ubq" in the name is confusing. Most likely "ubq" was meant to be "ublk". Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 44ba6c9d8929..4967a5d72029 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1123,12 +1123,12 @@ static void ublk_complete_rq(struct kref *ref) struct request *req = blk_mq_rq_from_pdu(data); __ublk_complete_rq(req); } -static void ubq_complete_io_cmd(struct ublk_io *io, int res, - unsigned issue_flags) +static void ublk_complete_io_cmd(struct ublk_io *io, int res, + unsigned issue_flags) { /* mark this cmd owned by ublksrv */ io->flags |= UBLK_IO_FLAG_OWNED_BY_SRV; /* @@ -1188,11 +1188,12 @@ static void ublk_dispatch_req(struct ublk_queue *ubq, if (!(io->flags & UBLK_IO_FLAG_NEED_GET_DATA)) { io->flags |= UBLK_IO_FLAG_NEED_GET_DATA; pr_devel("%s: need get data. op %d, qid %d tag %d io_flags %x\n", __func__, io->cmd->cmd_op, ubq->q_id, req->tag, io->flags); - ubq_complete_io_cmd(io, UBLK_IO_RES_NEED_GET_DATA, issue_flags); + ublk_complete_io_cmd(io, UBLK_IO_RES_NEED_GET_DATA, + issue_flags); return; } /* * We have handled UBLK_IO_NEED_GET_DATA command, * so clear UBLK_IO_FLAG_NEED_GET_DATA now and just @@ -1227,11 +1228,11 @@ static void ublk_dispatch_req(struct ublk_queue *ubq, ublk_get_iod(ubq, req->tag)->nr_sectors = mapped_bytes >> 9; } ublk_init_req_ref(ubq, req); - ubq_complete_io_cmd(io, UBLK_IO_RES_OK, issue_flags); + ublk_complete_io_cmd(io, UBLK_IO_RES_OK, issue_flags); } static void ublk_cmd_tw_cb(struct io_uring_cmd *cmd, unsigned int issue_flags) { -- 2.45.2