diff options
| author | Christian Brauner <brauner@kernel.org> | 2025-05-21 14:34:43 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-05-21 14:34:43 +0200 |
| commit | e02cdc0e7fb0b5fe9287b2434c5c09fd9a58cb9e (patch) | |
| tree | cf79e22e356297d2917743822be419ef1960caed /fs/netfs/read_collect.c | |
| parent | a1b4a25abb3f8181433309a4b189f15fd26a8d84 (diff) | |
| parent | 4b1ca12dd3f2529dc788cf4f18259ed62006ccb8 (diff) | |
Merge patch series "netfs: Miscellaneous cleanups"
David Howells <dhowells@redhat.com> says:
Here are some miscellaneous very minor cleanups for netfslib for the next
merge window, primarily from Max Kellermann, if you could pull them.
(1) Remove NETFS_SREQ_SEEK_DATA_READ.
(2) Remove NETFS_INVALID_WRITE.
(3) Remove NETFS_ICTX_WRITETHROUGH.
(4) Remove NETFS_READ_HOLE_CLEAR.
(5) Reorder structs to eliminate holes.
(6) Remove netfs_io_request::ractl.
(7) Only provide proc_link field if CONFIG_PROC_FS=y.
(8) Remove folio_queue::marks3.
(9) Remove NETFS_RREQ_DONT_UNLOCK_FOLIOS.
(10) Remove NETFS_RREQ_BLOCKED.
* patches from https://lore.kernel.org/20250519134813.2975312-1-dhowells@redhat.com:
fs/netfs: remove unused flag NETFS_RREQ_BLOCKED
fs/netfs: remove unused flag NETFS_RREQ_DONT_UNLOCK_FOLIOS
folio_queue: remove unused field `marks3`
fs/netfs: declare field `proc_link` only if CONFIG_PROC_FS=y
fs/netfs: remove `netfs_io_request.ractl`
fs/netfs: reorder struct fields to eliminate holes
fs/netfs: remove unused enum choice NETFS_READ_HOLE_CLEAR
fs/netfs: remove unused flag NETFS_ICTX_WRITETHROUGH
fs/netfs: remove unused source NETFS_INVALID_WRITE
fs/netfs: remove unused flag NETFS_SREQ_SEEK_DATA_READ
Link: https://lore.kernel.org/20250519134813.2975312-1-dhowells@redhat.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/netfs/read_collect.c')
| -rw-r--r-- | fs/netfs/read_collect.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/netfs/read_collect.c b/fs/netfs/read_collect.c index 23c75755ad4e..173433d61ea6 100644 --- a/fs/netfs/read_collect.c +++ b/fs/netfs/read_collect.c @@ -83,14 +83,12 @@ static void netfs_unlock_read_folio(struct netfs_io_request *rreq, } just_unlock: - if (!test_bit(NETFS_RREQ_DONT_UNLOCK_FOLIOS, &rreq->flags)) { - if (folio->index == rreq->no_unlock_folio && - test_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags)) { - _debug("no unlock"); - } else { - trace_netfs_folio(folio, netfs_folio_trace_read_unlock); - folio_unlock(folio); - } + if (folio->index == rreq->no_unlock_folio && + test_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags)) { + _debug("no unlock"); + } else { + trace_netfs_folio(folio, netfs_folio_trace_read_unlock); + folio_unlock(folio); } folioq_clear(folioq, slot); |