Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2970847rdb; Mon, 4 Dec 2023 12:38:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEt+yiLLThjcamUFYXxckNXHh13zJUtw4mVNG/ckMrhnhAxzAKUnWt+btW1izouGSGnFkos X-Received: by 2002:a92:2e0d:0:b0:35d:2d87:15c7 with SMTP id v13-20020a922e0d000000b0035d2d8715c7mr6565018ile.15.1701722300717; Mon, 04 Dec 2023 12:38:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701722300; cv=none; d=google.com; s=arc-20160816; b=BW5B4lWUhtbnnkCrw6hoSJY/n2a+gWyNzZYZlgE6bbgBmp0aEg2k+R6VwpTYrx9xO3 dCeCYBuKygUq4P9WnjIiRk02xhYueD8fUoaEadO8OIJFJFh6efpiLZBGlyLa0t3X915Z P/2eJ2dIhcvQCiFIAqE+WPzLDqpv1uht106LoyrVqm81AdlNfSjBYG8Z71M/3rI6DdBh I7lXUx8iSPmdMsWRs2YhriRRirbT1QfjHP1VddWOgzgAzmaaz84uf0nXLYDdKIFQ+Yaz BdSsm/t3ZyS9NwHYkSevKfyh8Rumx76kNqFav2LVIE0XEd5mYHX6el6XSIh5+Mctxvm0 ip4g== 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=OPwQm7aKGBmLm+GAKPCl7qA+6itnrimBk9lw4z/LWSc=; fh=YCpWGDe4dlD/Msuo/KjbMNPS2Hvd2LSPoVlNK8Y+dew=; b=q4y4yvtHHe7l4+L/v0rHv7WJbBVYwD/oAakKLDMqK3xJ5jmvECX7aT0nxW1e4k+egV 4OhPwUDObmmkiibuh1nWntg3Bu+IaJV7A3EWeBLCm5nfESAfu62QVNm7sRtLQ0Rj3Rf4 ATEOwW8eLj8oVAdsc8UXBcPxdsTSkPvYeZJB+kzYu1/Cvb5gFC8/65iM07l7pC787xHM mBb/tvrEYvQSorN9iIJy370MVFK+yAY+tIqSZqVVEGG2w3Xuov9aYo+UGKDbeD6j5mVN J6j4T498t5LHPQmneakSyBnLCgc43mt/h5O5SaxbeI7vrKo9MWIhSa+A1mSq2jbQ4sZh ke+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Et3UT5Ej; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id g10-20020a656cca000000b005bd85b32495si8700894pgw.685.2023.12.04.12.38.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 12:38:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Et3UT5Ej; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 92F66809C17E; Mon, 4 Dec 2023 12:38:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346146AbjLDUhh (ORCPT + 99 others); Mon, 4 Dec 2023 15:37:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346238AbjLDUhN (ORCPT ); Mon, 4 Dec 2023 15:37:13 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9367C359B for ; Mon, 4 Dec 2023 12:35:26 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FFACC433C8; Mon, 4 Dec 2023 20:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722126; bh=U8lKSXm6oWYfv9aGWHQQ2wtvUQVQ/g7PATqFBLi70tc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Et3UT5EjpVliNlsLq5wi8oXgR6Bu0GpzuX8s7QthNCjZnzYgygAJjybcgodonqomU C0jKHAOO7qSn7ruIbWxmV+p4aR//T2tKkUptOWzcC8CWq2oweG/2eX73ooOfl9H/R7 RJtuiOEGn1Y0hLClTnLpneKsh+ENiRvggaDhZduW1nOfekc0IQyYvBkHOInAWLnnvY cqMLy+cI4KLXg8so/KjAYI0NzlF+wNwNKLDNe21diA0zGyaLRbuGQMMAcLeAKtZZFx bA6xAf7NOfFx3sUcL/fYDOBNvn7yqiySrCuIJkN4dt3yf1XWPHF/V7PhyPSpT6xCwM PfGzegmSNihgQ== 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.1 03/17] ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error Date: Mon, 4 Dec 2023 15:34:48 -0500 Message-ID: <20231204203514.2093855-3-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203514.2093855-1-sashal@kernel.org> References: <20231204203514.2093855-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.65 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Mon, 04 Dec 2023 12:38:16 -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 683152007566c..603d9170d28a7 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -8294,7 +8294,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