From patchwork Fri Mar 17 16:42:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volker Lendecke X-Patchwork-Id: 1758335 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=1B3LS0F/; 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 4PdVMB1GjZz2470 for ; Sat, 18 Mar 2023 03:43:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229816AbjCQQnQ (ORCPT ); Fri, 17 Mar 2023 12:43:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230383AbjCQQnN (ORCPT ); Fri, 17 Mar 2023 12:43:13 -0400 Received: from hr2.samba.org (hr2.samba.org [IPv6:2a01:4f8:192:486::2:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 009128735C for ; Fri, 17 Mar 2023 09:42:45 -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=KGdkQ2QHsXAcNFVHTJz2bvfdT+IWSrZAfEnaRhDehlI=; b=1B3LS0F/oQJzc7ztVCJkwvCKQe m1yj9NSO0PBw+gbLPJRYqjHXrdlsla2HIQRi8lYrILJdxkCbcaustO/Lxdv7M3mxPlvXMWRBf0oV9 g54RunSq+9COCt/pmuqhErviivCVOOzi90a8d+D+K7Da/mWHoIHSrPB2wXjXACTmatr3OvdPpgu7X zz3mmmIjx/7vpkbTt1X66Er/3KMyTEHBAfN2yGFrrqjMmgfGenX9DxXK4QwPmzOWxPBa0/vbFVvAM I0s4qJlHsI1MHnBHBWbWY4LtpcM/RBEfMR12xfFWLRFkoWPkHz9t+8mJoyGwkfRvsfwoIrMs2DFx4 jvk8Qgkt2uYbUp3RPwuoHIqbxrLq2pDvSpSXLJZmJ0wft53+WmCLe1EPrt9+EWa0RvWcB+0rxrFbz 0XIO+u5rGyu/QSMGBfGrf44bCTg6wkI/l+VXg4CuRklkxQBnj4OQXibodNLmMHCk3E/cm/7IGtHaq plVXp/h0kykMlIKzIOgh1kz+; Received: from [2a01:4f8:252:410e::177:224] (port=50854 helo=atb-devel-224..) by hr2.samba.org with esmtp (Exim) id 1pdDAA-003s0d-MF; Fri, 17 Mar 2023 16:42:42 +0000 From: Volker Lendecke To: linux-cifs@vger.kernel.org Cc: Volker Lendecke Subject: [PATCH] cifs: Clarify an if-condition in SMB2_open_init() Date: Fri, 17 Mar 2023 16:42:36 +0000 Message-Id: <19c9ea1d0b1927d9550facbc5d1b43885bb3a327.1679071266.git.vl@samba.org> X-Mailer: git-send-email 2.34.1 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 (server->capabilities & SMB2_GLOBAL_CAP_LEASING) is the wrong condition to stitch together the create contexts, what we really care about is whether there already was a create context before the durable one we just are about to add. This also aligns with the other cases further down in SMB2_open_init(). Signed-off-by: Volker Lendecke --- fs/cifs/smb2pdu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 0e53265e1462..5d06ecc9341b 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2840,8 +2840,7 @@ SMB2_open_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server, } if (*oplock == SMB2_OPLOCK_LEVEL_BATCH) { - /* need to set Next field of lease context if we request it */ - if (server->capabilities & SMB2_GLOBAL_CAP_LEASING) { + if (n_iov > 2) { struct create_context *ccontext = (struct create_context *)iov[n_iov-1].iov_base; ccontext->Next =