Eventually, I'd like to reduce the redundant arguments to the locking APIs, but to get there we need to ensure the callers all set their file locks sanely. Adding the WARN_ON_ONCEs helped to find a couple of warts in lockd's file handling. The first 3 patches fix those. Chuck, would you be willing to take these in for v6.2? I'd like to see the WARN_ONs added for that so we can try to clean up the file locking APIs for v6.3. Thanks, Jeff Layton (4): lockd: set missing fl_flags field when retrieving args lockd: ensure we use the correct file description when unlocking lockd: fix file selection in nlmsvc_cancel_blocked filelock: WARN_ON_ONCE when ->fl_file and filp don't match fs/lockd/svc4proc.c | 1 + fs/lockd/svclock.c | 17 ++++++++++------- fs/lockd/svcproc.c | 1 + fs/locks.c | 3 +++ 4 files changed, 15 insertions(+), 7 deletions(-) -- 2.38.1
