summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2014-08-11 13:36:54 -0400
committerJeff Layton <jlayton@primarydata.com>2014-08-11 13:36:54 -0400
commit8144f1f69943f447fd1bcb2d26ca011002d5df63 (patch)
treeee66646b08bcc1fde9be132d9b59ccbc56efcc73 /fs
parentc8d6637d0497d62093dbba0694c7b3a80b79bfe1 (diff)
downloadlinux-8144f1f69943f447fd1bcb2d26ca011002d5df63.tar.bz2
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')
-rw-r--r--fs/locks.c6
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)