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 3/3] namei: Standardize callers of filename_create()
Date:   Wed,  1 Sep 2021 10:51:43 -0700
Message-Id: <20210901175144.121048-4-stephen.s.brennan@oracle.com>
In-Reply-To: <20210901175144.121048-1-stephen.s.brennan@oracle.com>
References: <20210901175144.121048-1-stephen.s.brennan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost (148.87.23.10) by SJ0PR05CA0131.namprd05.prod.outlook.com (2603:10b6:a03:33d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.11 via Frontend Transport; Wed, 1 Sep 2021 17:51:52 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 964e92a3-708a-40ea-6daf-08d96d712e88
X-MS-TrafficTypeDiagnostic: CH2PR10MB3863:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <CH2PR10MB3863E8411AABAB547A1F0503DBCD9@CH2PR10MB3863.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:2000;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?kxTOOXJC+jHAoQdjNCznukv30BZUayfwMIJ9EUu4z1p9/uyhAl5fScZfi8AC?=
 =?us-ascii?Q?pPHe08j0Y7F/9bb35C4GApk5ekdeIDGdFNg6aAsSfvnOzfJKCa2B7R/N2cWT?=
 =?us-ascii?Q?AjYmju/qSlqgW2+SyV3zPDxKYlp/IIRFMkbv1sq2WcpLdWWwTvn1Q0jetgjn?=
 =?us-ascii?Q?aUuDa9SwhWmX/BzE1j+mFQpKs5eHfIVB2tN6MW5v9QXQ1Rhut+9qsvNIZYXi?=
 =?us-ascii?Q?77Uly8nSslpp/0SgQU8YgE3544kcTOn8q3O9xpeXvgm/eRtE/U6C7aWCicgG?=
 =?us-ascii?Q?kv5JcDtwXnS0SaC3qslGqEBriPTBeD0/hpSoMi3F35DPJ1j8nsWpjIJ1XdsY?=
 =?us-ascii?Q?JyCvIwiKyanOuQQQkufUd1LfdlqEhQ+4YccsvaXGsuzxTeKNIvCykHot0qXV?=
 =?us-ascii?Q?su6l5SacYMM5RD8/gKFBSG60DzvkPbrB9r4plG20T+4gs/4epe0Lt937NS5s?=
 =?us-ascii?Q?pKCiI1GDe3rx7qgrqhmPIF7A4ddunsJ268no75Lv7kcP7LTshx2KpdiHivXQ?=
 =?us-ascii?Q?8DYszjYjiRdJRC43m8qsrHt5GPjk3VFYDqreTl4TpSwFbptuHtto2zTvr4M1?=
 =?us-ascii?Q?iYJOffGrfOpHstgRnX7ZZg4vxKgqnhJ2Tg3pJ3B4VhtgvjgqkUrfeGBSaRHy?=
 =?us-ascii?Q?yvKIcKhfNH/W9MhGiisCHrrWKqCwfX0b7GfdlWfFBK1q1NhpW+lhUwx7Caba?=
 =?us-ascii?Q?EyWXtOwJm5tcZ+nNOuUB4D3RF8K8YK2hxeA/zmaXo6686j8pNW0xSg6LspBm?=
 =?us-ascii?Q?vCgz760TzMyFzvaH6XR/+dSPVU2QoV4b9vE2fDpl242oonDj+j4HdsqQ8UuI?=
 =?us-ascii?Q?V00J9g7mvgZG4urF39/et1GMPTeA2nze3zxeBPVCi1PaQTd+lZc8LPUrwkQB?=
 =?us-ascii?Q?LUbRZhk+cX89fKmadl95e5a0wmBbbyG63wWG0m4JM66yhAp+baPTrLXrQzva?=
 =?us-ascii?Q?+E/SgEo5bxuS2EiTP7wLlaVwgRmmZWmPqbj26P3IOgXr7ehsbyMeQ3zIxuu1?=
 =?us-ascii?Q?YpPGj1aZsW2TK756V0LzVq5gRG0DhY6wIkp6rI/09e1GSBLicp8u0qELzT4Y?=
 =?us-ascii?Q?TUTp2WwUL3hyC2jyIaLcXnTtPcxDoRu+hwemnjsNjBRR5u9leZ8=3D?=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:5;SRV:;IPV:NLI;SFV:SPM;H:CH2PR10MB4166.namprd10.prod.outlook.com;PTR:;CAT:OSPM;SFS:(39860400002)(136003)(376002)(346002)(366004)(396003)(5660300002)(316002)(4326008)(38350700002)(38100700002)(6486002)(66946007)(66476007)(66556008)(83380400001)(86362001)(8936002)(478600001)(36756003)(103116003)(8676002)(6666004)(6496006)(2906002)(52116002)(2616005)(956004)(966005)(26005)(1076003)(186003)(6916009)(23200700001);DIR:OUT;SFP:1501;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KZ+6rWxY2/i8wyoeiN4sYd4LpmXocBRkvbi7h+OF8uV+ZlZ5OB/CqhTJBU9o?=
 =?us-ascii?Q?mal49FAgOuy8wggbMqXC/RXMeJ02o1wVHM4ddVaa/1Yfr7aOGHHc+JVPJppM?=
 =?us-ascii?Q?L7o1yWWqGEWIM22LefP0DEqxzKn7Tjbf+bU9APHdHJH2m/1qzLyZbMM8g81i?=
 =?us-ascii?Q?vD2PY6w4cueqhid8wcmSGyszJlCx+wSv4+9hWf30lUgCBFxXmJ/L1ta2NrjY?=
 =?us-ascii?Q?kApAYpLZ4MQvYyodXLdmejP8NejX8P8iKV/wsQhgr00aQLKyMgUIb0YCFKlI?=
 =?us-ascii?Q?HRU9Nd4ndtobBTjp9ivO6YALrsCK3FRbhYO43z27+YeeHVDMlCmgBGUlb5u7?=
 =?us-ascii?Q?ZH8y6tXx1duuEhbyVWeOJL5WGVIvBev1R/uqMSuVDZheUYRTUwBEqchYZ5JP?=
 =?us-ascii?Q?hT1ZHdRmsPjzBpIhAVnTFgSYVap/FTklmUcf+mzH35+FPVRdtL5f02I5gODZ?=
 =?us-ascii?Q?kLESI3zzdqW53XO0PTo/CiOJEzdLIeWZt0fso+/P+SbOT4/fHKNK1CHBcaUq?=
 =?us-ascii?Q?rT5vCnRB2h399dHgoH8V4b6rKCtJAhJtr9ChFd8Incr5GNJTywWci/w6GVgX?=
 =?us-ascii?Q?tH7rEX2sXGzxS0xtg8HdnwPOwWnX78pjAtdM4rHH+0Pcy2wXb3XpnIdj2ohy?=
 =?us-ascii?Q?EzQJDjYiIPY6ZdwMc6rtZiG0FYqhGSzOba4dTGzPkgPk0Jdy4kOsYzVLFqzy?=
 =?us-ascii?Q?5ikKNBBHVG0eO58YvdP2fv861l1yRPq1Hx3PcDHp3CnHDDk5NqZuSmdU8P8a?=
 =?us-ascii?Q?uRCBP886RIrt3EXVEeIDnCU6qPlWOr4jnrP3sDcXAdeZhZEamPvHGXr38MGc?=
 =?us-ascii?Q?O6Ucqk+KStHNDEot2J9mFrWTyYIdV6S14vcTBrUOT7qQmRVdDwOtDbmIzy7t?=
 =?us-ascii?Q?GFgQI627tBJnJJnQNCm8EY9t4ZQFi2SogQBg4EsqwdNeLOtRMojFO2F4HeKo?=
 =?us-ascii?Q?dMerwPIAYnIZvG71rumCboJYyZKpQnXwXvlJNXSBJpef0/skMQG7m1XGtRS0?=
 =?us-ascii?Q?wif4PGBu3aDgjkEu/2VrZKuOEHeXeZ42fHWAzdVnvFNU+twVnEJtHcjQ3XRc?=
 =?us-ascii?Q?gI37F42hgcbZjDEMRQllwWsN6h/3nW7llO+f6WVeShCvZrhtT8YNkgbxvZ81?=
 =?us-ascii?Q?xCbFSSDtGY/V2yM1Z07Sg24SzCAsciQiB/62y3zZ0y0cVWTWjyJ1DwWKf50g?=
 =?us-ascii?Q?FHIBaFWtFE3sNhLr1Gke7WxiQod4s7a5Mht5ped4KvKBEwU3aZXGtk4wOuuI?=
 =?us-ascii?Q?Uuly00gBXTNoKdtBP3/AFKzX07j5i1ZXsv42Iv3zJWB7VOM0BR5bxX3ePqlr?=
 =?us-ascii?Q?flEqZg/RhbYgYvHZJ2/UZdu8?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 964e92a3-708a-40ea-6daf-08d96d712e88
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2021 17:51:53.0633
 (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: bhz6gIShadBeuEB6gssvwJcf5NboSpyeB2Sk2GcXq6goPI2lWDVOmEOOyAWV0DVL1rgWRfixuqA8m0H+6g1QPsYSkNvHLcZNWVJ6PLcKnFs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB3863
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10094 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 mlxscore=0
 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2108310000
 definitions=main-2109010102
X-Proofpoint-GUID: CRkRZ3JYqlNKmo34u3UsE6Yrebli5Lrd
X-Proofpoint-ORIG-GUID: CRkRZ3JYqlNKmo34u3UsE6Yrebli5Lrd
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..ec76f533ee3e 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, getname(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