diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-22 09:18:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-22 09:18:51 -0700 |
| commit | 4f2d34b65b40937b43c38ba34ece5aa3bc210e0d (patch) | |
| tree | 259d1ac5841ef3fb969537d07e87d937c88b2134 /fs/fuse/dev.c | |
| parent | 681ce8623567ba7e7333908e9826b77145312dda (diff) | |
| parent | 529395d2ae6456c556405016ea0c43081fe607f3 (diff) | |
| download | linux-4f2d34b65b40937b43c38ba34ece5aa3bc210e0d.tar.gz linux-4f2d34b65b40937b43c38ba34ece5aa3bc210e0d.tar.bz2 linux-4f2d34b65b40937b43c38ba34ece5aa3bc210e0d.zip | |
Merge tag 'fuse-update-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse updates from Miklos Szeredi:
- Add fs-verity support (Richard Fung)
- Add multi-queue support to virtio-fs (Peter-Jan Gootzen)
- Fix a bug in NOTIFY_RESEND handling (Hou Tao)
- page -> folio cleanup (Matthew Wilcox)
* tag 'fuse-update-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
virtio-fs: add multi-queue support
virtio-fs: limit number of request queues
fuse: clear FR_SENT when re-adding requests into pending list
fuse: set FR_PENDING atomically in fuse_resend()
fuse: Add initial support for fs-verity
fuse: Convert fuse_readpages_end() to use folio_end_read()
Diffstat (limited to 'fs/fuse/dev.c')
| -rw-r--r-- | fs/fuse/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 3ec8bb5e68ff..9eb191b5c4de 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1813,7 +1813,8 @@ static void fuse_resend(struct fuse_conn *fc) spin_unlock(&fc->lock); list_for_each_entry_safe(req, next, &to_queue, list) { - __set_bit(FR_PENDING, &req->flags); + set_bit(FR_PENDING, &req->flags); + clear_bit(FR_SENT, &req->flags); /* mark the request as resend request */ req->in.h.unique |= FUSE_UNIQUE_RESEND; } |