From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f225.google.com (mail-il1-f225.google.com [209.85.166.225]) (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 CBE2521D3E2 for ; Sun, 27 Apr 2025 04:58:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.225 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745729896; cv=none; b=mmZJKHZa5NCKK4WBfohngJW7VQ9QAbpllIjsP7benvEIgNXUet9MujdZB4Q5u89khOvOlswdTncYHPCAQ4EZVVXTkX4FPbn6EKubR7amATtnL6zfh/5ZWBVwEj/Gw3mYMwGwMpdqRmkTL9/CIUIKvdzdD3Unnd6Kj+Bfb9437Vk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745729896; c=relaxed/simple; bh=gCtryARbd63GtwhGlpj7q+PNl0/S0Yitl78V0CxPUc4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UB3w+2Ko/27uUbYp4sJKDwJmQCf3C/i7mIacmn4g1JVJL/5qIgCNtN7pgFm3DpM5ngyJsVd854ns7Teq8ByPt0qeJRNMFY4zoEtJZXbEnLndwBrYSKYxPM5d9an/qaymYPPeVuyB6FvVOeUc6PoTy/xQXDYk3xS0Nz2yLCcG560= 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=QmbqHvan; arc=none smtp.client-ip=209.85.166.225 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="QmbqHvan" Received: by mail-il1-f225.google.com with SMTP id e9e14a558f8ab-3d6d983d45dso566805ab.1 for ; Sat, 26 Apr 2025 21:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745729894; x=1746334694; 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=lKzTeZL1yXOr28Rks+lyXg8sYjXSH1fjcAG3Y1vo6AY=; b=QmbqHvanyxS3eTdHAxQP+FLCB7Izox/vkBNAmSefG4qs9qe0yapMFoUQAt11DuqwGf qkv0VObZ4nwRbeLeH7P6qAdJrHlOtk9Kpn612pgqWwXxgeL/eXRGhF8Q5KmtWFgcBiKJ ppBJr4AtuBDxysJca4i0CyPbLaauIXX2GCP1v+gT2l/AksZzfPJ8Cu4j4IXh1kmomTDZ 0BbRCuPNqEggIe5PtU022i5YLAhxGM6ucELjklcexOtBTGBDNpNTmtvsWALDN3aGAkZQ ciL913IDskM2USSMLdn4GUyTtr+LZUwdI/m4CxI9nkhqnMdbhYJYHXgxltMfU11172t0 0d9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745729894; x=1746334694; 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=lKzTeZL1yXOr28Rks+lyXg8sYjXSH1fjcAG3Y1vo6AY=; b=lQu1QnUFm+AH22bzzXQOuDkdNwR0o6IJrTvKs+6JI/qJe0BsULDxqjsJkrAM1ZKMEb 55wQ3V5f7q4Buk1Qh0nnUHALyZ33wjy5IGIrTbWQ6UJ5B0xGRrk1fOJZzg2NNAUmVDE3 l+8SddnzAE0GeJu0ujCotu6KCq+rg1WuVI2PWZJzZuusO4Gw+TTP7aVvf3rCQNzouO6y JV/NxYVrDCqI4WMPa96nArMqC/oHghv3epeBsJglUDkjN9qbmBLT/uVNM1e9nGAcIvZE p12E87ygcAm88IySybMoCTMTXnBBGXlCXIbNbHYCCEo5+iP0VxTUACwAeaK7JLkJ3y+Q kxBA== X-Forwarded-Encrypted: i=1; AJvYcCXnkMSXEvzPklKvzhu2q8kfWZmhAt1E8/HDQ5JcVm9ZNGb4tr7J95/KKQUBqWW/V/CRTI+yLu5ZbnjKfw==@vger.kernel.org X-Gm-Message-State: AOJu0Yw2cSjQi5tme/8Y0MJnfaED3fg/no5zna2FqNIdSr2O5Muc09gK pQdf88Mj0AAbfj8dUVi1rtREntSLdvp8AigNsmTABh+wwXiCX0LQVNGkWD9SjbxeIvaDc6htUCN vthMKYjE1oc+1qUSuuj9fQxR8T2MQeyvFNwFirPbA9WrtkJUm X-Gm-Gg: ASbGncvKT4Qp7ZfOHsXsWqqnH8k7xtnyN038RTP7fzUXPQCbEEu8MvQoFJz9a2twz0w klO2GgAXWqk/VUOk+qvqj+QCdUyzHhWjqBIy3CJJGWbv5jD2ASCg0bIE2jAzoq5DFVsPB71xVKd h2FR1decWqR07O/FbedFa6A6ORnLRoteYQodvbKG+QbbU9eN7N9Junjv5gC9NLCpGKhXqwUcnZ3 2sIXsJ9IN9bhzvc52tnXLktWaohTuT4/pTMAANwdgceQwvlfmNrOkQub4nQvknwq9gu7+mT3DvZ 12pKCSwFwsYXESgVIsAxKCTt/u1aVA== X-Google-Smtp-Source: AGHT+IGlDXcQpM69Ulfyz4NaIIkNHSS1Fqz6L555JNy5K4KbBjL1kXGpZJ0lk5+vRmRUrzFQ0hIPo19D30F2 X-Received: by 2002:a05:6e02:1c24:b0:3d3:d13b:4de3 with SMTP id e9e14a558f8ab-3d93b634e9bmr18463165ab.5.1745729893840; Sat, 26 Apr 2025 21:58:13 -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 8926c6da1cb9f-4f824a850f3sm524480173.43.2025.04.26.21.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Apr 2025 21:58:13 -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 37DF93404B9; Sat, 26 Apr 2025 22:58:13 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 35AF9E40C3E; Sat, 26 Apr 2025 22:58:13 -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 3/8] ublk: remove misleading "ubq" in "ubq_complete_io_cmd()" Date: Sat, 26 Apr 2025 22:57:58 -0600 Message-ID: <20250427045803.772972-4-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250427045803.772972-1-csander@purestorage.com> References: <20250427045803.772972-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 --- 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