kmemleak: remove redundant code

Remove kmemleak_padding() and kmemleak_release().

Signed-off-by: Li Zefan <lizefan@huawei.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
index 2a5e5548a1d29c0577d75e6492eddfc241375444..5bb424659c0449f4068330d4f31678b5409a9593 100644 (file)
--- a/include/linux/kmemleak.h
+++ b/include/linux/kmemleak.h
@@ -30,8 +30,6 @@ extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
 extern void kmemleak_free(const void *ptr) __ref;
 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
 extern void kmemleak_free_percpu(const void __percpu *ptr) __ref;
-extern void kmemleak_padding(const void *ptr, unsigned long offset,
-                            size_t size) __ref;
 extern void kmemleak_not_leak(const void *ptr) __ref;
 extern void kmemleak_ignore(const void *ptr) __ref;
 extern void kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) __ref;

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 06cd22035a92518fbe48e91a5ae006f06dedab79..6f90d003830a91b3a368f01607cdfa0099eaff62 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1549,11 +1549,6 @@ static int kmemleak_open(struct inode *inode, struct file *file)
        return seq_open(file, &kmemleak_seq_ops);
 }
 
-static int kmemleak_release(struct inode *inode, struct file *file)
-{
-       return seq_release(inode, file);
-}
-
 static int dump_str_object_info(const char *str)
 {
        unsigned long flags;
@@ -1691,7 +1686,7 @@ static const struct file_operations kmemleak_fops = {
        .read           = seq_read,
        .write          = kmemleak_write,
        .llseek         = seq_lseek,
-       .release        = kmemleak_release,
+       .release        = seq_release,
 };
 
 static void __kmemleak_do_cleanup(void)