On Wed, 2019-07-24 at 20:16 +0300, Pavel Begunkov (Silence) wrote: > From: Pavel Begunkov <[email protected]> > > 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 <[email protected]> > --- > fs/locks.c | 8 ++++---- > 1 file 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 */
Thanks! Merged for v5.4. -- Jeff Layton <[email protected]>
