projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c8d6637
)
locks: show delegations as "DELEG" in /proc/locks
author
Jeff Layton
<jlayton@primarydata.com>
Mon, 11 Aug 2014 17:36:54 +0000
(13:36 -0400)
committer
Jeff Layton
<jlayton@primarydata.com>
Mon, 11 Aug 2014 17:36:54 +0000
(13:36 -0400)
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>
fs/locks.c
patch
|
blob
|
history
diff --git
a/fs/locks.c
b/fs/locks.c
index
a6f5480
..
356667a
100644
(file)
--- 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)