diff options
Diffstat (limited to 'include/linux/pagemap.h')
| -rw-r--r-- | include/linux/pagemap.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index e12cdc6d79ee..c11950652646 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -48,7 +48,7 @@ static inline void mapping_clear_unevictable(struct address_space *mapping) static inline int mapping_unevictable(struct address_space *mapping) { - if (likely(mapping)) + if (mapping) return test_bit(AS_UNEVICTABLE, &mapping->flags); return !!mapping; } @@ -298,7 +298,8 @@ static inline pgoff_t linear_page_index(struct vm_area_struct *vma, extern void __lock_page(struct page *page); extern int __lock_page_killable(struct page *page); -extern void __lock_page_nosync(struct page *page); +extern int __lock_page_or_retry(struct page *page, struct mm_struct *mm, + unsigned int flags); extern void unlock_page(struct page *page); static inline void __set_page_locked(struct page *page) @@ -340,16 +341,16 @@ static inline int lock_page_killable(struct page *page) } /* - * lock_page_nosync should only be used if we can't pin the page's inode. - * Doesn't play quite so well with block device plugging. + * lock_page_or_retry - Lock the page, unless this would block and the + * caller indicated that it can handle a retry. */ -static inline void lock_page_nosync(struct page *page) +static inline int lock_page_or_retry(struct page *page, struct mm_struct *mm, + unsigned int flags) { might_sleep(); - if (!trylock_page(page)) - __lock_page_nosync(page); + return trylock_page(page) || __lock_page_or_retry(page, mm, flags); } - + /* * This is exported only for wait_on_page_locked/wait_on_page_writeback. * Never use this directly! @@ -442,8 +443,9 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, pgoff_t index, gfp_t gfp_mask); int add_to_page_cache_lru(struct page *page, struct address_space *mapping, pgoff_t index, gfp_t gfp_mask); -extern void remove_from_page_cache(struct page *page); -extern void __remove_from_page_cache(struct page *page); +extern void delete_from_page_cache(struct page *page); +extern void __delete_from_page_cache(struct page *page); +int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask); /* * Like add_to_page_cache_locked, but used to add newly allocated pages: |