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 v2 3/3] namei: Standardize callers of filename_create()
Date:   Tue,  7 Sep 2021 13:50:43 -0700
Message-Id: <20210907205043.16768-4-stephen.s.brennan@oracle.com>
In-Reply-To: <20210907205043.16768-1-stephen.s.brennan@oracle.com>
References: <20210907205043.16768-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?amTw9SKoDpED4j+AerHHxxOMseU+hBZbgtnLt7IpQQ5/u1zjqeMSuD1eJby1?=
 =?us-ascii?Q?e+oSR46xCbP/Snmaa3FzUfYOxiv4NvOhrfi8UqCfkY0ObGaoMxbXwnHTo2uE?=
 =?us-ascii?Q?5nfHVN3k2GDWrp5UJKWZuDK541+HUPQ6UiFDStjcN7WA8sNyTYnvYE5POXke?=
 =?us-ascii?Q?e6fG3ncqXUVNY5c6fhFQmhZfLK/okH5KUU7ldW5sNnv4L3MlZgQT/1NIqyr/?=
 =?us-ascii?Q?1jG6iRX/8SLz6vFwUUG95L1ibj/C6eRSybvIJis6LOPT34ly3JCeCQiUtnBk?=
 =?us-ascii?Q?SwTollnGAt8fS1W7j18JDsdx8fF/CbLW/i40cqZkJ3Q5Q/5HDMCct9ra+PPn?=
 =?us-ascii?Q?eV6V3kJTXebNxd/rOMcOSJm3ItLQA+JUWNOmIY7NgnnYDw5n2h494zZZXxXm?=
 =?us-ascii?Q?Et2UnTegmZpkhKQlljly4oN/i93tBUjqhEdXp2EGVd8Sz6jZBp4KEcbtbhWa?=
 =?us-ascii?Q?7CnWJY7H9j67SVQkDn5OXfib441XbprTjzdtQA3Mq96n4Sb4u1+bmY/hixRC?=
 =?us-ascii?Q?fuLuuQ6gibbJ4hqPW6mFIXlgaphf925kAeKDRpCo3w1lgj2bYVPI38apNkvN?=
 =?us-ascii?Q?r6xeG2E/q3B4OVqqIFa4wx/3WJthzSvRj/KVInMu6YfexvtHdAq98fupL4UB?=
 =?us-ascii?Q?Hs1MjgORQzOG13WHos8wLJto4vJ/yccOiT7bBHvOBRRQ+dFd58s04mEHNZ3R?=
 =?us-ascii?Q?b7yz9nqzmtFIgMfEuh70qGXUaAFuH2l3pBsYvTUaUycoBumGpdnjid/ySQ34?=
 =?us-ascii?Q?Cw8/xckTnNGePmv8UBLi+JBXehOVie1EU6JZ/8fo14E3Q56WerBGfumcdDxv?=
 =?us-ascii?Q?XzXZ+TZ7+jBQIV10oxiAMaSUfaZ+ch421YXp5mk8nkR1SbuFGV91Ro177F6B?=
 =?us-ascii?Q?TRZBHiBsujkvIIWEcttda/C2kgHWBUPAm0oSN77QYc0yg7LSsOMIToZXN5kB?=
 =?us-ascii?Q?Gpr8EP9fWQlrMv9rT0uwLTS9xddL1aY4A0vWejBKXg2ukEzB6iNfKTXnH6vG?=
 =?us-ascii?Q?hTRS6VJOQofKsAjC3cmhnScTLqVZ20zaoorOPZizL7O7Edh+dRausu5Q6fAN?=
 =?us-ascii?Q?RQ6y0P+kPUuiwTlCaSVgFiABCcbEDqPOG5zk5uPIauOL0jLSuzbx325tHfoj?=
 =?us-ascii?Q?e0i/ftlZXaQqK5jr4FI7T3JwWU8sThHMGTFGZ/voHVcqfdrpKV4qlSPhnQ9O?=
 =?us-ascii?Q?nkQYaOWvP+rUpwiXqf7o7T9Ij7BetH8gok9Id0l+K0SdhuGOywtYO96ps3TJ?=
 =?us-ascii?Q?7sinJGA6ud/L1+rIyEJk08K/sVbuqZwL1yGu3fmVlcxNR5NsF7ZtAbwLhs8v?=
 =?us-ascii?Q?RMRjnlhLwikHkmCB1dcAkD5O?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ba3443c-dc9e-442d-d30e-08d972412d7f
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 20:50:51.2707
 (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: rVRJFRFsrEJU5y+K3y1ycZkqe0esdN60836k5K6iifurcoKt+YvpZjnXVLd5/DkYk1JSj6yBBGI9Us9YuQ25wRrPzSU/TTbAb8z/9tjFxOM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4149
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-2109070131
X-Proofpoint-GUID: mAO8BuZGWe5F7iDUMjg3BycVH2RO640E
X-Proofpoint-ORIG-GUID: mAO8BuZGWe5F7iDUMjg3BycVH2RO640E
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 76871b7f127a..0d3ce04c55ad 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3622,8 +3622,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;
@@ -3691,20 +3691,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);
 
@@ -3720,7 +3716,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, pathname, path, lookup_flags);
+	putname(filename);
+	return dentry;
 }
 EXPORT_SYMBOL(user_path_create);
 
@@ -3801,7 +3803,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;
@@ -3901,7 +3903,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;
@@ -4268,7 +4270,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;
@@ -4432,7 +4434,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