Skip to content

Commit 67b9167

Browse files
MaxKellermannbrauner
authored andcommitted
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 3d3c950 ("netfs: Provide readahead and readpage netfs helpers"). Signed-off-by: Max Kellermann <[email protected]> Signed-off-by: David Howells <[email protected]> Link: https://lore.kernel.org/[email protected] cc: Paulo Alcantara <[email protected]> cc: [email protected] cc: [email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent 6bb09e5 commit 67b9167

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

fs/netfs/read_collect.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,12 @@ static void netfs_unlock_read_folio(struct netfs_io_request *rreq,
8383
}
8484

8585
just_unlock:
86-
if (!test_bit(NETFS_RREQ_DONT_UNLOCK_FOLIOS, &rreq->flags)) {
87-
if (folio->index == rreq->no_unlock_folio &&
88-
test_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags)) {
89-
_debug("no unlock");
90-
} else {
91-
trace_netfs_folio(folio, netfs_folio_trace_read_unlock);
92-
folio_unlock(folio);
93-
}
86+
if (folio->index == rreq->no_unlock_folio &&
87+
test_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags)) {
88+
_debug("no unlock");
89+
} else {
90+
trace_netfs_folio(folio, netfs_folio_trace_read_unlock);
91+
folio_unlock(folio);
9492
}
9593

9694
folioq_clear(folioq, slot);

include/linux/netfs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ struct netfs_io_request {
266266
unsigned long flags;
267267
#define NETFS_RREQ_OFFLOAD_COLLECTION 0 /* Offload collection to workqueue */
268268
#define NETFS_RREQ_NO_UNLOCK_FOLIO 2 /* Don't unlock no_unlock_folio on completion */
269-
#define NETFS_RREQ_DONT_UNLOCK_FOLIOS 3 /* Don't unlock the folios on completion */
270269
#define NETFS_RREQ_FAILED 4 /* The request failed */
271270
#define NETFS_RREQ_IN_PROGRESS 5 /* Unlocked when the request completes */
272271
#define NETFS_RREQ_FOLIO_COPY_TO_CACHE 6 /* Copy current folio to cache from read */

0 commit comments

Comments
 (0)