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;
From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Alexander Viro <viro@zeniv.linux.org.uk>
Cc:     Stephen Brennan <stephen.s.brennan@oracle.com>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 4/4] namei: Standardize callers of filename_create()
Date:   Tue,  7 Sep 2021 17:04:13 -0700
Message-Id: <20210908000413.42264-5-stephen.s.brennan@oracle.com>
In-Reply-To: <20210908000413.42264-1-stephen.s.brennan@oracle.com>
References: <20210908000413.42264-1-stephen.s.brennan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WopiRuJqYRpu+c09h8SG+jobvKCF6DrtOqnDcmFUCx0Y8YGkXYshNek4qA9O?=
 =?us-ascii?Q?vHUshcorF64Ln95tOSlyp3ll/M62EyPq+sRAtjEVqwwvsVyoISnO+psl7l/u?=
 =?us-ascii?Q?5RiR+03LRSzftYn5a/AKhkjDVxAkPdh7jNckv1+rtMAI+vamM2UsczmmmAAG?=
 =?us-ascii?Q?GcW/1duxVIJN+T2/7VuaVdHmIscnFdy9JhtlWs1t86TZEhjYpmZw733zZsoL?=
 =?us-ascii?Q?LCiOZMc6W2cHcgb5ILp508QktaoqCLXJnKhcrxb8w5RNzSU4kvxlaV2tN0dD?=
 =?us-ascii?Q?NQCBGtC1aGGVgl7azt8Kamqr8X0UzTMDYIcA58Z6nBjgeOwGKnavMXVU8EmJ?=
 =?us-ascii?Q?Eshv9fooDblWXMRo+qhfhb7WtImX7u3JQTR6fiiEHjjo+ohO1lr88DQPBS0L?=
 =?us-ascii?Q?73ZN9+cF6bJsKSX76gPdLrrEpK5rroRntHBZtSHONpbNWjbSH8uBevU3WNnr?=
 =?us-ascii?Q?OXyH8/2Eb8yYaLeK0TW9W4N5xMPreH9ttstbQtOJOJmiDQh0GLsLjOq47wWF?=
 =?us-ascii?Q?HtP01VZCqlIIHsWb6kldg+j0tyDtXkoxylv6qDG0y33xmQM5E/zefw/A10xo?=
 =?us-ascii?Q?xPKw5sWIitpxik0hSacHhhch5upjOviRUcAuTkL8ZivIWuF5HWwHNy/ngXOw?=
 =?us-ascii?Q?n5eWD+yF+VNCV+eEu3hJgoPJQsQy+mG8irJvJuNO8/Pkp0HKvU8wV5zwKSAn?=
 =?us-ascii?Q?GJKP+urcX7D3H+TVxRzM/4t0gfn9DupWOHc+T6O5XouDEtmDUgKQTc4FzOJx?=
 =?us-ascii?Q?7QYDJNg78JmJIxco12DbKI0iREGlZgQ9eqM1Y8DbIpfvlG9yxz+xWgcqsGcj?=
 =?us-ascii?Q?CFw+vumLA3+3EoTgQwZmoMfCKql6AkIigzBYfQpfW7cucEq5JqC5qnxBpzlu?=
 =?us-ascii?Q?MF1pGuZkLR7NbIPTdQ8eiG8zZSon88fkH0oKa4dgwnLtReGh8NVzdEV1Hcxh?=
 =?us-ascii?Q?dpqE0YtLqH+5qh8f5FSB1PuYdg2wDYPKS7kbWZQoOiK6g4PZfIVgbIlO8pSm?=
 =?us-ascii?Q?fppgS8VoN8gCUXSwFfE7PXwJ6lF7iKAkfMfDc9It1YGeZ3LJGkxxfuFvo0aU?=
 =?us-ascii?Q?P3zDwA02l15hobgpjPkaMbX4wbwT/HeuzdZsqIFrd5UDjVcRRlfIxkG7E4SE?=
 =?us-ascii?Q?uQ7fwT2n5Xoej5bfvlwHILWvtdxSTuJTGaYDJtXCdeVqaqp3phNEkl4CDGst?=
 =?us-ascii?Q?BzKr89Fs9LaxD5Spd1J+Uds9aBz5AItAjllKRHIGUWLxnZyaC34Q5wFgLxdt?=
 =?us-ascii?Q?KqCChuR9CbzwtPq30IOmuUXQx5i24kUA+5uael0tSjDrQ8hDfEuEKcJisS2M?=
 =?us-ascii?Q?Mn1PTInvTvOfdPYNkmHof+l5?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3773015b-1abb-4127-b063-08d9725c3666
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2021 00:04:22.6481
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: gSXBrKgtXATm9lVGwsDxXHJpDF1Y8vYqcG2DW/XdwPVzVMkmvxIrg615MNaOhatIaoHoTpMs24yMYHKcxMPJAtu3sWDnWIeDzOYDVf6GUk0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5147
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10100 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0
 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 mlxlogscore=999
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2109030001 definitions=main-2109070152
X-Proofpoint-GUID: Gs1ztt_lbBd99-qzfoM_fXS9AXPUN1Hq
X-Proofpoint-ORIG-GUID: Gs1ztt_lbBd99-qzfoM_fXS9AXPUN1Hq
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

