diff options
| -rw-r--r-- | arch/s390/mm/fault.c | 2 | ||||
| -rw-r--r-- | fs/pipe.c | 2 | ||||
| -rw-r--r-- | include/linux/mm.h | 10 | ||||
| -rw-r--r-- | mm/gup.c | 21 |
4 files changed, 15 insertions, 20 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index a834e4672f72..212632d57db9 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -822,7 +822,7 @@ void do_secure_storage_access(struct pt_regs *regs) break; case KERNEL_FAULT: page = phys_to_page(addr); - if (unlikely(!try_get_compound_head(page, 1))) + if (unlikely(!try_get_page(page))) break; rc = arch_make_page_accessible(page); put_page(page); diff --git a/fs/pipe.c b/fs/pipe.c index 1fa1f52763f0..6d4342bad9f1 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -191,7 +191,7 @@ EXPORT_SYMBOL(generic_pipe_buf_try_steal); */ bool generic_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *buf) { - return try_get_compound_head(buf->page, 1); + return try_get_page(buf->page); } EXPORT_SYMBOL(generic_pipe_buf_get); diff --git a/include/linux/mm.h b/include/linux/mm.h index 50e2c2914ac2..73a52aba448f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1218,7 +1218,15 @@ bool __must_check try_grab_page(struct page *page, unsigned int flags); struct page *try_grab_compound_head(struct page *page, int refs, unsigned int flags); -struct page *try_get_compound_head(struct page *page, int refs); + +static inline __must_check bool try_get_page(struct page *page) +{ + page = compound_head(page); + if (WARN_ON_ONCE(page_ref_count(page) <= 0)) + return false; + page_ref_inc(page); + return true; +} static inline void put_page(struct page *page) { @@ -62,24 +62,11 @@ static void put_page_refs(struct page *page, int refs) put_page(page); } -/** - * try_get_compound_head() - return the compound head page with refcount - * appropriately incremented, or NULL if that failed. - * - * This handles potential refcount overflow correctly. It also works correctly - * for various lockless get_user_pages()-related callers, due to the use of - * page_cache_add_speculative(). - * - * Even though the name includes "compound_head", this function is still - * appropriate for callers that have a non-compound @page to get. - * - * @page: pointer to page to be gotten - * @refs: the value to add to the page's refcount - * - * Return: head page (with refcount appropriately incremented) for success, or - * NULL upon failure. +/* + * Return the compound head page with ref appropriately incremented, + * or NULL if that failed. */ -struct page *try_get_compound_head(struct page *page, int refs) +static inline struct page *try_get_compound_head(struct page *page, int refs) { struct page *head = compound_head(page); |