Skip to content

Commit 6bb09e5

Browse files
MaxKellermannbrauner
authored andcommitted
folio_queue: remove unused field marks3
The last user was removed by commit e2d46f2 ("netfs: Change the read result collector to only use one work item"). 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 07c08ba commit 6bb09e5

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

Documentation/core-api/folio_queue.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,16 @@ The marks can be set by::
151151

152152
void folioq_mark(struct folio_queue *folioq, unsigned int slot);
153153
void folioq_mark2(struct folio_queue *folioq, unsigned int slot);
154-
void folioq_mark3(struct folio_queue *folioq, unsigned int slot);
155154

156155
Cleared by::
157156

158157
void folioq_unmark(struct folio_queue *folioq, unsigned int slot);
159158
void folioq_unmark2(struct folio_queue *folioq, unsigned int slot);
160-
void folioq_unmark3(struct folio_queue *folioq, unsigned int slot);
161159

162160
And the marks can be queried by::
163161

164162
bool folioq_is_marked(const struct folio_queue *folioq, unsigned int slot);
165163
bool folioq_is_marked2(const struct folio_queue *folioq, unsigned int slot);
166-
bool folioq_is_marked3(const struct folio_queue *folioq, unsigned int slot);
167164

168165
The marks can be used for any purpose and are not interpreted by this API.
169166

include/linux/folio_queue.h

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ struct folio_queue {
3434
struct folio_queue *prev; /* Previous queue segment of NULL */
3535
unsigned long marks; /* 1-bit mark per folio */
3636
unsigned long marks2; /* Second 1-bit mark per folio */
37-
unsigned long marks3; /* Third 1-bit mark per folio */
3837
#if PAGEVEC_SIZE > BITS_PER_LONG
3938
#error marks is not big enough
4039
#endif
@@ -58,7 +57,6 @@ static inline void folioq_init(struct folio_queue *folioq, unsigned int rreq_id)
5857
folioq->prev = NULL;
5958
folioq->marks = 0;
6059
folioq->marks2 = 0;
61-
folioq->marks3 = 0;
6260
folioq->rreq_id = rreq_id;
6361
folioq->debug_id = 0;
6462
}
@@ -178,45 +176,6 @@ static inline void folioq_unmark2(struct folio_queue *folioq, unsigned int slot)
178176
clear_bit(slot, &folioq->marks2);
179177
}
180178

181-
/**
182-
* folioq_is_marked3: Check third folio mark in a folio queue segment
183-
* @folioq: The segment to query
184-
* @slot: The slot number of the folio to query
185-
*
186-
* Determine if the third mark is set for the folio in the specified slot in a
187-
* folio queue segment.
188-
*/
189-
static inline bool folioq_is_marked3(const struct folio_queue *folioq, unsigned int slot)
190-
{
191-
return test_bit(slot, &folioq->marks3);
192-
}
193-
194-
/**
195-
* folioq_mark3: Set the third mark on a folio in a folio queue segment
196-
* @folioq: The segment to modify
197-
* @slot: The slot number of the folio to modify
198-
*
199-
* Set the third mark for the folio in the specified slot in a folio queue
200-
* segment.
201-
*/
202-
static inline void folioq_mark3(struct folio_queue *folioq, unsigned int slot)
203-
{
204-
set_bit(slot, &folioq->marks3);
205-
}
206-
207-
/**
208-
* folioq_unmark3: Clear the third mark on a folio in a folio queue segment
209-
* @folioq: The segment to modify
210-
* @slot: The slot number of the folio to modify
211-
*
212-
* Clear the third mark for the folio in the specified slot in a folio queue
213-
* segment.
214-
*/
215-
static inline void folioq_unmark3(struct folio_queue *folioq, unsigned int slot)
216-
{
217-
clear_bit(slot, &folioq->marks3);
218-
}
219-
220179
/**
221180
* folioq_append: Add a folio to a folio queue segment
222181
* @folioq: The segment to add to
@@ -318,7 +277,6 @@ static inline void folioq_clear(struct folio_queue *folioq, unsigned int slot)
318277
folioq->vec.folios[slot] = NULL;
319278
folioq_unmark(folioq, slot);
320279
folioq_unmark2(folioq, slot);
321-
folioq_unmark3(folioq, slot);
322280
}
323281

324282
#endif /* _LINUX_FOLIO_QUEUE_H */

0 commit comments

Comments
 (0)