Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp2338904ybz; Thu, 23 Apr 2020 16:18:35 -0700 (PDT) X-Google-Smtp-Source: APiQypKOf2/Hx5IJJ/7TpBsrM8Bnb8SwbAi2o3+I2uBQSx0JNH9fV8wVdagbYf0HPERWy8HLc26L X-Received: by 2002:a17:906:90c1:: with SMTP id v1mr4471628ejw.322.1587683915207; Thu, 23 Apr 2020 16:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587683915; cv=none; d=google.com; s=arc-20160816; b=B5yEvn51Z4KmsZ3Wd2o793+EAc/jS8FlmjLWFz9lGFrN9NaMQnBjzPB2BVPWEABUE9 sZjH36/h+aYTW/roT+eBTBW6d9KfOE4/mo+rj67xiky7v0Q8PbLf72XRRHdg/oTms9ZT kz/kqLsU1zMX1lNUjod7HdobgEMYIFhDh5zjh2WwAfcQDXj9ZZ5rf8mC81P1juKolN49 DGvnycFne8bEtaixMW/KIgmINTDxb18iGvqwWZLqLw+qThkDWfF72hUgOyxsZYzepfep wy/OZ3ZfQrglKBwjYCBVac2HBmSXonXxSqUKv16N/tkYbKxnHwxF6qZmdy3+YaI/EtPj QDEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=nkAEj/dx+dnJNfzIrxM3HEj5ZtQKW9cUbtnsIHT/K94=; b=WXB7ahFPt/7JIbdtTPtS1V82MgHGpq2kEJtsXulIcuMgqGAkU3d/f86r/F1mB9F7IC qe/xJIn/Sax7uBrZnOYjfvvEWF3ZW3MWkpslgTF5s/S5fmHZITpma7JYZL4uFSuwywBR KnOvTmTlAuK528vXjLFm23Crlxj5gd9K9qNDBF36LwoNmHZrahCcJor3Eaqu8z/3MR2z k8aRNjcgos6eE/J3rKmnvl4WUuaEwWKfIyXG9z5hjQB7m/K7xekcoDLn3p3rer8hOrqm AEGh/rPoMMm5P0u7aJtj2dJb7PjzAzVQ1n7GEEAuko0AsrRqFiQiG2BrUck7B3ruS0gt YEMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o6si2082183ejb.97.2020.04.23.16.18.11; Thu, 23 Apr 2020 16:18:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729207AbgDWXQM (ORCPT + 99 others); Thu, 23 Apr 2020 19:16:12 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:49574 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728384AbgDWXGq (ORCPT ); Thu, 23 Apr 2020 19:06:46 -0400 Received: from [192.168.4.242] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1jRkvU-0004i5-1D; Fri, 24 Apr 2020 00:06:36 +0100 Received: from ben by deadeye with local (Exim 4.93) (envelope-from ) id 1jRkvS-00E6qS-0z; Fri, 24 Apr 2020 00:06:34 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, Denis Kirjanov , "Jeff Layton" , "Amir Goldstein" Date: Fri, 24 Apr 2020 00:06:09 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) X-Patchwork-Hint: ignore Subject: [PATCH 3.16 142/245] locks: print unsigned ino in /proc/locks In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.242 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.83-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Amir Goldstein commit 98ca480a8f22fdbd768e3dad07024c8d4856576c upstream. An ino is unsigned, so display it as such in /proc/locks. Signed-off-by: Amir Goldstein Signed-off-by: Jeff Layton [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings --- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/locks.c +++ b/fs/locks.c @@ -2488,7 +2488,7 @@ static void lock_get_status(struct seq_f 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:%lu ", fl_pid, MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev), inode->i_ino); #endif