From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752287AbbCGQLD (ORCPT ); Sat, 7 Mar 2015 11:11:03 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.227]:45346 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751913AbbCGQKF (ORCPT ); Sat, 7 Mar 2015 11:10:05 -0500 From: Jeff Layton To: linux-fsdevel@vger.kernel.org Cc: bfields@fieldses.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] locks: get rid of WE_CAN_BREAK_LSLK_NOW dead code Date: Sat, 7 Mar 2015 11:09:58 -0500 Message-Id: <1425744599-4934-4-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425744599-4934-1-git-send-email-jeff.layton@primarydata.com> References: <1425744599-4934-1-git-send-email-jeff.layton@primarydata.com> X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Jeff Layton --- fs/locks.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index 49d240874d4e..4347f3dc17cc 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 :0 ", fl_pid); } -- 2.1.0