From patchwork Fri Sep 15 06:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 1834685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Rt5lcfAP; dkim-atps=neutral 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=patchwork.ozlabs.org) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4Rn4Ny20b1z1ygG for ; Fri, 15 Sep 2023 16:42:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232151AbjIOGmL (ORCPT ); Fri, 15 Sep 2023 02:42:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231997AbjIOGmL (ORCPT ); Fri, 15 Sep 2023 02:42:11 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABCD826B8 for ; Thu, 14 Sep 2023 23:42:05 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-5007abb15e9so3067197e87.0 for ; Thu, 14 Sep 2023 23:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694760123; x=1695364923; darn=vger.kernel.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Z55gAln4ybDAt+nBHpUdJ9m58txpxwncd07tIu3d7tU=; b=Rt5lcfAPMlZ8VJV2qNhV4CpWM2f1zKtguax++Zch41GrjApfr4SSAjHAlaOdG3E1Vb dMb38h8FiIvxloV9tR1B9lC19mfkQrSmvhEdRAUZjknHc9v/PfW4iEuzUe2cSdqN3Aru VsUqWUCuV9r2duzlERBKY92eSDwRJexTeXd8QEqEOpekb1xZwLBgtArN15Z+K1fOhFZT z6qGxlUmbiTDZinGSUMd/U7IZwSWhfElGrEG0mteUWlGtb6fD+CT6zb6gJm7bKTCeFGe 5c6UmVKlaE0lUD2q2C19tJOqSHoJXX4xFjXus563hNiP5WoOsklvI2e5K9LHIsRrmCK9 erMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694760123; x=1695364923; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Z55gAln4ybDAt+nBHpUdJ9m58txpxwncd07tIu3d7tU=; b=B5dIh28Rnnp5OxJBbjK+9GmvaNBJZcYNAxUBEu4mMrzfW6KQKt3NDnYq8MoAzEOkVG acntaP7FD+TCowH0vqzzgMc3CtBdsIgPkt0kWSwzDHb2M/36/CrO0DLzpj6bgnERaPZ3 jSvyWuphPB6WKYOHORf9FEz2vzi51PJyZkBTqSWvB7YxzFegTROG1lQ6LLSi9PnSDWp0 oqZnRucKCu/HrCzLa4JUGbLFUWJNJbxnVt6MQikeqir36yf4fRcuzDL6X7kmpX5gkx2l X31shXRvvNwif9FQd50WbAK/zrXKI5j2PlkuAmqXkVLD47iZq3hd3F/gLH2OOW6rvjf/ l/Vw== X-Gm-Message-State: AOJu0YwKqasfX4qCZlhoRQthKxZvVUW7eUIusnsQ6xHDMMCGOuHCEbsS 0guwUpGGZIzDoYvNUZPIvD92vea5x+j708lHo1S8H1Nxy4s= X-Google-Smtp-Source: AGHT+IFSq8NDBax2JW4NRiEwmvUJpcHJM3Gt8HEe6ueA0PotKxTaYQ4jptoAFXf4UwL1cmwf/hN+TtSFP5ThRvt+4eA= X-Received: by 2002:a05:6512:3b9d:b0:500:807a:f1a4 with SMTP id g29-20020a0565123b9d00b00500807af1a4mr983275lfv.18.1694760123393; Thu, 14 Sep 2023 23:42:03 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Fri, 15 Sep 2023 01:41:52 -0500 Message-ID: Subject: [PATCH][SMB3 client] fix minor typos and repeated words To: CIFS X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 Minor cleanup pointed out by checkpatch (repeated words, missing blank lines) in smb2pdu.c and old header location referred to in transport.c See attached. From 2c75426c1fea591bb338ba072068f83d2f6be088 Mon Sep 17 00:00:00 2001 From: Steve French Date: Fri, 15 Sep 2023 01:37:33 -0500 Subject: [PATCH] smb3: fix some minor typos and repeated words Minor cleanup pointed out by checkpatch (repeated words, missing blank lines) in smb2pdu.c and old header location referred to in transport.c Signed-off-by: Steve French --- fs/smb/client/smb2pdu.c | 6 ++++-- fs/smb/client/transport.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index 3403188e3100..44d4943e9c56 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -89,6 +89,7 @@ smb2_hdr_assemble(struct smb2_hdr *shdr, __le16 smb2_cmd, struct TCP_Server_Info *server) { struct smb3_hdr_req *smb3_hdr; + shdr->ProtocolId = SMB2_PROTO_NUMBER; shdr->StructureSize = cpu_to_le16(64); shdr->Command = smb2_cmd; @@ -2239,7 +2240,7 @@ create_durable_v2_buf(struct cifs_open_parms *oparms) * (most servers default to 120 seconds) and most clients default to 0. * This can be overridden at mount ("handletimeout=") if the user wants * a different persistent (or resilient) handle timeout for all opens - * opens on a particular SMB3 mount. + * on a particular SMB3 mount. */ buf->dcontext.Timeout = cpu_to_le32(oparms->tcon->handle_timeout); buf->dcontext.Flags = cpu_to_le32(SMB2_DHANDLE_FLAG_PERSISTENT); @@ -2384,7 +2385,7 @@ add_twarp_context(struct kvec *iov, unsigned int *num_iovec, __u64 timewarp) return 0; } -/* See See http://technet.microsoft.com/en-us/library/hh509017(v=ws.10).aspx */ +/* See http://technet.microsoft.com/en-us/library/hh509017(v=ws.10).aspx */ static void setup_owner_group_sids(char *buf) { struct owner_group_sids *sids = (struct owner_group_sids *)buf; @@ -3129,6 +3130,7 @@ void SMB2_ioctl_free(struct smb_rqst *rqst) { int i; + if (rqst && rqst->rq_iov) { cifs_small_buf_release(rqst->rq_iov[0].iov_base); /* request */ for (i = 1; i < rqst->rq_nvec; i++) diff --git a/fs/smb/client/transport.c b/fs/smb/client/transport.c index 1b5d9794ed5b..d52057a511ee 100644 --- a/fs/smb/client/transport.c +++ b/fs/smb/client/transport.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include -- 2.39.2