openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jeff Layton 2015-04-03 09:04:04 -04:00
parent cae80b305e
commit 3648888e90
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/locks.c
View File

@ -2565,15 +2565,10 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
: (fl->fl_type == F_WRLCK) ? "WRITE" : "READ "); : (fl->fl_type == F_WRLCK) ? "WRITE" : "READ ");
} }
if (inode) { if (inode) {
#ifdef WE_CAN_BREAK_LSLK_NOW /* userspace relies on this representation of dev_t */
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 ;-( */
seq_printf(f, "%d %02x:%02x:%ld ", fl_pid, seq_printf(f, "%d %02x:%02x:%ld ", fl_pid,
MAJOR(inode->i_sb->s_dev), MAJOR(inode->i_sb->s_dev),
MINOR(inode->i_sb->s_dev), inode->i_ino); MINOR(inode->i_sb->s_dev), inode->i_ino);
#endif
} else { } else {
seq_printf(f, "%d <none>:0 ", fl_pid); seq_printf(f, "%d <none>:0 ", fl_pid);
} }