diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2019-07-24 20:16:31 +0300 |
|---|---|---|
| committer |   Jeff Layton <jlayton@kernel.org> | 2019-07-25 07:49:44 -0400 |
| commit | 43e4cb942e88e756b41ea4d30249a47973880508 (patch) | |
| tree | 3e11e0e5ae91bde90b618eb0385c2dbc55ad7956 | |
| parent | locks: revise generic_add_lease tracepoint (diff) | |
| download | linux-dev-43e4cb942e88e756b41ea4d30249a47973880508.tar.xz linux-dev-43e4cb942e88e756b41ea4d30249a47973880508.zip | |
locks: Fix procfs output for file leases
Since commit 778fc546f749c588aa2f ("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>
| -rw-r--r-- | fs/locks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/locks.c b/fs/locks.c index 686eae21daf6..24d1db632f6c 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -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) ? "WRITE" : "NONE "); } else { - seq_printf(f, "%s ", - (lease_breaking(fl)) - ? (fl->fl_type == F_UNLCK) ? "UNLCK" : "READ " - : (fl->fl_type == F_WRLCK) ? "WRITE" : "READ "); + int type = IS_LEASE(fl) ? target_leasetype(fl) : fl->fl_type; + + seq_printf(f, "%s ", (type == F_WRLCK) ? "WRITE" : + (type == F_RDLCK) ? "READ" : "UNLCK"); } if (inode) { /* userspace relies on this representation of dev_t */ |