filename_create() has two variants, one which drops the caller's
reference to filename (filename_create) and one which does
not (__filename_create). This can be confusing as it's unusual to drop a
caller's reference. Remove filename_create, rename __filename_create
to filename_create, and convert all callers.

Link: https://lore.kernel.org/linux-fsdevel/f6238254-35bd-7e97-5b27-21050c745874@oracle.com/
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---
 fs/namei.c | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 7bd3d1c90e52..88cdc379255c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3625,8 +3625,8 @@ struct file *do_file_open_root(const struct path *root,
 	return file;
 }
 
-static struct dentry *__filename_create(int dfd, struct filename *name,
-				struct path *path, unsigned int lookup_flags)
+static struct dentry *filename_create(int dfd, struct filename *name,
+				      struct path *path, unsigned int lookup_flags)
 {
 	struct dentry *dentry = ERR_PTR(-EEXIST);
 	struct qstr last;
@@ -3694,20 +3694,16 @@ static struct dentry *__filename_create(int dfd, struct filename *name,
 	return dentry;
 }
 
-static inline struct dentry *filename_create(int dfd, struct filename *name,
-				struct path *path, unsigned int lookup_flags)
-{
-	struct dentry *res = __filename_create(dfd, name, path, lookup_flags);
-
-	putname(name);
-	return res;
-}
-
 struct dentry *kern_path_create(int dfd, const char *pathname,
 				struct path *path, unsigned int lookup_flags)
 {
-	return filename_create(dfd, getname_kernel(pathname),
-				path, lookup_flags);
+	struct filename *filename;
+	struct dentry *dentry;
+
+	filename = getname_kernel(pathname);
+	dentry = filename_create(dfd, filename, path, lookup_flags);
+	putname(filename);
+	return dentry;
 }
 EXPORT_SYMBOL(kern_path_create);
 
@@ -3723,7 +3719,13 @@ EXPORT_SYMBOL(done_path_create);
 inline struct dentry *user_path_create(int dfd, const char __user *pathname,
 				struct path *path, unsigned int lookup_flags)
 {
-	return filename_create(dfd, getname(pathname), path, lookup_flags);
+	struct filename *filename;
+	struct dentry *dentry;
+
+	filename = getname(pathname);
+	dentry = filename_create(dfd, filename, path, lookup_flags);
+	putname(filename);
+	return dentry;
 }
 EXPORT_SYMBOL(user_path_create);
 
@@ -3804,7 +3806,7 @@ static int do_mknodat(int dfd, struct filename *name, umode_t mode,
 	if (error)
 		goto out1;
 retry:
-	dentry = __filename_create(dfd, name, &path, lookup_flags);
+	dentry = filename_create(dfd, name, &path, lookup_flags);
 	error = PTR_ERR(dentry);
 	if (IS_ERR(dentry))
 		goto out1;
@@ -3904,7 +3906,7 @@ int do_mkdirat(int dfd, struct filename *name, umode_t mode)
 	unsigned int lookup_flags = LOOKUP_DIRECTORY;
 
 retry:
-	dentry = __filename_create(dfd, name, &path, lookup_flags);
+	dentry = filename_create(dfd, name, &path, lookup_flags);
 	error = PTR_ERR(dentry);
 	if (IS_ERR(dentry))
 		goto out_putname;
@@ -4271,7 +4273,7 @@ int do_symlinkat(struct filename *from, int newdfd, struct filename *to)
 		goto out_putnames;
 	}
 retry:
-	dentry = __filename_create(newdfd, to, &path, lookup_flags);
+	dentry = filename_create(newdfd, to, &path, lookup_flags);
 	error = PTR_ERR(dentry);
 	if (IS_ERR(dentry))
 		goto out_putnames;
@@ -4435,7 +4437,7 @@ int do_linkat(int olddfd, struct filename *old, int newdfd,
 	if (error)
 		goto out_putnames;
 
-	new_dentry = __filename_create(newdfd, new, &new_path,
+	new_dentry = filename_create(newdfd, new, &new_path,
 					(how & LOOKUP_REVAL));
 	error = PTR_ERR(new_dentry);
 	if (IS_ERR(new_dentry))
-- 
2.30.2