On Thu, Aug 22, 2013 at 05:48:26PM +0800, Wanpeng Li wrote:
> Drop forward reference declarations __soft_offline_page.
>
> Signed-off-by: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
> ---
> mm/memory-failure.c | 129 ++++++++++++++++++++++++++--------------------------
> 1 file changed, 64 insertions(+), 65 deletions(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index 3bfb45f..0a52571 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -1498,71 +1498,6 @@ static int soft_offline_huge_page(struct page *page, int flags)
> return ret;
> }
>
> -static int __soft_offline_page(struct page *page, int flags);
> -
> -/**
> - * soft_offline_page - Soft offline a page.
> - * @page: page to offline
> - * @flags: flags. Same as memory_failure().
> - *
> - * Returns 0 on success, otherwise negated errno.
> - *
> - * Soft offline a page, by migration or invalidation,
> - * without killing anything. This is for the case when
> - * a page is not corrupted yet (so it's still valid to access),
> - * but has had a number of corrected errors and is better taken
> - * out.
> - *
> - * The actual policy on when to do that is maintained by
> - * user space.
> - *
> - * This should never impact any application or cause data loss,
> - * however it might take some time.
> - *
> - * This is not a 100% solution for all memory, but tries to be
> - * ``good enough'' for the majority of memory.
> - */
> -int soft_offline_page(struct page *page, int flags)
> -{
> - int ret;
> - unsigned long pfn = page_to_pfn(page);
> - struct page *hpage = compound_trans_head(page);
> -
> - if (PageHWPoison(page)) {
> - pr_info("soft offline: %#lx page already poisoned\n", pfn);
> - return -EBUSY;
> - }
> - if (!PageHuge(page) && PageTransHuge(hpage)) {
> - if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) {
> - pr_info("soft offline: %#lx: failed to split THP\n",
> - pfn);
> - return -EBUSY;
> - }
> - }
> -
> - ret = get_any_page(page, pfn, flags);
> - if (ret < 0)
> - return ret;
> - if (ret) { /* for in-use pages */
> - if (PageHuge(page))
> - ret = soft_offline_huge_page(page, flags);
> - else
> - ret = __soft_offline_page(page, flags);
> - } else { /* for free pages */
> - if (PageHuge(page)) {
> - set_page_hwpoison_huge_page(hpage);
> - dequeue_hwpoisoned_huge_page(hpage);
> - atomic_long_add(1 << compound_order(hpage),
> - &num_poisoned_pages);
> - } else {
> - SetPageHWPoison(page);
> - atomic_long_inc(&num_poisoned_pages);
> - }
> - }
> - unset_migratetype_isolate(page, MIGRATE_MOVABLE);
> - return ret;
> -}
> -
> static int __soft_offline_page(struct page *page, int flags)
> {
> int ret;
> @@ -1649,3 +1584,66 @@ static int __soft_offline_page(struct page *page, int flags)
> }
> return ret;
> }
> +
> +/**
> + * soft_offline_page - Soft offline a page.
> + * @page: page to offline
> + * @flags: flags. Same as memory_failure().
> + *
> + * Returns 0 on success, otherwise negated errno.
> + *
> + * Soft offline a page, by migration or invalidation,
> + * without killing anything. This is for the case when
> + * a page is not corrupted yet (so it's still valid to access),
> + * but has had a number of corrected errors and is better taken
> + * out.
> + *
> + * The actual policy on when to do that is maintained by
> + * user space.
> + *
> + * This should never impact any application or cause data loss,
> + * however it might take some time.
> + *
> + * This is not a 100% solution for all memory, but tries to be
> + * ``good enough'' for the majority of memory.
> + */
> +int soft_offline_page(struct page *page, int flags)
> +{
> + int ret;
> + unsigned long pfn = page_to_pfn(page);
> + struct page *hpage = compound_trans_head(page);
> +
> + if (PageHWPoison(page)) {
> + pr_info("soft offline: %#lx page already poisoned\n", pfn);
> + return -EBUSY;
> + }
> + if (!PageHuge(page) && PageTransHuge(hpage)) {
> + if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) {
> + pr_info("soft offline: %#lx: failed to split THP\n",
> + pfn);
> + return -EBUSY;
> + }
> + }
> +
> + ret = get_any_page(page, pfn, flags);
> + if (ret < 0)
> + return ret;
> + if (ret) { /* for in-use pages */
> + if (PageHuge(page))
> + ret = soft_offline_huge_page(page, flags);
> + else
> + ret = __soft_offline_page(page, flags);
> + } else { /* for free pages */
> + if (PageHuge(page)) {
> + set_page_hwpoison_huge_page(hpage);
> + dequeue_hwpoisoned_huge_page(hpage);
> + atomic_long_add(1 << compound_order(hpage),
> + &num_poisoned_pages);
> + } else {
> + SetPageHWPoison(page);
> + atomic_long_inc(&num_poisoned_pages);
> + }
> + }
> + unset_migratetype_isolate(page, MIGRATE_MOVABLE);
> + return ret;
> +}
> --
> 1.8.1.2
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@xxxxxxxxx. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>