From nobody Sun Dec 14 12:16:30 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E4D63597B for ; Sun, 14 Dec 2025 01:34:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765676054; cv=none; b=D4xvNDj4sTnaMHPCQ8hFM2lOHOjnuldQjmY5+SUKQI3ZlB2SqvYVR1XNtneRY9JLz3YEpdolSkgMed/sXX4mCDWk+6uJjpCBuwXrcHWjmR9zygs2TO97fWBhGvAQZN460gLyR2PdSvYKi93T+S2hvMkXQtPtY+UHUwupfPTmiDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765676054; c=relaxed/simple; bh=bs2/Nne/yf86RtBs6PzXzdc8/fZU67sruVqTYVw5xWw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=kajo3pe+Q2y7Ofwy5Xi+7eKTJN+GF1Cw7sqjNKuXLvGn3uiPqkf6a8K0CqxnI/9266IhEbMDgrzzDJ2AWa7mg2bhSgwb9h4AunfPruVtUs2nLxmDIob5T0B9MnH1q5uHlycDPvpSv1MJJKI4435efCMg8lAKS2IS+qZLQsPGyEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eHoIkIHV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eHoIkIHV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03622C4CEF7; Sun, 14 Dec 2025 01:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765676052; bh=bs2/Nne/yf86RtBs6PzXzdc8/fZU67sruVqTYVw5xWw=; h=From:Date:Subject:To:Cc:From; b=eHoIkIHVr+clF9K2AdBccCtEQZJ3tRRe3ynMt76hgg24A4vsZjGCrR2WJzFD+C3t0 Xwp9VpnVRTnQlfWJOE415CMPseefLSh+FjEptSZxFIJWyGH/e0IutZwZaz8VyUNXPN R7x8C2E5g4uRvGR4FDpJnWt4ZB14DfQLLvefNlucBQWgipz2mmIvUOIAutGAPzyl4K bT/HYTNGRTLDjTKvZ+13lu774z0zPlJwxmtxU65+OHBQ3k1At1+h+IORLL3lmqLroV cjFiBGnzySEJSnbHGYtOkzn2GtPlAqeVncmRyGTnZFQ+EVQEVwXUUl47hgWpuqBAW6 cBvbQCOQpiBCg== From: Jeff Layton Date: Sun, 14 Dec 2025 10:34:03 +0900 Subject: [PATCH] vfs: fix break_lease() function signature in !CONFIG_FILE_LOCKING case Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251214-vfs-6-19-v1-1-3e9802a2b593@kernel.org> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI1NDI0MT3bK0Yl0zXUNLXQPLFBNTM6O0pMQkAyWg8oKi1LTMCrBR0bG1tQB ynPTLWgAAAA== X-Change-ID: 20251214-vfs-6-19-09d4562fbab0 To: Christian Brauner , NeilBrown , Jan Kara Cc: Chris Mason , linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1307; i=jlayton@kernel.org; h=from:subject:message-id; bh=bs2/Nne/yf86RtBs6PzXzdc8/fZU67sruVqTYVw5xWw=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBpPhQSNdGXtmsu08k6nBzSYtRG1TymPbuCUw6sK /2Sean2o+WJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaT4UEgAKCRAADmhBGVaC FRXQD/4sDLQndgkKTnRia2xdxlSbRNDsIYDGlBI7tgoT9El3VMzR6KBaB7fT44HI1e2dkaSoORh /O+zKaXlxD+dwhCxPpLQZFezPjLZ3LgvEKrCIbPo5jlUYvhTYtYTA7f0WqkbA/rtWlTHGiaxyr6 UigaJGfqEgmi86IsLcNFIbJ+5ohmeqhVsvvdxQWkl7XmOhCr4YkWc7gSPQpr6lkNRfs1VILsDGv rHNetX6mGmZpcMuGJ6GZxitwY8OBoV9eIA3unGBhqmD99ItoCAIUkwaucZGTM/YqwiqS8fNhEn7 /sI73gOlHQc80zczc7FedhlndymGEgqWlLOUFvukXGjwPg9fVCtZPKrUHrq8rbJDNqOgrqY/JMn xd9/8w3CBPpd3L7P99kr4Re/GJDn7+uZAbS83oFe35Py+MHGoqUsMAfw1ypVKhe+zjX8o1fIikT wx39m39LZl6nhpfRtA/m10lPluJrZTY/ndgy2CZUsX/tLF1vdEbCO0QkkS9WOCOIp+YIJjAwJ/I zA7vv6GVBrGGT+rdQUVYbkGhJWY+h1NRVRTdZxmIOgwBvAHQdNnfNbnlfwEoVvFw41TAIPh5cfX XnDoWRK4JhCQn8oby7v3Rzzd9nPmTcirPnNsA/JgXhNDBrvFflH/3CBlovl79fuEB/mioULpjOs Aovu62jj3Yef4vw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Commit 4be9f3cc582a ("filelock: rework the __break_lease API to use flags") contained a spurious change to the break_lease() stub when CONFIG_FILE_LOCKING is N. Revert that part of the patch. Fixes: 4be9f3cc582a ("filelock: rework the __break_lease API to use flags") Signed-off-by: Jeff Layton --- This is a problem that Chris found with his Claude review prompts. It doesn't seem to cause a problem with the build when file locking is disabled, so I consider this low-priority. Your call if you want to take it in for v6.19 or v7.0. --- include/linux/filelock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/filelock.h b/include/linux/filelock.h index 54b824c05299261e6bd6acc4175cb277ea35b35d..078da14dc4ce52d34cb3bbeb44a= 6274daa0f6056 100644 --- a/include/linux/filelock.h +++ b/include/linux/filelock.h @@ -552,7 +552,7 @@ static inline bool is_delegated(struct delegated_inode = *di) return false; } =20 -static inline int break_lease(struct inode *inode, bool wait) +static inline int break_lease(struct inode *inode, unsigned int mode) { return 0; } --- base-commit: 187d0801404f415f22c0b31531982c7ea97fa341 change-id: 20251214-vfs-6-19-09d4562fbab0 Best regards, --=20 Jeff Layton