[PATCH 0/2] filelock: fix conflict detection with userland file delegations

From: Jeff Layton

Date: Mon Dec 01 2025 - 10:09:02 EST


This patchset fixes the way that conflicts are detected when userland
requests file delegations. The problem is due to a hack that was added
long ago which worked up until userland could request a file delegation.

This fixes the bug and makes things a bit less hacky. Please consider
for v6.19.

Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
---
Jeff Layton (2):
filelock: add lease_dispose_list() helper
filelock: allow lease_managers to dictate what qualifies as a conflict

Documentation/filesystems/locking.rst | 1 +
fs/locks.c | 119 +++++++++++++++++-----------------
fs/nfsd/nfs4layouts.c | 11 +++-
fs/nfsd/nfs4state.c | 7 ++
include/linux/filelock.h | 1 +
5 files changed, 79 insertions(+), 60 deletions(-)
---
base-commit: 76c63ff12e067e1ff77b19a83c24774899ed01fc
change-id: 20251201-dir-deleg-ro-41a16bc22838

Best regards,
--
Jeff Layton <jlayton@xxxxxxxxxx>