From patchwork Fri Mar 17 11:15:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volker Lendecke X-Patchwork-Id: 1758208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (3072-bit key; secure) header.d=samba.org header.i=@samba.org header.a=rsa-sha256 header.s=42 header.b=tIWkKwtp; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4PdM4z6Rh3z1yWp for ; Fri, 17 Mar 2023 22:16:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229634AbjCQLQB (ORCPT ); Fri, 17 Mar 2023 07:16:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229532AbjCQLPz (ORCPT ); Fri, 17 Mar 2023 07:15:55 -0400 Received: from hr2.samba.org (hr2.samba.org [IPv6:2a01:4f8:192:486::2:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE5DD5FEB for ; Fri, 17 Mar 2023 04:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=samba.org; s=42; h=Message-Id:Date:Cc:To:From; bh=S+KORE2Zpa300f7YKiwwFzJhDSXNzdqgEmQ6HLKzXIc=; b=tIWkKwtpWE5h8e93bxec91c53c m15LBQzPl5dewalS2FLJia/EKljXpVKj5zRLcb33MJKKcW8zBFBWQTvSRVUkoh60qu+7aptxZlpNA azhWeha5QgS6HiAJminvZmVW0tJS8YCBGuAQREu+ElYRV9/+VHs9URwpGM+i3fqohEbGhVzFbaJdJ qQdK9NuW+cVVVKPIYltmnZ+O3jUqQ0MhHyu0x4S4h6XlFxyPjo0TGBS8OZgtP5GZAsRu7rD6DJaN5 vUZAnD+dalZOz6W026/yiqn3svlPI0qeLdoWrIqwGLMGYKSlEvTCzx/MitvVzSrMidpxD2fQmcgMg w6vfZTZ2bRWV9zQWr1/zRZ0BuZyb8zzvUSPHATvBSqI698reWVPA9eHQeuRXIctSiQN4Cae9fE1mn RmBU0ez9ry3u5t5kN23fVNe1RtXcqXB0rHuhdCh/V+u2pMmGG5JLz3dZTQheShRZ1z4gTxMNWjNnX dghXoXK0XhZUgBBU7KVWn6HM; Received: from [2a01:4f8:252:410e::177:224] (port=37520 helo=atb-devel-224..) by hr2.samba.org with esmtp (Exim) id 1pd83n-003p4x-Vc; Fri, 17 Mar 2023 11:15:48 +0000 From: Volker Lendecke To: linux-cifs@vger.kernel.org Cc: Volker Lendecke Subject: [PATCH 2/7] cifs: Avoid a cast in add_durable_context() Date: Fri, 17 Mar 2023 11:15:23 +0000 Message-Id: <01742c6a372345dce723d3511a41d21753b8aeee.1679051552.git.vl@samba.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org We have the correctly-typed struct smb2_create_req * available in the caller. Signed-off-by: Volker Lendecke --- fs/cifs/smb2pdu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 3eb745237459..cebb8d9837d2 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2285,10 +2285,10 @@ add_durable_reconnect_v2_context(struct kvec *iov, unsigned int *num_iovec, } static int -add_durable_context(struct kvec *iov, unsigned int *num_iovec, +add_durable_context(struct smb2_create_req *req, + struct kvec *iov, unsigned int *num_iovec, struct cifs_open_parms *oparms, bool use_persistent) { - struct smb2_create_req *req = iov[0].iov_base; unsigned int num = *num_iovec; if (use_persistent) { @@ -2849,7 +2849,7 @@ SMB2_open_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server, cpu_to_le32(server->vals->create_lease_size); } - rc = add_durable_context(iov, &n_iov, oparms, + rc = add_durable_context(req, iov, &n_iov, oparms, tcon->use_persistent); if (rc) return rc;