fs/netfs: remove unused flag NETFS_RREQ_DONT_UNLOCK_FOLIOS
PATCH v2 1/2 fs/netfs: remove unused flag NETFS_RREQ_DONT_UNLOCK_FOLIOS
NETFS_RREQ_DONT_UNLOCK_FOLIOS has never been used ever since it was added by commit 3d3c95046742 ("netfs: Provide readahead and readpage netfs helpers").
Signed-off-by Max Kellermann <[email protected]>
---
v1 -> v2: split into two patches, see
https://lore.kernel.org/netfs/[email protected]/
--- fs/netfs/read_collect.c | 14 ++++++-------- include/linux/netfs.h | 1 - 2 files changed, 6 insertions(+), 9 deletions(-)
fs/netfs/read_collect.c +6 -8
@@ -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);
include/linux/netfs.h +0 -1
@@ -268,7 +268,6 @@ struct netfs_io_request {unsigned long flags;#define NETFS_RREQ_OFFLOAD_COLLECTION 0/* Offload collection to workqueue */ #define NETFS_RREQ_NO_UNLOCK_FOLIO 2/* Don't unlock no_unlock_folio on completion */ -#define NETFS_RREQ_DONT_UNLOCK_FOLIOS 3/* Don't unlock the folios on completion */ #define NETFS_RREQ_FAILED 4/* The request failed */ #define NETFS_RREQ_IN_PROGRESS 5/* Unlocked when the request completes */ #define NETFS_RREQ_FOLIO_COPY_TO_CACHE 6/* Copy current folio to cache from read */
Signature · 1 line
2.47.2
PATCH v2 2/2 fs/netfs: remove unused flag NETFS_RREQ_BLOCKED
NETFS_RREQ_BLOCKED was added by commit 016dc8516aec ("netfs: Implement unbuffered/DIO read support") but has never been used either. Without NETFS_RREQ_BLOCKED, NETFS_RREQ_NONBLOCK makes no sense, and thus can be removed as well.
Signed-off-by Max Kellermann <[email protected]>
---
v1 -> v2: split into two patches, see
https://lore.kernel.org/netfs/[email protected]/
--- fs/netfs/direct_read.c | 3 --- fs/netfs/objects.c | 2 -- include/linux/netfs.h | 2 -- 3 files changed, 7 deletions(-)
fs/netfs/direct_read.c +0 -3
@@ -106,9 +106,6 @@ static int netfs_dispatch_unbuffered_reads(struct netfs_io_request *rreq)netfs_wait_for_pause (rreq);if (test_bit (NETFS_RREQ_FAILED , &rreq->flags))break ; -if (test_bit (NETFS_RREQ_BLOCKED , &rreq->flags) && -test_bit (NETFS_RREQ_NONBLOCK , &rreq->flags)) -break ;cond_resched (); }while (size >0 );
fs/netfs/objects.c +0 -2
@@ -64,8 +64,6 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, }__set_bit (NETFS_RREQ_IN_PROGRESS , &rreq->flags); -if (file && file->f_flags &O_NONBLOCK ) -__set_bit (NETFS_RREQ_NONBLOCK , &rreq->flags);if (rreq->netfs_ops->init_request) { ret = rreq->netfs_ops->init_request (rreq, file);if (ret <0 ) {
include/linux/netfs.h +0 -2
@@ -272,8 +272,6 @@ struct netfs_io_request {#define NETFS_RREQ_IN_PROGRESS 5/* Unlocked when the request completes */ #define NETFS_RREQ_FOLIO_COPY_TO_CACHE 6/* Copy current folio to cache from read */ #define NETFS_RREQ_UPLOAD_TO_SERVER 8/* Need to write to the server */ -#define NETFS_RREQ_NONBLOCK 9/* Don't block if possible (O_NONBLOCK) */ -#define NETFS_RREQ_BLOCKED 10/* We blocked */ #define NETFS_RREQ_PAUSE 11/* Pause subrequest generation */ #define NETFS_RREQ_USE_IO_ITER 12/* Use ->io_iter rather than ->i_pages */ #define NETFS_RREQ_ALL_QUEUED 13/* All subreqs are now queued */
Signature · 1 line
2.47.2