AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-04 02:16:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

locks: Fix procfs output for file leases

Browse Source 
Since commit 778fc546f7 ("locks: fix tracking of inprogress
lease breaks"), leases break don't change @fl_type but modifies
@fl_flags. However, procfs's part haven't been updated.

Previously, for a breaking lease the target type was printed (see
target_leasetype()), as returns fcntl(F_GETLEASE). But now it's always
"READ", as F_UNLCK no longer means "breaking". Unlike the previous
one, this behaviour don't provide a complete description of the lease.

There are /proc/pid/fdinfo/ outputs for a lease (the same for READ and
WRITE) breaked by O_WRONLY.
-- before:
lock:   1: LEASE  BREAKING  READ  2558 08:03:815793 0 EOF
-- after:
lock:   1: LEASE  BREAKING  UNLCK  2558 08:03:815793 0 EOF

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
This commit is contained in:
Pavel Begunkov 2019-07-24 20:16:31 +03:00 committed by Jeff Layton
parent 6b0e427717
commit 43e4cb942e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/locks.c
View File

@ -2784,10 +2784,10 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
? (fl->fl_type & LOCK_WRITE) ? "RW " : "READ " ? (fl->fl_type & LOCK_WRITE) ? "RW " : "READ "
: (fl->fl_type & LOCK_WRITE) ? "WRITE" : "NONE "); : (fl->fl_type & LOCK_WRITE) ? "WRITE" : "NONE ");
} else { } else {
seq_printf(f, "%s ", int type = IS_LEASE(fl) ? target_leasetype(fl) : fl->fl_type;
(lease_breaking(fl))
? (fl->fl_type == F_UNLCK) ? "UNLCK" : "READ " seq_printf(f, "%s ", (type == F_WRLCK) ? "WRITE" :
: (fl->fl_type == F_WRLCK) ? "WRITE" : "READ "); (type == F_RDLCK) ? "READ" : "UNLCK");
} }
if (inode) { if (inode) {
/* userspace relies on this representation of dev_t */ /* userspace relies on this representation of dev_t */