summaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
authorJeff Layton <jeff.layton@primarydata.com>2015-04-03 09:04:04 -0400
committerJeff Layton <jeff.layton@primarydata.com>2015-04-03 09:04:04 -0400
commit3648888e90bb7fe6d0586ec177511e6678ee22c3 (patch)
tree8f23ef5421f8ace7d3a1e8bcc07be92ac03b4c25 /fs/locks.c
parentcae80b305e1c3944746dd93e33e9b2ccd5a490c1 (diff)
downloadlinux-stable-3648888e90bb7fe6d0586ec177511e6678ee22c3.tar.gz
linux-stable-3648888e90bb7fe6d0586ec177511e6678ee22c3.tar.bz2
linux-stable-3648888e90bb7fe6d0586ec177511e6678ee22c3.zip
locks: get rid of WE_CAN_BREAK_LSLK_NOW dead code
As Bruce points out, there's no compelling reason to change /proc/locks output at this point. If we did want to do this, then we'd almost certainly want to introduce a new file to display this info (maybe via debugfs?). Let's remove the dead WE_CAN_BREAK_LSLK_NOW ifdef here and just plan to stay with the legacy format. Reported-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Diffstat (limited to 'fs/locks.c')
-rw-r--r--fs/locks.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 3ebaafb4c587..16cae1a00851 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2565,15 +2565,10 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
: (fl->fl_type == F_WRLCK) ? "WRITE" : "READ ");
}
if (inode) {
-#ifdef WE_CAN_BREAK_LSLK_NOW
- seq_printf(f, "%d %s:%ld ", fl_pid,
- inode->i_sb->s_id, inode->i_ino);
-#else
- /* userspace relies on this representation of dev_t ;-( */
+ /* userspace relies on this representation of dev_t */
seq_printf(f, "%d %02x:%02x:%ld ", fl_pid,
MAJOR(inode->i_sb->s_dev),
MINOR(inode->i_sb->s_dev), inode->i_ino);
-#endif
} else {
seq_printf(f, "%d <none>:0 ", fl_pid);
}