FILESYSTEM IN USERSPACE (FUSE) development
 help / color / mirror / Atom feed
From: Joanne Koong <joannelkoong@gmail.com>
To: miklos@szeredi.hu, fuse-devel@lists.linux.dev
Subject: [PATCH v1 02/13] fuse: clean up fuse_lookup_name()
Date: Thu, 23 Apr 2026 18:16:35 -0700	[thread overview]
Message-ID: <20260424011646.457682-3-joannelkoong@gmail.com> (raw)
In-Reply-To: <20260424011646.457682-1-joannelkoong@gmail.com>

Remove goto with direct returns. Assign fm->fc to a local variable and
use that. No functional changes.

Signed-off-by: Joanne Koong <joannelkoong@gmail.com>
---
 fs/fuse/dir.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 6ab05d7d297d..31dc87cfa1af 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -558,22 +558,20 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name
 	struct fuse_mount *fm = get_fuse_mount_super(sb);
 	FUSE_ARGS(args);
 	struct fuse_forget_link *forget;
+	struct fuse_conn *fc = fm->fc;
 	u64 attr_version, evict_ctr;
 	int err;
 
 	*inode = NULL;
-	err = -ENAMETOOLONG;
-	if (name->len > fm->fc->name_max)
-		goto out;
-
+	if (name->len > fc->name_max)
+		return -ENAMETOOLONG;
 
 	forget = fuse_alloc_forget();
-	err = -ENOMEM;
 	if (!forget)
-		goto out;
+		return -ENOMEM;
 
-	attr_version = fuse_get_attr_version(fm->fc);
-	evict_ctr = fuse_get_evict_ctr(fm->fc);
+	attr_version = fuse_get_attr_version(fc);
+	evict_ctr = fuse_get_evict_ctr(fc);
 
 	fuse_lookup_init(&args, nodeid, name, outarg);
 	err = fuse_simple_request(fm, &args);
@@ -597,13 +595,12 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name
 		goto out_queue_forget;
 	err = 0;
 
- out_put_forget:
+out_put_forget:
 	kfree(forget);
- out:
 	return err;
 
 out_queue_forget:
-	fuse_chan_queue_forget(fm->fc->chan, forget, outarg->nodeid, 1);
+	fuse_chan_queue_forget(fc->chan, forget, outarg->nodeid, 1);
 	return err;
 }
 
-- 
2.52.0


  parent reply	other threads:[~2026-04-24  1:17 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-24  1:16 [PATCH v1 00/13] fuse: dir.c cleanups Joanne Koong
2026-04-24  1:16 ` [PATCH v1 01/13] fuse: fix missing forget requests in error paths Joanne Koong
2026-04-24  8:18   ` Amir Goldstein
2026-04-24 17:43     ` Joanne Koong
2026-04-24  1:16 ` Joanne Koong [this message]
2026-04-24  1:16 ` [PATCH v1 03/13] fuse: clean up fuse_lookup() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 04/13] fuse: clean up fuse_dentry_revalidate() Joanne Koong
2026-04-24  8:20   ` Amir Goldstein
2026-04-24  1:16 ` [PATCH v1 05/13] fuse: clean up fuse_create_open() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 06/13] fuse: clean up fuse_rename2() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 07/13] fuse: clean up fuse_time_to_jiffies() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 08/13] fuse: clean up fuse_link() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 09/13] fuse: clean up fuse_do_getattr() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 10/13] fuse: clean up fuse_update_get_attr() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 11/13] fuse: clean up fuse_get_link() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 12/13] fuse: clean up fuse_dir_open() Joanne Koong
2026-04-24  1:16 ` [PATCH v1 13/13] fuse: clean up setattr() Joanne Koong
2026-04-24  7:51 ` [PATCH v1 00/13] fuse: dir.c cleanups Amir Goldstein
2026-04-24 17:27   ` Joanne Koong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260424011646.457682-3-joannelkoong@gmail.com \
    --to=joannelkoong@gmail.com \
    --cc=fuse-devel@lists.linux.dev \
    --cc=miklos@szeredi.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox