From nobody Sun Feb 8 12:36:33 2026 Received: from mail-yw1-f228.google.com (mail-yw1-f228.google.com [209.85.128.228]) (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 7DD9B363C67 for ; Thu, 29 Jan 2026 22:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769726804; cv=none; b=HTXLIrYgzwtcYOPtvidBbtTkypl6Q5sbtfrBZtk4eGCYXQFkiPDxvszkNTmoSohjoT06W2/uGOEVNf/AeV9equziVxLE7b73Px2ZwG5X8EKv2CKHjta3Ndlr56eh0m8pqaLFrmO1EYkAzMFQ3H3n0AM4AodA524fzgb5612TkVQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769726804; c=relaxed/simple; bh=JuyPoYE7z3HLBgfeByBLU9Py+kqJmtHIeOM/fvYhpqQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=odL7uPiF3hkW5zYuc8P7AQrSNO7vhhelkC3pvE7eDOoi44qCafBfcQwqbB+ZxKgZAfKaFsN/bWEDP9g7fMLlNefU+JwXuUQBSmh2n0wModDLDMnMS8J8irz0deVNueUq1q8ytlHeTMjAGRh6heFR+hA318tbfyB5L6L8GFB92NA= 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=FY8q18pg; arc=none smtp.client-ip=209.85.128.228 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="FY8q18pg" Received: by mail-yw1-f228.google.com with SMTP id 00721157ae682-78f9be198aaso457b3.3 for ; Thu, 29 Jan 2026 14:46:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1769726802; x=1770331602; 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=fgzM/bjzSQsfBN2N2MIl2I8sr30VY03/XQyJxra3YSU=; b=FY8q18pgBejzl90XrrNPkORBu2HUWCdGdjIbG/RouTEXJKxhm8RDrL2IB5ImiqFCug ZcZtOiigSFES8PWCPfOOCImoXsIw76MPI01DfUp9IqJ3X0lyhiBrPUrDl06kQbd5t2ZS 87xhOKIzCL/lt6gf8ujxSS8jnM8e/G4I5Ta/8lgRI73PtiEzhs3RXqpbzro0UKRB3klR RhDRhCoT2kuHaaJzf0yptAo5v3ExwEBZ6Pk30m535nMI7iGo8vMg/vdChIyA/g2ENLPl NF3i4+JVF5ZZ+UrDqbZzm4clmv+MOuW+fX1BtpqijOGcWL1chHVkqB+On8jsCa1UU6aG 0Z2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769726802; x=1770331602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fgzM/bjzSQsfBN2N2MIl2I8sr30VY03/XQyJxra3YSU=; b=vRbUvQIvpdzZvbMwvXTE6FWV33UvC6RY/1S8Mf2fAMVVk0ux5vo/HsiDySdonbd4sx lTuz+Nka7SXqF36E1yLc8s/M4WIgNjidGdbdjLfdaQbzTTMDYqOjufMEGretMJmHs+mO DJVPWsVO0Ib+O0nnmfKsZlyxpW5m8XNgll0dM4Jj7GJyOGxg0wIAeuBE4hR2ST8sgf6Z KVJqic3E7IdNpF+nXZMq0FHVi8XDuTzB0yk8gasTFZlO5HXpnjrkeMcEZSbCisoZTHHR 412OWlvTco6tU9RM+Nn6Hg2wyu+1/gq2T70NDIDfxyje7POnMFXhQGj+2+clUYQ0AQNx rrRw== X-Forwarded-Encrypted: i=1; AJvYcCWB8fTrvRitCerB346nIldVNkJXeIHKHV1V9swvH3gaP/JJkSAuiqW45qFH3mZdgNITvO4CHjru2r+CIh8=@vger.kernel.org X-Gm-Message-State: AOJu0YzN8ebJipugr2A/uM9f2bc/fwNu3ZhV3HuvFVEV47X7C46CpuhA /vwXIDDPYh1ejFx2Q88oGnkPRqAV6nqzEZtQQgpzwWRkjS750laptsbIEAXPUW6rhzoglp6C4Mt i6tVPHvCiEBhJfzOESxViM+ac8B1bWJXSCVnl X-Gm-Gg: AZuq6aLDGx+VoPO4GwwKRfklGLS8SLryXshyZsQSdAgCLu5okWqt+agVu1GO7dSMKPX oWzGMvObSFly2BWP6yIOqcaLskfvNXK2xcYgVEtOFahLo8znrjF74hsAdCi65Ow5qK0bHQch9D9 Fab0v+MrNmTtdxaWqrs8GhCDiQjVRRL0oJ8loFKVS9UNzBi1ucJcBVBEaVmADMtWaE5QgQF1iMF Oyg9YTYgEMoCplD6gne47GyLnCLyPIAd/b2XagHJysb1u0toCD0CeKF3lMsnhHbs4AJoyHore8i 0+Ffg8eyYi+n3dkL+WAX8X/VPPLMNz7BKFr6jfzYHbRZWJKh19yefGqHf0LDuHbzsDwAtefDdCR H3ZUywZBaNNBVyJekmgQFdKZRnScIlqMpMCP2ClGpBQ== X-Received: by 2002:a05:690c:38b:b0:78f:c943:b2f3 with SMTP id 00721157ae682-7949e0082bfmr9678737b3.4.1769726802516; Thu, 29 Jan 2026 14:46:42 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-7948277e1aasm3617767b3.5.2026.01.29.14.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jan 2026 14:46:42 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.112.29.101]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id EEB37341D32; Thu, 29 Jan 2026 15:46:41 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id E5603E40971; Thu, 29 Jan 2026 15:46:41 -0700 (MST) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: Govindarajulu Varadarajan , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 4/4] ublk: drop ublk_ctrl_{start,end}_recovery() header argument Date: Thu, 29 Jan 2026 15:46:17 -0700 Message-ID: <20260129224618.975401-5-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260129224618.975401-1-csander@purestorage.com> References: <20260129224618.975401-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ublk_ctrl_start_recovery() and ublk_ctrl_end_recovery() only use their const struct ublksrv_ctrl_cmd *header arguments to log the dev_id. But this value is already available in struct ublk_device's ub_number field. So log ub_number instead and drop the unused header arguments. Signed-off-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 49510216832f..a0d1285d24d1 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -4773,12 +4773,11 @@ static int ublk_ctrl_set_params(struct ublk_device = *ub, u64 addr, u16 len) mutex_unlock(&ub->mutex); =20 return ret; } =20 -static int ublk_ctrl_start_recovery(struct ublk_device *ub, - const struct ublksrv_ctrl_cmd *header) +static int ublk_ctrl_start_recovery(struct ublk_device *ub) { int ret =3D -EINVAL; =20 mutex_lock(&ub->mutex); if (ublk_nosrv_should_stop_dev(ub)) @@ -4803,31 +4802,30 @@ static int ublk_ctrl_start_recovery(struct ublk_dev= ice *ub, */ if (test_bit(UB_STATE_OPEN, &ub->state) || !ublk_dev_in_recoverable_state= (ub)) { ret =3D -EBUSY; goto out_unlock; } - pr_devel("%s: start recovery for dev id %d.\n", __func__, header->dev_id); + pr_devel("%s: start recovery for dev id %d\n", __func__, ub->ub_number); init_completion(&ub->completion); ret =3D 0; out_unlock: mutex_unlock(&ub->mutex); return ret; } =20 -static int ublk_ctrl_end_recovery(struct ublk_device *ub, - const struct ublksrv_ctrl_cmd *header, int ublksrv_pid) +static int ublk_ctrl_end_recovery(struct ublk_device *ub, int ublksrv_pid) { int ret =3D -EINVAL; =20 pr_devel("%s: Waiting for all FETCH_REQs, dev id %d...\n", __func__, - header->dev_id); + ub->ub_number); =20 if (wait_for_completion_interruptible(&ub->completion)) return -EINTR; =20 pr_devel("%s: All FETCH_REQs received, dev id %d\n", __func__, - header->dev_id); + ub->ub_number); =20 if (ub->ublksrv_tgid !=3D ublksrv_pid) return -EINVAL; =20 mutex_lock(&ub->mutex); @@ -4839,11 +4837,11 @@ static int ublk_ctrl_end_recovery(struct ublk_devic= e *ub, goto out_unlock; } ub->dev_info.ublksrv_pid =3D ublksrv_pid; ub->dev_info.state =3D UBLK_S_DEV_LIVE; pr_devel("%s: new ublksrv_pid %d, dev id %d\n", - __func__, ublksrv_pid, header->dev_id); + __func__, ublksrv_pid, ub->ub_number); blk_mq_kick_requeue_list(ub->ub_disk->queue); ret =3D 0; out_unlock: mutex_unlock(&ub->mutex); return ret; @@ -5185,14 +5183,14 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd = *cmd, break; case UBLK_CMD_SET_PARAMS: ret =3D ublk_ctrl_set_params(ub, addr, len); break; case UBLK_CMD_START_USER_RECOVERY: - ret =3D ublk_ctrl_start_recovery(ub, header); + ret =3D ublk_ctrl_start_recovery(ub); break; case UBLK_CMD_END_USER_RECOVERY: - ret =3D ublk_ctrl_end_recovery(ub, header, data); + ret =3D ublk_ctrl_end_recovery(ub, data); break; case UBLK_CMD_UPDATE_SIZE: ublk_ctrl_set_size(ub, data); ret =3D 0; break; --=20 2.45.2