From: Kemeng Shi <shikemeng@huaweicloud.com>
To: miklos@szeredi.hu, bernd.schubert@fastmail.fm,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/2] fuse: remove usage of FR_WATING flag
Date: Wed, 13 Sep 2023 17:22:46 +0800 [thread overview]
Message-ID: <20230913092246.22747-3-shikemeng@huaweicloud.com> (raw)
In-Reply-To: <20230913092246.22747-1-shikemeng@huaweicloud.com>
Each allocated request from fuse_request_alloc counts to num_waiting
before request is freed.
Simply drop num_waiting without FR_WAITING flag check in fuse_put_request
to remove unneeded usage of FR_WAITING flag.
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
fs/fuse/dev.c | 9 +--------
fs/fuse/fuse_i.h | 2 --
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 59e1357d4880..4f49b1946635 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -139,7 +139,6 @@ static struct fuse_req *fuse_get_req(struct fuse_mount *fm, bool for_background)
req->in.h.gid = from_kgid(fc->user_ns, current_fsgid());
req->in.h.pid = pid_nr_ns(task_pid(current), fc->pid_ns);
- __set_bit(FR_WAITING, &req->flags);
if (for_background)
__set_bit(FR_BACKGROUND, &req->flags);
@@ -171,11 +170,7 @@ static void fuse_put_request(struct fuse_req *req)
spin_unlock(&fc->bg_lock);
}
- if (test_bit(FR_WAITING, &req->flags)) {
- __clear_bit(FR_WAITING, &req->flags);
- fuse_drop_waiting(fc);
- }
-
+ fuse_drop_waiting(fc);
fuse_request_free(req);
}
}
@@ -495,7 +490,6 @@ ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args)
if (!args->nocreds)
fuse_force_creds(req);
- __set_bit(FR_WAITING, &req->flags);
__set_bit(FR_FORCE, &req->flags);
} else {
WARN_ON(args->nocreds);
@@ -556,7 +550,6 @@ int fuse_simple_background(struct fuse_mount *fm, struct fuse_args *args,
if (!req)
return -ENOMEM;
atomic_inc(&fc->num_waiting);
- __set_bit(FR_WAITING, &req->flags);
__set_bit(FR_BACKGROUND, &req->flags);
} else {
WARN_ON(args->nocreds);
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index bf0b85d0b95c..a78764cef313 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -312,7 +312,6 @@ struct fuse_io_priv {
* FR_ISREPLY: set if the request has reply
* FR_FORCE: force sending of the request even if interrupted
* FR_BACKGROUND: request is sent in the background
- * FR_WAITING: request is counted as "waiting"
* FR_ABORTED: the request was aborted
* FR_INTERRUPTED: the request has been interrupted
* FR_LOCKED: data is being copied to/from the request
@@ -326,7 +325,6 @@ enum fuse_req_flag {
FR_ISREPLY,
FR_FORCE,
FR_BACKGROUND,
- FR_WAITING,
FR_ABORTED,
FR_INTERRUPTED,
FR_LOCKED,
--
2.30.0
next prev parent reply other threads:[~2023-09-13 1:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-13 9:22 [PATCH v2 0/2] Remove usage of FR_WAITING Kemeng Shi
2023-09-13 9:22 ` [PATCH v2 1/2] fuse: move FR_WAITING set from fuse_request_queue_background to fuse_simple_background Kemeng Shi
2023-09-16 11:15 ` Bernd Schubert
2023-09-13 9:22 ` Kemeng Shi [this message]
2023-09-16 11:30 ` [PATCH v2 2/2] fuse: remove usage of FR_WATING flag Bernd Schubert
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=20230913092246.22747-3-shikemeng@huaweicloud.com \
--to=shikemeng@huaweicloud.com \
--cc=bernd.schubert@fastmail.fm \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).