Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2968868rdb; Mon, 4 Dec 2023 12:34:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZswAhNIzbFA4ujuDNO0HW/jbAsMjeEPhwfd+rF3AFARknanpcvL1/6QQN8bmLaEkxFRbY X-Received: by 2002:a17:90a:6e05:b0:286:6cc0:b90a with SMTP id b5-20020a17090a6e0500b002866cc0b90amr156643pjk.65.1701722052054; Mon, 04 Dec 2023 12:34:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701722052; cv=none; d=google.com; s=arc-20160816; b=XBpdY8OSk+8R/sOKzmua3IijJ8cXcyvvlQ06B2TzkSgM1GzwQUVYbYSAzNHKf+kWVl 8+49270bn7xL8W8DlL8o8lbbMB1RVcnt7DoKkKZ75Yo9wk4ZQwdZgw7PLA8ZxXNILXoK KUBLFUDwhFcSa4so86hrlNMnrfiog+7FAgwnCMKJyRnMrIkg/TiviAgVUNy+T8kqSTPg X1wwec7bR0yidLiAXQW549/wAQnh2Gqbh5GWdLXcfRKWnpkGZLn/clONnPZSNfOnhIS/ UtCIZbxr/fpweQqws43iVaWRFDay24GjIwlKjYmZhKzkxj53yTS0LsQRgwbzD8WnrE29 DtSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8U34ovFBOdbn/cqBiunq0lr4LMgKV185YFx5BSEO06w=; fh=YCpWGDe4dlD/Msuo/KjbMNPS2Hvd2LSPoVlNK8Y+dew=; b=wOkD0G7C6GL2YtoYPfAWlXcNn6ACXXoAJZG7CdTIeLeEmqzEAo4tmjjQI3AI49eOtn qHzR1845lLhLTO1jBngnhqFj5xGv1BEP4Dgn90N+seHKWnjuwxhSM6GIzY+nN/ueIfPV /kqHpgKxoFQGS8Jn1QEZAVZwwZtjkiqCoBtyER3t3bGQ1ROJRaGFfnQxGHKEBYRuQogn BoK4TlX2cjSdA2KLv3gwsMa1OXRYxGFJZASBBnNmznvKnHPS6ETVZSDA5Ij2QFZUawMI xXGzt983Vmg5lZg/njDmPSew6Ac1mvRufQ1ko2NvhK82SHB9sc7/oUez60dMx+UvBbr7 sAKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OZejgbE4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id x6-20020a17090a970600b00286a25c57dbsi2601487pjo.83.2023.12.04.12.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 12:34:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OZejgbE4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2C6E2804B87A; Mon, 4 Dec 2023 12:34:10 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346263AbjLDUdz (ORCPT + 99 others); Mon, 4 Dec 2023 15:33:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235520AbjLDUdh (ORCPT ); Mon, 4 Dec 2023 15:33:37 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B54DB194 for ; Mon, 4 Dec 2023 12:33:41 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 755A3C433CA; Mon, 4 Dec 2023 20:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722021; bh=X1klMmWdf1dNqRM/ewLPdf27HcjpBybRBVQtAuh6UXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OZejgbE4vcAkhEmZFqS5njVCbKsQMPqwGjtuzaBIWlI+aQg6Hs3oogpdJ49yvKPs/ lcRKUmSD3QVJX/SHedpUIPTGZ1/b3eijLdeIqda0ME2BAXS9bJHBKA3pU8jmCnPZ26 PRqUuJT4CIXY0tLUqsr2nstqC1iB7a2/IQQExhK/UADrPJIsbCpFnCBx8iLo99QapH cGSLz50wViDcs8uSI040hs4oCd8c9mhDqVWFUSl6A2uSg/PGbfuup3LyvqtbiDVSTZ ob+wHUQd+nY8SGtjgvYDgXFWlrzCFu+JR6RilhSEmdigu0mHntp64ctU4MoMw2aqWQ ITGvYqQ0jO1+A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Namjae Jeon , Steve French , Sasha Levin , sfrench@samba.org, linux-cifs@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 09/32] ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error Date: Mon, 4 Dec 2023 15:32:29 -0500 Message-ID: <20231204203317.2092321-9-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203317.2092321-1-sashal@kernel.org> References: <20231204203317.2092321-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.4 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 04 Dec 2023 12:34:10 -0800 (PST) From: Namjae Jeon [ Upstream commit cd80ce7e68f1624ac29cd0a6b057789d1236641e ] ksmbd set ->op_state as OPLOCK_STATE_NONE on lease break ack error. op_state of lease should not be updated because client can send lease break ack again. This patch fix smb2.lease.breaking2 test failure. Signed-off-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/server/smb2pdu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 7eaac1098f637..78517e3b53104 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -8228,7 +8228,6 @@ static void smb21_lease_break_ack(struct ksmbd_work *work) return; err_out: - opinfo->op_state = OPLOCK_STATE_NONE; wake_up_interruptible_all(&opinfo->oplock_q); atomic_dec(&opinfo->breaking_cnt); wake_up_interruptible_all(&opinfo->oplock_brk); -- 2.42.0