Message ID | 20240125-flsplit-v2-8-7485322b62c7@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-38419-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1551486dyi; Thu, 25 Jan 2024 02:48:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IGedZzaWlKqNFu6H3e15s7MPohjOsexVcSYhsEVvOaM6yKAFebP+QphLGWgJUabBzBuXmva X-Received: by 2002:a17:906:b56:b0:a28:e4bf:b172 with SMTP id v22-20020a1709060b5600b00a28e4bfb172mr347171ejg.105.1706179734497; Thu, 25 Jan 2024 02:48:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706179734; cv=pass; d=google.com; s=arc-20160816; b=em+RqFRCJLwqnLCnFc/AHluhkK3cRdjKpS3Gaa9tVEGiFWtsxX9EH6DnfiE4kDRJ5B RYbEPTI3UQVtLKFQ/c8mu2aVvf5iXlS3XgqFnzuYNz0G0Pvx0Tx2YSCoueEcdel7mPgZ mkmhPPED1eu9at0PhMYhG1phe38rmGyxenB7npqOYf9mTbvHyM4/QS4F8XKNYbyps2WM fdkSell/IFnETl7r27aw0eWFzjh9xe253iLgy7ek0AOY/gKcTzfMg5GEpfcwuDhOq3M6 q3S1WxhCEO+ODca6jCuQOAjfcfrwoL6W837xofP15nZYj3duCW08kEru/CQGuWU0LKiT xLUQ== 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=UNLyr1UnfXyYG136jLN7YVn3ztclPlMMRFQGV4G6/Rs=; fh=AED2lrIQZhdppGHbaRrNz6/BI48B+mbutB2egpFPmJc=; b=SLhsQeLKubItUQEOfIAe4EI3N4ttGJCkoG7W6Cv71uJg1pv2kI7K4wPsl0T8uYeFm8 uDhIRC9ulHgbK/uic+lwkB0388/oUM1D0mX2QlWSXjs22xj5u83WcxoSMN2fEaml40Ui wKCIKkFpG3hB1eCMgBO8HatHXNufHJm5yNMii6v/W9HZ5WHjFQISBHdnWyokCZ7zug3W UpwQrdhRYH15e3oEYvswnfeWP1tgo31tZAF1zCq416Hg5M5prqxBqllVb3dvBpxlSs/T SerzzvaMQejO7Ll+FacnW/RslSFcvcYb+KiYkWVHduULche+GcPEWnCI5SWXYxQugqFW tFxg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RuY6z5xw; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-38419-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38419-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id p25-20020a1709061b5900b00a307a5de0a4si839993ejg.857.2024.01.25.02.48.54 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 02:48:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-38419-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RuY6z5xw; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-38419-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38419-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 223431F23C67 for <ouuuleilei@gmail.com>; Thu, 25 Jan 2024 10:48:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C0AE055C20; Thu, 25 Jan 2024 10:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RuY6z5xw" 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 142795466F; Thu, 25 Jan 2024 10:43:45 +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=1706179426; cv=none; b=BvNKcHXdnnudafel2bYh/J0fS9PgFz5TcwLxAcgOcSe8isDwaOjo6yg9WCBrw9WYkLA00W3tI4wSPTBtQq2hOx1UuIXR2v7cS26KXgt7NdSb8Bri5CHa6VUHG4/CV7XoTUXDYD2rhVUE4at2lKA8Lcj5H427Xi7+Z6rt1XyR2lo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706179426; c=relaxed/simple; bh=76JoANNb/cZ0aZqm7odWxaM42ZvizPqQ7xwZgaYaPBg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t3kLMZpsJuR4QPd1wj0+dSoQ49UDlHJvGix4lOGf6PwaykfLplOLAJ02a+4bJU78OG3GKFzP9pBgpKGm909yeRFtpK927kEYeRdbfBJ/IHVeA9QtDeVqLrwqap3em+QlLEuKgBHoIO/x2mI7YHIMGtkMFCeExqY2QyYW715HC4c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RuY6z5xw; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13AF2C433A6; Thu, 25 Jan 2024 10:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706179425; bh=76JoANNb/cZ0aZqm7odWxaM42ZvizPqQ7xwZgaYaPBg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RuY6z5xwFBbrq8yDxdGgG3VBgCM9WqnarHmKN3wPlh78wBjb8NkDPqMbDgOa4NmVK 526CuXKaTkh9uahfp0FIiMJ4dcCLlxyyQFp9BH7zcq0VcD197UZRm8YR5SXsFje7lF qHCTpZptAJi82e2cJTyTmN9wPyLo8XIlEOfXZJR+qtBUIJmcEDtmWaUKsJY/tbzOr4 bSXXNXCj8+wDs5OjVEpvAUObk7dwk0m13MgxBxqhUyxcNm6xaCkNJEc3ZSihJmCCuQ I/tqom13BkJRby1bXFdgHxd6RALsxa6chUbb/xK2i+nQT07BrQxTFdAYhhooofXU9C BpuKMn0A2LAaQ== From: Jeff Layton <jlayton@kernel.org> Date: Thu, 25 Jan 2024 05:42:49 -0500 Subject: [PATCH v2 08/41] afs: rename fl_type variable in afs_next_locker Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240125-flsplit-v2-8-7485322b62c7@kernel.org> References: <20240125-flsplit-v2-0-7485322b62c7@kernel.org> In-Reply-To: <20240125-flsplit-v2-0-7485322b62c7@kernel.org> To: Christian Brauner <brauner@kernel.org>, Alexander Viro <viro@zeniv.linux.org.uk>, Eric Van Hensbergen <ericvh@kernel.org>, Latchesar Ionkov <lucho@ionkov.net>, Dominique Martinet <asmadeus@codewreck.org>, Christian Schoenebeck <linux_oss@crudebyte.com>, David Howells <dhowells@redhat.com>, Marc Dionne <marc.dionne@auristor.com>, Xiubo Li <xiubli@redhat.com>, Ilya Dryomov <idryomov@gmail.com>, Alexander Aring <aahringo@redhat.com>, David Teigland <teigland@redhat.com>, Miklos Szeredi <miklos@szeredi.hu>, Andreas Gruenbacher <agruenba@redhat.com>, Trond Myklebust <trond.myklebust@hammerspace.com>, Anna Schumaker <anna@kernel.org>, Chuck Lever <chuck.lever@oracle.com>, Neil Brown <neilb@suse.de>, Olga Kornievskaia <kolga@netapp.com>, Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>, Jan Kara <jack@suse.cz>, Mark Fasheh <mark@fasheh.com>, Joel Becker <jlbec@evilplan.org>, Joseph Qi <joseph.qi@linux.alibaba.com>, Steve French <sfrench@samba.org>, Paulo Alcantara <pc@manguebit.com>, Shyam Prasad N <sprasad@microsoft.com>, Namjae Jeon <linkinjeon@kernel.org>, Sergey Senozhatsky <senozhatsky@chromium.org>, Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@kernel.org>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, Ronnie Sahlberg <ronniesahlberg@gmail.com> Cc: linux-kernel@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, ceph-devel@vger.kernel.org, gfs2@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, ocfs2-devel@lists.linux.dev, linux-cifs@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Jeff Layton <jlayton@kernel.org> X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1005; i=jlayton@kernel.org; h=from:subject:message-id; bh=76JoANNb/cZ0aZqm7odWxaM42ZvizPqQ7xwZgaYaPBg=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBlsjs6mlzqlus0seYs8plExb25HrMSBcuHuJlcE b9UfC3dIwKJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZbI7OgAKCRAADmhBGVaC FQhXD/4gu6zQnlekyIer5PJjqTfhNFt0AivH2IxxSvvwziWlIKPQ6B11Jm9YHG31Cogeo0xpkZe K6Q1f9W6Hrnc2qIWZMTgHt8JfLBNTZygnjghvzxnJEawm5xxr5aELj68TGWBMnWjIF1skd8nu5c Qn9IopFQE8q7lFtO3SWQwtDU/W73m8/UfYbHNMrznC5XuXK9yLIT5nI5T2xxxxqx1zUHJxSjVLq uz+rFiRaGxhANGdx7GmgL/1cQwJCbN7q5Tdm5UcFuj86MlylyyAWD7Biu+40PbTwLjTelyqQyD+ Makh8iGaS3zlTZu5ny0Yq1nlwOaIlfFLtZEgssYKqTTG+oG7GuDmWSPyY7/WfqQ3NF5o0gWfjMd bhJqhWSmmMRAP69ugzS3HPp1Z64GaTCLCQX6TF61Qul81vjxzW7+sEylQN/baVof0TzhBcQDREp tmoD6wehNYbuTw35x782VGyA3Jz1Ck8H9qPCYPJzfWzEbHWrwkK9ppMFKor7cQvq/ux3zZEu3Zo 3fkVrwL3XM5Z5FRkf8VHZ0EfUL5S7LNuLMXAtWYuOOFAUc4lQEAmua77WZaem1XQ7WVsGJJYgT0 WbNpDG33KNGBhZfIjZ69bfAmlHxbv4IGJQZNhyLJ4DDc6m29DeTNd9hj0f6GvaotJn6ag34XjCs tZaUZHJgT4EOGQA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789059121135413950 X-GMAIL-MSGID: 1789059121135413950 |
Series |
filelock: split struct file_lock into file_lock and file_lease structs
|
|
Commit Message
Jeff Layton
Jan. 25, 2024, 10:42 a.m. UTC
In later patches we're going to introduce macros that conflict with the
variable name here. Rename it.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/afs/flock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/afs/flock.c b/fs/afs/flock.c index 9c6dea3139f5..e7feaf66bddf 100644 --- a/fs/afs/flock.c +++ b/fs/afs/flock.c @@ -112,16 +112,16 @@ static void afs_next_locker(struct afs_vnode *vnode, int error) { struct file_lock *p, *_p, *next = NULL; struct key *key = vnode->lock_key; - unsigned int fl_type = F_RDLCK; + unsigned int type = F_RDLCK; _enter(""); if (vnode->lock_type == AFS_LOCK_WRITE) - fl_type = F_WRLCK; + type = F_WRLCK; list_for_each_entry_safe(p, _p, &vnode->pending_locks, fl_u.afs.link) { if (error && - p->fl_type == fl_type && + p->fl_type == type && afs_file_key(p->fl_file) == key) { list_del_init(&p->fl_u.afs.link); p->fl_u.afs.state = error;