From: Jeff Layton <jlayton@redhat.com>
To: linux-fsdevel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
nfs-ganesha-devel@lists.sourceforge.net,
samba-technical@lists.samba.org
Subject: [RFC PATCH 5/5] locks: show private lock types in /proc/locks
Date: Fri, 11 Oct 2013 08:25:22 -0400 [thread overview]
Message-ID: <1381494322-2426-6-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1381494322-2426-1-git-send-email-jlayton@redhat.com>
Show "private" locks in /proc/locks with a 'P' suffix.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/locks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index 3bde157..31abb70 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2393,8 +2393,8 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
} else {
seq_printf(f, "%s ",
(lease_breaking(fl))
- ? (fl->fl_type == F_UNLCK) ? "UNLCK" : "READ "
- : (fl->fl_type == F_WRLCK) ? "WRITE" : "READ ");
+ ? (fl->fl_type == F_UNLCK) ? "UNLCK " : (IS_PRIVATE(fl) ? "READP " : "READ ")
+ : (fl->fl_type == F_WRLCK) ? (IS_PRIVATE(fl) ? "WRITEP" : "WRITE ") : IS_PRIVATE(fl) ? "READP " : "READ ");
}
if (inode) {
#ifdef WE_CAN_BREAK_LSLK_NOW
--
1.8.3.1
next prev parent reply other threads:[~2013-10-11 12:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 12:25 [RFC PATCH 0/5] locks: implement "filp-private" (aka UNPOSIX) locks Jeff Layton
2013-10-11 12:25 ` [RFC PATCH 1/5] locks: consolidate checks for compatible filp->f_mode values in setlk handlers Jeff Layton
2013-10-11 12:25 ` [RFC PATCH 2/5] locks: add definitions for F_RDLCKP and F_WRLCKP Jeff Layton
2013-10-11 12:25 ` [RFC PATCH 3/5] locks: skip FL_FILP_PRIVATE locks on close unless we're closing the correct filp Jeff Layton
2013-10-11 12:25 ` [RFC PATCH 4/5] locks: handle merging of locks when FL_FILP_PRIVATE is set Jeff Layton
2013-10-11 12:25 ` Jeff Layton [this message]
2013-10-11 13:35 ` [RFC PATCH 0/5] locks: implement "filp-private" (aka UNPOSIX) locks Jeff Layton
2013-10-11 15:20 ` Frank Filz
2013-10-11 15:50 ` Jeff Layton
2013-10-11 17:07 ` Frank Filz
2013-10-11 18:42 ` Jeff Layton
2013-10-11 18:53 ` Frank Filz
2013-10-12 9:10 ` Volker Lendecke
2013-10-11 20:07 ` J. Bruce Fields
2013-10-11 21:36 ` Andreas Dilger
2013-10-11 23:21 ` Jeff Layton
2013-10-11 23:49 ` Jeremy Allison
2013-10-12 0:18 ` Scott Lovenberg
2013-10-12 0:42 ` Jeff Layton
2013-10-12 18:12 ` Frank Filz
2013-10-14 7:24 ` Volker Lendecke
2013-10-14 15:23 ` Frank Filz
2013-10-15 8:56 ` Volker Lendecke
2013-10-12 20:56 ` Scott Lovenberg
2013-10-12 9:20 ` Stefan (metze) Metzmacher
2013-10-12 11:47 ` Jeff Layton
2013-10-12 18:10 ` [Nfs-ganesha-devel] " Frank Filz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381494322-2426-6-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nfs-ganesha-devel@lists.sourceforge.net \
--cc=samba-technical@lists.samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).