From: Jeff Layton Subject: [PATCH] locks: show delegations as "DELEG" in /proc/locks Date: Wed, 6 Aug 2014 15:14:51 -0400 Message-ID: <1407352491-12224-1-git-send-email-jlayton@primarydata.com> Cc: bfields@vger.kernel.org To: linux-fsdevel@vger.kernel.org Return-path: Received: from mail-qg0-f48.google.com ([209.85.192.48]:45328 "EHLO mail-qg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756249AbaHFTPV (ORCPT ); Wed, 6 Aug 2014 15:15:21 -0400 Received: by mail-qg0-f48.google.com with SMTP id i50so3197993qgf.7 for ; Wed, 06 Aug 2014 12:15:20 -0700 (PDT) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Now that they are a distinct lease type, show them as such. Cc: J. Bruce Fields Signed-off-by: Jeff Layton --- fs/locks.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/locks.c b/fs/locks.c index 717fbc404e6b..51cdc9d3fafa 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) -- 1.9.3