From: David Hildenbrand <david@redhat.com>
To: Florian Westphal <fw@strlen.de>, linux-mm@kvack.org
Cc: cl@linux.com, penberg@kernel.org, rientjes@google.com,
iamjoonsoo.kim@lge.com, akpm@linux-foundation.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mm: remove __krealloc
Date: Fri, 13 Dec 2019 11:17:28 +0100 [thread overview]
Message-ID: <cc82f3e8-6386-37d3-34e5-78f25521d9af@redhat.com> (raw)
In-Reply-To: <20191212223442.22141-1-fw@strlen.de>
On 12.12.19 23:34, Florian Westphal wrote:
> Since 5.5-rc1 the last user of this function is gone, so remove the
> functionality.
>
> See commit
> 2ad9d7747c10 ("netfilter: conntrack: free extension area immediately")
> for details.
>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> include/linux/slab.h | 1 -
> mm/slab_common.c | 22 ----------------------
> scripts/coccinelle/free/devm_free.cocci | 4 ----
> 3 files changed, 27 deletions(-)
>
> diff --git a/include/linux/slab.h b/include/linux/slab.h
> index 877a95c6a2d2..03a389358562 100644
> --- a/include/linux/slab.h
> +++ b/include/linux/slab.h
> @@ -184,7 +184,6 @@ void memcg_deactivate_kmem_caches(struct mem_cgroup *, struct mem_cgroup *);
> /*
> * Common kmalloc functions provided by all allocators
> */
> -void * __must_check __krealloc(const void *, size_t, gfp_t);
> void * __must_check krealloc(const void *, size_t, gfp_t);
> void kfree(const void *);
> void kzfree(const void *);
> diff --git a/mm/slab_common.c b/mm/slab_common.c
> index f0ab6d4ceb4c..87e8923cf0b6 100644
> --- a/mm/slab_common.c
> +++ b/mm/slab_common.c
> @@ -1675,28 +1675,6 @@ static __always_inline void *__do_krealloc(const void *p, size_t new_size,
> return ret;
> }
>
> -/**
> - * __krealloc - like krealloc() but don't free @p.
> - * @p: object to reallocate memory for.
> - * @new_size: how many bytes of memory are required.
> - * @flags: the type of memory to allocate.
> - *
> - * This function is like krealloc() except it never frees the originally
> - * allocated buffer. Use this if you don't want to free the buffer immediately
> - * like, for example, with RCU.
> - *
> - * Return: pointer to the allocated memory or %NULL in case of error
> - */
> -void *__krealloc(const void *p, size_t new_size, gfp_t flags)
> -{
> - if (unlikely(!new_size))
> - return ZERO_SIZE_PTR;
> -
> - return __do_krealloc(p, new_size, flags);
> -
> -}
> -EXPORT_SYMBOL(__krealloc);
> -
> /**
> * krealloc - reallocate memory. The contents will remain unchanged.
> * @p: object to reallocate memory for.
> diff --git a/scripts/coccinelle/free/devm_free.cocci b/scripts/coccinelle/free/devm_free.cocci
> index 441799b5359b..66aaf68889a5 100644
> --- a/scripts/coccinelle/free/devm_free.cocci
> +++ b/scripts/coccinelle/free/devm_free.cocci
> @@ -94,8 +94,6 @@ position p;
> kfree@p(x)
> |
> kzfree@p(x)
> -|
> - __krealloc@p(x, ...)
> |
> krealloc@p(x, ...)
> |
> @@ -120,8 +118,6 @@ position p != safe.p;
> |
> * kzfree@p(x)
> |
> -* __krealloc@p(x, ...)
> -|
> * krealloc@p(x, ...)
> |
> * free_pages@p(x, ...)
>
IMHO, __do_krealloc() changes can go into a separate patch.
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
prev parent reply other threads:[~2019-12-13 10:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 22:34 [PATCH] mm: remove __krealloc Florian Westphal
2019-12-12 23:00 ` David Rientjes
2019-12-12 23:18 ` Florian Westphal
2019-12-13 18:59 ` David Rientjes
2019-12-13 10:17 ` David Hildenbrand [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc82f3e8-6386-37d3-34e5-78f25521d9af@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=fw@strlen.de \
--cc=iamjoonsoo.kim@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).