From nobody Thu Dec 18 12:31:49 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA8BF2D3A88 for ; Wed, 6 Aug 2025 20:39:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754512769; cv=none; b=NRfzlQNV9dv+8CxSy9VvXxPRxxfd3rHhD6A6ScZOb/OuKGgGqoN8wgU6ftLar4tvybMUfQNzCHe3Qh3dmkR1Zm+xtkYhLMKQ8Q7XZFfjM7vKpoQokb13v5DF5K9VfZHHfsAXFAlFz97OJpTMViIPyQQCMHxdAZjhezUV4Oa5PDU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754512769; c=relaxed/simple; bh=vdI+9J76+Cl2+uKmq0mv/gnrM8i3Q2sgMJ9yHiTjJLU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dv+1VRKUOhKxxtf8bojQuY2bV29v5NqOM8aBKKvfq/LYu2mfa2LtX51a5DAb2bMby34mO7PuLPLNvXyODW0atEnLreHZRElMazLljLBfzCbuQQDblnQ6Y+tudAJgSq5XqdKZXZD/Pp0Tot5Yma7b+A0L+g4WFsGytnkrkE1XpdE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=cYEp1kNu; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cYEp1kNu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754512767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TviJ0wsdbXIbz3z58i/ZtA4k4O1wXNxFsbxV+K9WGqo=; b=cYEp1kNue2Fta8ffbKx0zeeZOM/VP94b6jZJKWmMYUo9LhLnfCH4oiVf6h5y78vAJS+3YA oEC7rFX8GDks+eVexDiWlU8gvuQ/cV1M/nqs0ax8g6Gy5juHlBQLo2RH+LO8VeAU4GNRkZ YsU3cWgk6P8soPo8MtVtD1OW5n+kmRc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-228-MtxQM8lUNAW7Tfx7OKc4Zw-1; Wed, 06 Aug 2025 16:39:23 -0400 X-MC-Unique: MtxQM8lUNAW7Tfx7OKc4Zw-1 X-Mimecast-MFC-AGG-ID: MtxQM8lUNAW7Tfx7OKc4Zw_1754512760 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 49B6C1800446; Wed, 6 Aug 2025 20:39:20 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.17]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 449053000198; Wed, 6 Aug 2025 20:39:17 +0000 (UTC) From: David Howells To: Steve French Cc: David Howells , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Wang Zhaolong , Stefan Metzmacher , Mina Almasry , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, netfs@lists.linux.dev, linux-fsdevel@vger.kernel.org Subject: [RFC PATCH 26/31] cifs: Convert SMB2 Logoff request Date: Wed, 6 Aug 2025 21:36:47 +0100 Message-ID: <20250806203705.2560493-27-dhowells@redhat.com> In-Reply-To: <20250806203705.2560493-1-dhowells@redhat.com> References: <20250806203705.2560493-1-dhowells@redhat.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 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" Signed-off-by: David Howells cc: Steve French cc: Paulo Alcantara cc: Shyam Prasad N cc: Tom Talpey cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/smb/client/smb2pdu.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index 685af9c0cdcb..c63c62cd6638 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -2212,15 +2212,10 @@ SMB2_sess_setup(const unsigned int xid, struct cifs= _ses *ses, int SMB2_logoff(const unsigned int xid, struct cifs_ses *ses) { - struct smb_rqst rqst; - struct smb2_logoff_req *req; /* response is also trivial struct */ - int rc =3D 0; struct TCP_Server_Info *server; - int flags =3D 0; - unsigned int total_len; - struct kvec iov[1]; - struct kvec rsp_iov; - int resp_buf_type; + struct smb2_logoff_req *req; /* response is also trivial struct */ + struct smb_message *smb =3D NULL; + int rc =3D 0, flags =3D 0; =20 cifs_dbg(FYI, "disconnect session %p\n", ses); =20 @@ -2237,10 +2232,10 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses= *ses) } spin_unlock(&ses->chan_lock); =20 - rc =3D smb2_plain_req_init(SMB2_LOGOFF, NULL, ses->server, - (void **) &req, &total_len); - if (rc) - return rc; + smb =3D smb2_create_request(SMB2_LOGOFF, server, NULL, + sizeof(*req), sizeof(*req), 0, 0); + if (!smb) + return -ENOMEM; =20 /* since no tcon, smb2_init can not do this, so do here */ req->hdr.SessionId =3D cpu_to_le64(ses->Suid); @@ -2252,21 +2247,13 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses= *ses) =20 flags |=3D CIFS_NO_RSP_BUF; =20 - iov[0].iov_base =3D (char *)req; - iov[0].iov_len =3D total_len; - - memset(&rqst, 0, sizeof(struct smb_rqst)); - rqst.rq_iov =3D iov; - rqst.rq_nvec =3D 1; - - rc =3D cifs_send_recv(xid, ses, ses->server, - &rqst, &resp_buf_type, flags, &rsp_iov); - cifs_small_buf_release(req); + rc =3D smb_send_recv_messages(xid, ses, ses->server, smb, flags); /* * No tcon so can't do * cifs_stats_inc(&tcon->stats.smb2_stats.smb2_com_fail[SMB2...]); */ =20 + smb_put_messages(smb); smb2_session_already_dead: return rc; }