From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C0413D8900 for ; Mon, 6 Jul 2026 07:29:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783323000; cv=none; b=pC3QmhRteI0y82STDqvhApILqPnfuO+fvda/grymN589pR8355ldn/RypO2ZgVgK05Q/VCvEFoWvWkZzNSsb+XmS8mAx2iTtSUIlQKmeT5jO5LxUY50u2C8OTuWG+PJtK87Q5G8qN6G8JQQ8dhicd6z2wEP6VBlai0hi238jJ9w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783323000; c=relaxed/simple; bh=YIfKh4z0etB3dhrOOFVp+iIv9yRAHwumgSMzjtU3VE0=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ngg7hSMnKe6N5uLsA0+R9K6qROKQO+ymEgO5sUMbBoqKUfseuROrvCkqCce1GAaDiG5qdD6VGwMrpK+kL06h/HvM8zegqn50XCajLtJMUxlgk14UiQ4FW8fFyOmcLYDdMFDRDOBwnkM5ZiYe2nIAktm7IKDVxulJQTRWMKAGlUM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ou4qUnAP; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ou4qUnAP" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-493c00f74baso15952505e9.0 for ; Mon, 06 Jul 2026 00:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783322990; x=1783927790; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=2gk/h+4f6MUXqGijdtmTGfvBn38IT9YErIxRtJmutDk=; b=Ou4qUnAPwm4JX9FxnRv4o3ZpZjjkbTSyELHf1GMu4bMw8xBuP8GiQlLVojKdA1bEoA xd/FTmomejKknONTtTz19VZF8Vf5D+eWfCY/ywxljCBuLaa8BI+UnftJcnkVx35uoJFF 9vghy7L5cHvyyre5MBrnHmitabtIgROWwXr2PwOym1mG8tzP0fIozNtyVdVNTg4GFyUR eh2ahJLbmeIsAbabrbbFJiNeCy5yMjRxA0lWTDzU6B6g+gPxOIEMVieA1ZaV+f/v0jx8 5mlpDF+hVK8BQvZc8Eyzarg0gtLqE4g7EaHmD/NoXRwPG6zBOHo8mY01eGIE6L/5DiDY omJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783322990; x=1783927790; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2gk/h+4f6MUXqGijdtmTGfvBn38IT9YErIxRtJmutDk=; b=MaibAjb0MJFHbb9qm90cJbyaOzLsum65KBE+R+KgFr3JNvNmnBr/cfxFihhToxPdVs lshSWshgfjyR/bRA9hHuNIL+8cFdi0YAqq0DeKOLq0iNYi8R8M0UqIu7lGbkrFWTEXDq Cq0IK//X1UE04yFZk/xLrE/PfeICIkZvd4ZpFwnnsxkxrUXngOEMRkpiLk/YW+QUY9Jn iEdxMYi3ei4G5+g4H9BkKolDWCOnm4wXbTIRSXNgO4GRTqmFhv4qjjVHBis0dPRz0Nzw fX2sBPdAKaL6oTz8tSEM5NidpmtUfbcvVHz6uH8HDLRBoACoYc5iLcznfsOyWF8wRtyY DyVQ== X-Forwarded-Encrypted: i=1; AHgh+RrgJD98mrEbxUjt2y+TuhUWX/YVkXmkiPp1OGBS3XRa4c1tCRRfe772DeT1R2NUdOlm/NStA3JbLMD+HGk=@vger.kernel.org X-Gm-Message-State: AOJu0YxZcG1CXEtHH5zMH4enZ19TKIeshoR+e9oENq9+6Fixn5nmHS1O 5BjuwagNbOF6MIMU1Jc2WXvHmAGZyYG43Uq7UaBEYNyjeyuiDab9rNuC X-Gm-Gg: AfdE7clbqTBtdtptwNlxSK7CcAG8Vgdlv4T6xxoVpxtkZvcuJBGQ5wb7D5C71p/MmMN 8iEVl4dm2Qkss9inwIuQBhzJBThPHMgC/stH+zvyPthv5V9UrCL0DoZGVRCgfwUNnnzl24YrKyv mts5iRxa24W/JUGBXaneu3EuQaAMHdr8v17jo1FNuRYjPqK+7MzpA6Hh4T69sWtzvbDnnsGlyAU 7TTYPU/nws3OeJUTlFEG3e5BaKImmoGGnsTx3e6drQ1dvIq/Ng4SKgjELz9p5V3FX6cPSywhRUh CP4QRD/un74vv/ctKD3++fBZAkqkbOgIWgVy+3Cfz05lWOYEocqC9ePcvh6ZrA384xr1Gw+DR+n +AUT8FQ3rM9XMLk72Y3XPiA6qnajcY7CiQv/FbWwLBsJ/GosYcWjpcCJ5UFDP4gKw3PiCMB4DKq PQixEOu/JsrECyWqM6Sghud6EYbEpcZjdrHouCJxis95rO7w== X-Received: by 2002:a05:600c:5296:b0:493:d741:5d72 with SMTP id 5b1f17b1804b1-493d7415e1bmr58494515e9.38.1783322989313; Mon, 06 Jul 2026 00:29:49 -0700 (PDT) Received: from pumpkin (host-92-21-50-228.as13285.net. [92.21.50.228]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493c6381e4fsm404764895e9.8.2026.07.06.00.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 00:29:48 -0700 (PDT) Date: Mon, 6 Jul 2026 08:29:47 +0100 From: David Laight To: NeilBrown Cc: NeilBrown , "Jori Koolstra" , "Jeff Layton" , "Christian Brauner" , "Al Viro" , "Aleksa Sarai" , "Amir Goldstein" , "Jan Kara" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 01/14] fs/namei.c: use trailing_slashes() Message-ID: <20260706082947.248bcd17@pumpkin> In-Reply-To: <178331016004.27465.14624469599238469373@noble.neil.brown.name> References: <20260704164149.3480051-1-jkoolstra@xs4all.nl> <20260704164149.3480051-2-jkoolstra@xs4all.nl> <178331016004.27465.14624469599238469373@noble.neil.brown.name> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 06 Jul 2026 13:56:00 +1000 NeilBrown wrote: > On Sun, 05 Jul 2026, Jori Koolstra wrote: > > There are several places in fs/namei.c that can use the > > trailing_slashes() function to improve intent. > > I think it would help to state here that trailing_slashes() is changed > to take a qstr instead of a nameidata as that is useful in more places. It is also taking the struct 'by value' so should really be always_inline before something makes a compiler decide it should be a real function. (Or make it take a pointer) David > > Reviewed-by: NeilBrown > > Thanks, > NeilBrown > > > > > > Signed-off-by: Jori Koolstra > > --- > > fs/namei.c | 26 +++++++++++++------------- > > 1 file changed, 13 insertions(+), 13 deletions(-) > > > > diff --git a/fs/namei.c b/fs/namei.c > > index 19ce43c9a6e6..a8890bc0ae21 100644 > > --- a/fs/namei.c > > +++ b/fs/namei.c > > @@ -2781,9 +2781,14 @@ static const char *path_init(struct nameidata *nd, unsigned flags) > > return s; > > } > > > > +static inline bool trailing_slashes(const struct qstr last) > > +{ > > + return (bool)last.name[last.len]; > > +} > > + > > static inline const char *lookup_last(struct nameidata *nd) > > { > > - if (nd->last_type == LAST_NORM && nd->last.name[nd->last.len]) > > + if (nd->last_type == LAST_NORM && trailing_slashes(nd->last)) > > nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY; > > > > return walk_component(nd, WALK_TRAILING); > > @@ -4521,17 +4526,12 @@ static struct dentry *lookup_open(struct nameidata *nd, struct file *file, > > return ERR_PTR(error); > > } > > > > -static inline bool trailing_slashes(struct nameidata *nd) > > -{ > > - return (bool)nd->last.name[nd->last.len]; > > -} > > - > > static struct dentry *lookup_fast_for_open(struct nameidata *nd, int open_flag) > > { > > struct dentry *dentry; > > > > if (open_flag & O_CREAT) { > > - if (trailing_slashes(nd)) > > + if (trailing_slashes(nd->last)) > > return ERR_PTR(-EISDIR); > > > > /* Don't bother on an O_EXCL create */ > > @@ -4539,7 +4539,7 @@ static struct dentry *lookup_fast_for_open(struct nameidata *nd, int open_flag) > > return NULL; > > } > > > > - if (trailing_slashes(nd)) > > + if (trailing_slashes(nd->last)) > > nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY; > > > > dentry = lookup_fast(nd); > > @@ -4950,7 +4950,7 @@ static struct dentry *filename_create(int dfd, struct filename *name, > > * Do the final lookup. Suppress 'create' if there is a trailing > > * '/', and a directory wasn't requested. > > */ > > - if (last.name[last.len] && !want_dir) > > + if (trailing_slashes(last) && !want_dir) > > create_flags &= ~LOOKUP_CREATE; > > dentry = start_dirop(path->dentry, &last, reval_flag | create_flags); > > if (IS_ERR(dentry)) > > @@ -5569,7 +5569,7 @@ int filename_unlinkat(int dfd, struct filename *name) > > goto exit_drop_write; > > > > /* Why not before? Because we want correct error value */ > > - if (unlikely(last.name[last.len])) { > > + if (unlikely(trailing_slashes(last))) { > > if (d_is_dir(dentry)) > > error = -EISDIR; > > else > > @@ -6171,16 +6171,16 @@ int filename_renameat2(int olddfd, struct filename *from, > > if (flags & RENAME_EXCHANGE) { > > if (!d_is_dir(rd.new_dentry)) { > > error = -ENOTDIR; > > - if (new_last.name[new_last.len]) > > + if (trailing_slashes(new_last)) > > goto exit_unlock; > > } > > } > > /* unless the source is a directory trailing slashes give -ENOTDIR */ > > if (!d_is_dir(rd.old_dentry)) { > > error = -ENOTDIR; > > - if (old_last.name[old_last.len]) > > + if (trailing_slashes(old_last)) > > goto exit_unlock; > > - if (!(flags & RENAME_EXCHANGE) && new_last.name[new_last.len]) > > + if (!(flags & RENAME_EXCHANGE) && trailing_slashes(new_last)) > > goto exit_unlock; > > } > > > > -- > > 2.55.0 > > > > > >