folio_queue: remove unused field `marks3`

The last user was removed by commit e2d46f2ec332 ("netfs: Change the
read result collector to only use one work item").

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/20250519134813.2975312-10-dhowells@redhat.com
cc: Paulo Alcantara <pc@manguebit.com>
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/Documentation/core-api/folio_queue.rst b/Documentation/core-api/folio_queue.rst
index 1fe7a9bc4b8dbe648ed339835e07157ceb909f3c..83cfbc157e490417a70784e2b60d005c80567432 100644 (file)
--- a/Documentation/core-api/folio_queue.rst
+++ b/Documentation/core-api/folio_queue.rst
@@ -151,19 +151,16 @@ The marks can be set by::
 
        void folioq_mark(struct folio_queue *folioq, unsigned int slot);
        void folioq_mark2(struct folio_queue *folioq, unsigned int slot);
-       void folioq_mark3(struct folio_queue *folioq, unsigned int slot);
 
 Cleared by::
 
        void folioq_unmark(struct folio_queue *folioq, unsigned int slot);
        void folioq_unmark2(struct folio_queue *folioq, unsigned int slot);
-       void folioq_unmark3(struct folio_queue *folioq, unsigned int slot);
 
 And the marks can be queried by::
 
        bool folioq_is_marked(const struct folio_queue *folioq, unsigned int slot);
        bool folioq_is_marked2(const struct folio_queue *folioq, unsigned int slot);
-       bool folioq_is_marked3(const struct folio_queue *folioq, unsigned int slot);
 
 The marks can be used for any purpose and are not interpreted by this API.
 

diff --git a/include/linux/folio_queue.h b/include/linux/folio_queue.h
index 45ad2408a80ca9a7004d9aa6ce87d5410b845018..adab609c972e1912f91320b36afc7055787273d2 100644 (file)
--- a/include/linux/folio_queue.h
+++ b/include/linux/folio_queue.h
@@ -34,7 +34,6 @@ struct folio_queue {
        struct folio_queue      *prev;          /* Previous queue segment of NULL */
        unsigned long           marks;          /* 1-bit mark per folio */
        unsigned long           marks2;         /* Second 1-bit mark per folio */
-       unsigned long           marks3;         /* Third 1-bit mark per folio */
 #if PAGEVEC_SIZE > BITS_PER_LONG
 #error marks is not big enough
 #endif
@@ -58,7 +57,6 @@ static inline void folioq_init(struct folio_queue *folioq, unsigned int rreq_id)
        folioq->prev = NULL;
        folioq->marks = 0;
        folioq->marks2 = 0;
-       folioq->marks3 = 0;
        folioq->rreq_id = rreq_id;
        folioq->debug_id = 0;
 }
@@ -178,45 +176,6 @@ static inline void folioq_unmark2(struct folio_queue *folioq, unsigned int slot)
        clear_bit(slot, &folioq->marks2);
 }
 
-/**
- * folioq_is_marked3: Check third folio mark in a folio queue segment
- * @folioq: The segment to query
- * @slot: The slot number of the folio to query
- *
- * Determine if the third mark is set for the folio in the specified slot in a
- * folio queue segment.
- */
-static inline bool folioq_is_marked3(const struct folio_queue *folioq, unsigned int slot)
-{
-       return test_bit(slot, &folioq->marks3);
-}
-
-/**
- * folioq_mark3: Set the third mark on a folio in a folio queue segment
- * @folioq: The segment to modify
- * @slot: The slot number of the folio to modify
- *
- * Set the third mark for the folio in the specified slot in a folio queue
- * segment.
- */
-static inline void folioq_mark3(struct folio_queue *folioq, unsigned int slot)
-{
-       set_bit(slot, &folioq->marks3);
-}
-
-/**
- * folioq_unmark3: Clear the third mark on a folio in a folio queue segment
- * @folioq: The segment to modify
- * @slot: The slot number of the folio to modify
- *
- * Clear the third mark for the folio in the specified slot in a folio queue
- * segment.
- */
-static inline void folioq_unmark3(struct folio_queue *folioq, unsigned int slot)
-{
-       clear_bit(slot, &folioq->marks3);
-}
-
 /**
  * folioq_append: Add a folio to a folio queue segment
  * @folioq: The segment to add to
@@ -318,7 +277,6 @@ static inline void folioq_clear(struct folio_queue *folioq, unsigned int slot)
        folioq->vec.folios[slot] = NULL;
        folioq_unmark(folioq, slot);
        folioq_unmark2(folioq, slot);
-       folioq_unmark3(folioq, slot);
 }
 
 #endif /* _LINUX_FOLIO_QUEUE_H */