Skip to content

fuse: Remove unlock_request/lock_request #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bsbernd merged 1 commit into from
Mar 10, 2026
Merged

fuse: Remove unlock_request/lock_request #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 5 additions & 40 deletions fs/fuse/dev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,38 +669,14 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm,
return 0;
}

/*
* Lock the request. Up to the next unlock_request() there mustn't be
* anything that could cause a page-fault. If the request was already
* aborted bail out.
*/
static int lock_request(struct fuse_req *req)
{
int err = 0;
if (req) {
spin_lock(&req->waitq.lock);
if (test_bit(FR_ABORTED, &req->flags))
err = -ENOENT;
else
set_bit(FR_LOCKED, &req->flags);
spin_unlock(&req->waitq.lock);
}
return err;
}

/*
* Unlock request. If it was aborted while locked, caller is responsible
* for unlocking and ending the request.
*/
static int unlock_request(struct fuse_req *req)
static int check_req_aborted(struct fuse_req *req)
{
int err = 0;
if (req) {
if (req && test_bit(FR_ABORTED, &req->flags)) {
spin_lock(&req->waitq.lock);
if (test_bit(FR_ABORTED, &req->flags))
err = -ENOENT;
else
clear_bit(FR_LOCKED, &req->flags);
spin_unlock(&req->waitq.lock);
}
return err;
Expand Down Expand Up @@ -742,7 +718,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
struct page *page;
int err;

err = unlock_request(cs->req);
err = check_req_aborted(cs->req);
if (err)
return err;

Expand Down Expand Up @@ -801,7 +777,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
cs->pg = page;
}

return lock_request(cs->req);
return 0;
}

/* Do as much copy to/from userspace buffer as we can */
Expand Down Expand Up @@ -856,9 +832,6 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
struct pipe_buffer *buf = cs->pipebufs;

folio_get(oldfolio);
err = unlock_request(cs->req);
if (err)
goto out_put_old;

fuse_copy_finish(cs);

Expand Down Expand Up @@ -944,9 +917,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
cs->pg = buf->page;
cs->offset = buf->offset;

err = lock_request(cs->req);
if (!err)
err = 1;
err = 1;

goto out_put_old;
}
Expand All @@ -955,17 +926,11 @@ static int fuse_ref_page(struct fuse_copy_state *cs, struct page *page,
unsigned offset, unsigned count)
{
struct pipe_buffer *buf;
int err;

if (cs->nr_segs >= cs->pipe->max_usage)
return -EIO;

get_page(page);
err = unlock_request(cs->req);
if (err) {
put_page(page);
return err;
}

fuse_copy_finish(cs);

Expand Down