lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] locks: export device name
    From
    Date
    From: Davidlohr Bueso <dave@gnu.org>

    The lslk(8) program has not been maintained for over a decade and has recently been rewritten as lslocks(8).
    It will be available for the next 2.22 release, in a couple of months. This is a good opportunity to delete
    that nasty WE_CAN_BREAK_LSLK_NOW and start exporting the device name instead of the maj:min numbers.

    For backward compatibility the new version can be in charge of checking older kernel versions and parsing the old
    output if necessary.

    Signed-off-by: Davidlohr Bueso <dave@gnu.org>
    ---
    fs/locks.c | 7 -------
    1 files changed, 0 insertions(+), 7 deletions(-)

    diff --git a/fs/locks.c b/fs/locks.c
    index 637694b..2b01907 100644
    --- a/fs/locks.c
    +++ b/fs/locks.c
    @@ -2199,15 +2199,8 @@ 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 ;-( */
    - 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);
    }
    --
    1.7.4.1




    \
     
     \ /
      Last update: 2012-02-10 22:09    [W:0.038 / U:31.568 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site