From: Jeff Layton <jlayton@primarydata.com>
Date: Mon, 11 Aug 2014 17:36:54 +0000 (-0400)
Subject: locks: show delegations as "DELEG" in /proc/locks
X-Git-Tag: v3.17-rc1~6^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8144f1f69943f447fd1bcb2d26ca011002d5df63;p=karo-tx-linux.git

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>
---

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)