From patchwork Wed Jan 31 23:01:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 195020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp80939dyc; Wed, 31 Jan 2024 15:09:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IGIOgZWhDR+kTB1enSB/JAFP6yv6mRWwt8gUWRvkY0O21IOfTA+QNypLFRVKTbY/bsEaJ7i X-Received: by 2002:a17:902:e88a:b0:1d9:4c70:4017 with SMTP id w10-20020a170902e88a00b001d94c704017mr219972plg.46.1706742543589; Wed, 31 Jan 2024 15:09:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706742543; cv=pass; d=google.com; s=arc-20160816; b=m6JFlKkVmGcrTGlXd8UL+8rL7gmpSqH9pPjMz9Hm5bH66y59L85qn89Dfijl305nKi tB9Nt2kXKrO6wZrq+jAM059mieumaDoChdY+Z8y1gp976JV3nVBCkHgZnYUNmMnDWzoI /OEk1/EehY3h2j7iOzqgaLrAmO8CEryO8QqcIZq0grwLw6Unof3uAWYsoXXxjJPm1xxF WIVIgwd32u5CHo2HW75oMsIpJntKbiI/dNV+T7ltk5W7Pu97BNZeubDaoLJ90dASiJSv jBtzAUZ+p5ORt56NJ/UNu6VRl/zCDH7IX2HQO2eeLAngsPJfbYshxH73BqOw1NGPWIm7 oafg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=Rod5GgLGeG6bWTvRt/D9U4fr68Nv01/5oHGglU56PNU=; fh=bn1WSJuDSJciKl7LdUIMKEf/7sgiQz7UisgtKavjYng=; b=S8hQY0Bz5k46jy9uIufoqVaf8is/zGYVM99VNyxbvkgrHceOd7OXk5G4u5jouWISwv 7zXVZfdTDdu0Ee9G1FqlgL5fFyAqNzvQdnyLOiRNznIwnTkSCsTzq/tHCejJ5QGDRQ3M u8jxRydlzrj51+d64j9HowbRe1mC2UV80HYhGSTjqY6BqBk0PCMKB1ixuN9e+DiNwz1f mq43zTguwL3GT69i57wTHgix76vETmyTD87Il+TN2oQUN6xq8vajjkhd7tDsQbZWSg5m jxfHbyTz7N5eIVKcUxP4cU4TT82gHTu+673sWL4AI6L6Nfx6tZJQWKrMo/aUKoAFT9gX pdvA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="R/m3EcAu"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-47289-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47289-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCXJCA4Mr+RaWVm5NqvuIL4njOBdJZpCE/lx5lbzvCaoUAEblRr+n3V1LSx7Z200qmVhUka6O2f4VCShqZtrnzhPWPsiKg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id h19-20020a170902f7d300b001d92e40f699si2169279plw.54.2024.01.31.15.09.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 15:09:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47289-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="R/m3EcAu"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-47289-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47289-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 447432917C4 for ; Wed, 31 Jan 2024 23:04:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B5A693CF57; Wed, 31 Jan 2024 23:02:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="R/m3EcAu" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB7813C6BC; Wed, 31 Jan 2024 23:02:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706742148; cv=none; b=ZuMNAQzmmXfUADw9l+C81f0tYjZDTkJg7fTey1V4lyBt8fIoH1ANJp0BpAh96ra9sdaFLBUwBxbRABv/EEnFwYEH5uZ8Roh3OpO70LXunjGUdkdzqwfey/kvS9gbLIez26EAIsxH79BGjcp/t/sR+OgNd1daTJ5ikDHHjoRrhbM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706742148; c=relaxed/simple; bh=2YbMDNw3c2UqWUFblyqOLLtcJSL33noaMk1Mbj6+9/U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qdmqHbLDe1MqyHo4wSLsYDN1TatoyX5vfO/pnJvD/tRxtFEcs0R1d3XCdgStbwzqoO3SyvPG5PdSnye98xCEkjvs56gwNVqwwau295ur2Xx8LRuNngRBEczFPE/6TvGVdlPT67IUcjynPzjIcC4NlA4xVmoO0x6icIsTLCJ+1hs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R/m3EcAu; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A176C433F1; Wed, 31 Jan 2024 23:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706742148; bh=2YbMDNw3c2UqWUFblyqOLLtcJSL33noaMk1Mbj6+9/U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=R/m3EcAuDcf5QXKkwD+MevGbjPtPC3i16HDBtdkqpPmDuhGOuQDP3ifh3DJMNpNm7 i1Oy8J8A5EDX5op2wJJwBmpZB+dmk98/NsDmBeQyelGIm0eyV6Uyi+e7PmoGPdwbtm o/wUsJJ09SLdimnoJmD8iizeR9E0rtoIOHbfWoA35kRyeyHDtM1vCppUs/xwM/WJWR Ne1yhZ8xXq6mbGXAbCBK666Aw3dGMdetPPLe5iG4Ukc9sXGJORU9fclgl5GWCrf3A6 3joJTSvctveyY27aEKzgW0aB9A4jM31lEumNR7GCqB8IKE7RNzlhxYPTqfFh3r9mky GNAkI3uEceUIg== From: Jeff Layton Date: Wed, 31 Jan 2024 18:01:44 -0500 Subject: [PATCH v3 03/47] filelock: rename fl_pid variable in lock_get_status Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240131-flsplit-v3-3-c6129007ee8d@kernel.org> References: <20240131-flsplit-v3-0-c6129007ee8d@kernel.org> In-Reply-To: <20240131-flsplit-v3-0-c6129007ee8d@kernel.org> To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Chuck Lever , Alexander Viro , Christian Brauner , Jan Kara , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Howells , Marc Dionne , Xiubo Li , Ilya Dryomov , Alexander Aring , David Teigland , Andreas Gruenbacher , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Mark Fasheh , Joel Becker , Joseph Qi , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Namjae Jeon , Sergey Senozhatsky , Miklos Szeredi Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, ceph-devel@vger.kernel.org, gfs2@lists.linux.dev, linux-nfs@vger.kernel.org, ocfs2-devel@lists.linux.dev, linux-cifs@vger.kernel.org, Jeff Layton X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1474; i=jlayton@kernel.org; h=from:subject:message-id; bh=2YbMDNw3c2UqWUFblyqOLLtcJSL33noaMk1Mbj6+9/U=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBlutFu61Z5WT8kuDNwU06HgxdPXzSA8/qE2Cj1D CG6IWS+MAeJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZbrRbgAKCRAADmhBGVaC FVsAD/91v196/WZutgy8iR+odquUSnynSbS8L4egjxN8AMrfF5febHAe3Y5JABVbmobrabNtWlz 5EIPoBL4JJlC2xplBQ8N1dJQ3ep1q/G9Q6VmOzY7RKXtf4djuW1Izyr/pePhuieYEiEWwLjd5B2 f7KM7FllMPSTAv/fJaEiqYElJ0/3jB4JPA8GWBI3pkmC+j2uFkYKtHd1GR+sBrkhgSkW1niGTI5 OstchGjyK7h2wxHU4zU4OT+f1mPCN3OiPp0sz1Lenrr2e3C5v1OkTYEDI7mPZuPStssWeqoEFxS GZQ8GW64SaES1fbOmTBLol3tma8c+27adTqLnb2qCz6Wu5myK9lFZUkLEQSXYbk+H+OFnLfkb4a AgpQu81MI6am6IY7oBCL4/Mdh5PkagkcRchQ2JRjMBNB5BDNwfMp5rLCq9psTAQ1A0lxLFmRxTu 9/BvxWooQGO5qVQWWQZvu9GIwf5sbfLOaJTfY/UcCymgIaaZ3mlcxUh8tR69mejTe0OEygaB5Ng 4T7Hr7aCpcV9AvGbJBd9K6LWmwO38I91xaSnI+eXBjGbzz/0vLfmPUz5/Fso+/PJlFp26FCDG2A Po9N6MzCAZ8OVyJcfRSztM8IKMsV0WPpR7n5VaI5dkkJl1rFqRIR6us3RLvKyiFNMayW3lkaw1R OGMK2HNQqqxeLKQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789649269322027983 X-GMAIL-MSGID: 1789649269322027983 In later patches we're going to introduce some macros that will clash with the variable name here. Rename it. Signed-off-by: Jeff Layton --- fs/locks.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index cc7c117ee192..1eceaa56e47f 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2695,11 +2695,11 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl, loff_t id, char *pfx, int repeat) { struct inode *inode = NULL; - unsigned int fl_pid; + unsigned int pid; struct pid_namespace *proc_pidns = proc_pid_ns(file_inode(f->file)->i_sb); int type; - fl_pid = locks_translate_pid(fl, proc_pidns); + pid = locks_translate_pid(fl, proc_pidns); /* * If lock owner is dead (and pid is freed) or not visible in current * pidns, zero is shown as a pid value. Check lock info from @@ -2747,11 +2747,11 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl, (type == F_RDLCK) ? "READ" : "UNLCK"); if (inode) { /* userspace relies on this representation of dev_t */ - seq_printf(f, "%d %02x:%02x:%lu ", fl_pid, + seq_printf(f, "%d %02x:%02x:%lu ", pid, MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev), inode->i_ino); } else { - seq_printf(f, "%d :0 ", fl_pid); + seq_printf(f, "%d :0 ", pid); } if (IS_POSIX(fl)) { if (fl->fl_end == OFFSET_MAX)