From patchwork Sat Mar 7 16:09:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 5959601 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CE8A8BF440 for ; Sat, 7 Mar 2015 16:11:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EEF820374 for ; Sat, 7 Mar 2015 16:11:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35A4B2020F for ; Sat, 7 Mar 2015 16:11:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751160AbbCGQLD (ORCPT ); Sat, 7 Mar 2015 11:11:03 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.226]:65313 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751911AbbCGQKF (ORCPT ); Sat, 7 Mar 2015 11:10:05 -0500 Received: from [107.15.97.250] ([107.15.97.250:42858] helo=tlielax.poochiereds.net) by cdptpa-oedge02 (envelope-from ) (ecelerity 3.5.0.35861 r(Momo-dev:tip)) with ESMTP id 7D/D9-08648-9D22BF45; Sat, 07 Mar 2015 16:10:01 +0000 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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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); }