diff options
| author | Jeff Layton | 2014-08-11 19:36:54 +0200 |
|---|---|---|
| committer | Jeff Layton | 2014-08-11 19:36:54 +0200 |
| commit | 8144f1f69943f447fd1bcb2d26ca011002d5df63 (patch) | |
| tree | ee66646b08bcc1fde9be132d9b59ccbc56efcc73 /fs/locks.c | |
| parent | Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | kernel-qcow2-linux-8144f1f69943f447fd1bcb2d26ca011002d5df63.tar.gz kernel-qcow2-linux-8144f1f69943f447fd1bcb2d26ca011002d5df63.tar.xz kernel-qcow2-linux-8144f1f69943f447fd1bcb2d26ca011002d5df63.zip | |
locks: show delegations as "DELEG" in /proc/locks
Now that they are a distinct lease type, show them as such.
Cc: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index a6f54802d277..356667a434c1 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2452,7 +2452,11 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl, seq_puts(f, "FLOCK ADVISORY "); } } else if (IS_LEASE(fl)) { - seq_puts(f, "LEASE "); + if (fl->fl_flags & FL_DELEG) + seq_puts(f, "DELEG "); + else + seq_puts(f, "LEASE "); + if (lease_breaking(fl)) seq_puts(f, "BREAKING "); else if (fl->fl_file) |