The patch titled page_fault-retry-with-nopage_retry-fix has been removed from the -mm tree. Its filename was page_fault-retry-with-nopage_retry-fix.patch This patch was dropped because it was folded into page_fault-retry-with-nopage_retry.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: page_fault-retry-with-nopage_retry-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Hugh Dickins <hugh@xxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Lee Schermerhorn <lee.schermerhorn@xxxxxx> Cc: Mike Waychison <mikew@xxxxxxxxxx> Cc: Nick Piggin <npiggin@xxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: Rohit Seth <rohitseth@xxxxxxxxxx> Cc: Török Edwin <edwintorok@xxxxxxxxx> Cc: Ying Han <yinghan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/pagemap.h | 3 +++ mm/filemap.c | 38 ++++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff -puN include/linux/pagemap.h~page_fault-retry-with-nopage_retry-fix include/linux/pagemap.h --- a/include/linux/pagemap.h~page_fault-retry-with-nopage_retry-fix +++ a/include/linux/pagemap.h @@ -232,6 +232,9 @@ extern struct page * find_get_page(struc pgoff_t index); extern struct page * find_lock_page(struct address_space *mapping, pgoff_t index); +extern unsigned find_lock_page_retry(struct address_space *mapping, + pgoff_t offset, struct vm_area_struct *vma, + struct page **ppage, int retry) extern struct page * find_or_create_page(struct address_space *mapping, pgoff_t index, gfp_t gfp_mask); unsigned find_get_pages(struct address_space *mapping, pgoff_t start, diff -puN mm/filemap.c~page_fault-retry-with-nopage_retry-fix mm/filemap.c --- a/mm/filemap.c~page_fault-retry-with-nopage_retry-fix +++ a/mm/filemap.c @@ -714,51 +714,53 @@ repeat: EXPORT_SYMBOL(find_lock_page); /** - * find_lock_page_retry - locate, pin and lock a pagecache page, if retry - * flag is on, and page is already locked by someone else, return a hint of - * retry. + * find_lock_page_retry - locate, pin and lock a pagecache page * @mapping: the address_space to search * @offset: the page index * @vma: vma in which the fault was taken - * @page: zero if page not present, otherwise point to the page in - * pagecache. + * @ppage: zero if page not present, otherwise point to the page in pagecache. * @retry: 1 indicate caller tolerate a retry. * - * Return *page==NULL if page is not in pagecache. Otherwise return *page + * If retry flag is on, and page is already locked by someone else, return a + * hint of retry. + * + * Return *ppage==NULL if page is not in pagecache. Otherwise return *ppage * points to the page in the pagecache with ret=VM_FAULT_RETRY indicate a - * hint to caller for retry, or ret=0 which means page is succefully + * hint to caller for retry, or ret=0 which means page is successfully * locked. */ unsigned find_lock_page_retry(struct address_space *mapping, pgoff_t offset, - struct vm_area_struct *vma, struct page **page, + struct vm_area_struct *vma, struct page **ppage, int retry) { unsigned int ret = 0; + struct page *page; repeat: - *page = find_get_page(mapping, offset); - if (*page) { + page = find_get_page(mapping, offset); + if (page) { if (!retry) - lock_page(*page); + lock_page(page); else { - if (!trylock_page(*page)) { + if (!trylock_page(page)) { struct mm_struct *mm = vma->vm_mm; up_read(&mm->mmap_sem); - wait_on_page_locked(*page); + wait_on_page_locked(page); down_read(&mm->mmap_sem); - page_cache_release(*page); + page_cache_release(page); return VM_FAULT_RETRY; } } - if (unlikely((*page)->mapping != mapping)) { - unlock_page(*page); - page_cache_release(*page); + if (unlikely(page->mapping != mapping)) { + unlock_page(page); + page_cache_release(page); goto repeat; } - VM_BUG_ON((*page)->index != offset); + VM_BUG_ON(page->index != offset); } + *ppage = page; return ret; } EXPORT_SYMBOL(find_lock_page_retry); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch mm-remove-the-might_sleep-from-lock_page.patch linux-next.patch next-remove-localversion.patch clocksource-pass-clocksource-to-read-callback.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets.patch smp_call_function_single-be-slightly-less-stupid.patch kernel-trace-ring_bufferc-reduce-inlining.patch kernel-trace-ring_bufferc-use-div_round_up.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch alpha-fix-vmalloc-breakage-fix.patch scsi-dpt_i2o-is-bust-on-ia64.patch page_fault-retry-with-nopage_retry.patch page_fault-retry-with-nopage_retry-fix.patch page_fault-retry-with-nopage_retry-fix-fix.patch mm-add-proc-controls-for-pdflush-threads-fix.patch mm-add-proc-controls-for-pdflush-threads-fix-fix.patch rtc-cumulative-style-fixes-fix.patch nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros-checkpatch-fixes.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html