]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
watch_queue: Use page->private instead of page->index
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 25 Nov 2024 17:54:41 +0000 (17:54 +0000)
committerChristian Brauner <brauner@kernel.org>
Sun, 22 Dec 2024 10:29:51 +0000 (11:29 +0100)
We are attempting to eliminate page->index, so use page->private
instead.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20241125175443.2911738-1-willy@infradead.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
kernel/watch_queue.c

index 1895fbc32bcb9913b65102f70ef3e975d8be01fb..5267adeaa403456ba80473e6a9584fdddfe1b939 100644 (file)
@@ -71,7 +71,7 @@ static void watch_queue_pipe_buf_release(struct pipe_inode_info *pipe,
        bit /= WATCH_QUEUE_NOTE_SIZE;
 
        page = buf->page;
-       bit += page->index;
+       bit += page->private;
 
        set_bit(bit, wqueue->notes_bitmap);
        generic_pipe_buf_release(pipe, buf);
@@ -278,7 +278,7 @@ long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes)
                pages[i] = alloc_page(GFP_KERNEL);
                if (!pages[i])
                        goto error_p;
-               pages[i]->index = i * WATCH_QUEUE_NOTES_PER_PAGE;
+               pages[i]->private = i * WATCH_QUEUE_NOTES_PER_PAGE;
        }
 
        bitmap = bitmap_alloc(nr_notes, GFP_KERNEL);