From: Andrey Abramov <st5pub@yandex.ru>
To: vgupta <vgupta@synopsys.com>, benh <benh@kernel.crashing.org>,
paulus <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>,
tglx <tglx@linutronix.de>, mingo <mingo@redhat.com>,
bp <bp@alien8.de>, hpa <hpa@zytor.com>, x86 <x86@kernel.org>,
mark <mark@fasheh.com>, jlbec <jlbec@evilplan.org>,
richard <richard@nod.at>, dedekind1 <dedekind1@gmail.com>,
adrian.hunter <adrian.hunter@intel.com>,
gregkh <gregkh@linuxfoundation.org>,
naveen.n.rao <naveen.n.rao@linux.vnet.ibm.com>,
jpoimboe <jpoimboe@redhat.com>,
Dave Chinner <dchinner@redhat.com>,
darrick.wong <darrick.wong@oracle.com>,
ard.biesheuvel <ard.biesheuvel@linaro.org>,
George Spelvin <lkml@sdf.org>,
linux-snps-arc <linux-snps-arc@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
ocfs2-devel <ocfs2-devel@oss.oracle.com>,
linux-mtd <linux-mtd@lists.infradead.org>,
sfr <sfr@canb.auug.org.au>
Cc: jannh <jannh@google.com>, peterz <peterz@infradead.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
"yamada.masahiro" <yamada.masahiro@socionext.com>,
Morton Andrew <akpm@linux-foundation.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
jslaby <jslaby@suse.cz>
Subject: [PATCH v3 5/5] Lib: sort.h: remove the size argument from the swap function
Date: Tue, 02 Apr 2019 23:55:25 +0300 [thread overview]
Message-ID: <793311554238525@sas1-87f9feb8d943.qloud-c.yandex.net> (raw)
In-Reply-To: <824481554237711@sas1-23a37bc8251c.qloud-c.yandex.net>
Removes size argument from the swap function because:
1) It wasn't used.
2) Custom swap function knows what kind of objects it swaps,
so it already knows their sizes.
Signed-off-by: Andrey Abramov <st5pub@yandex.ru>
Reviewed by: George Spelvin <lkml@sdf.org>
---
arch/x86/kernel/unwind_orc.c | 2 +-
include/linux/sort.h | 2 +-
kernel/jump_label.c | 2 +-
lib/extable.c | 2 +-
lib/sort.c | 7 +++----
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c
index 89be1be1790c..dc410b567189 100644
--- a/arch/x86/kernel/unwind_orc.c
+++ b/arch/x86/kernel/unwind_orc.c
@@ -176,7 +176,7 @@ static struct orc_entry *orc_find(unsigned long ip)
return orc_ftrace_find(ip);
}
-static void orc_sort_swap(void *_a, void *_b, int size)
+static void orc_sort_swap(void *_a, void *_b)
{
struct orc_entry *orc_a, *orc_b;
struct orc_entry orc_tmp;
diff --git a/include/linux/sort.h b/include/linux/sort.h
index 2b99a5dd073d..13bb4635b5f1 100644
--- a/include/linux/sort.h
+++ b/include/linux/sort.h
@@ -6,6 +6,6 @@
void sort(void *base, size_t num, size_t size,
int (*cmp)(const void *, const void *),
- void (*swap)(void *, void *, int));
+ void (*swap)(void *, void *));
#endif
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index bad96b476eb6..6b1187b8a060 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -45,7 +45,7 @@ static int jump_label_cmp(const void *a, const void *b)
return 0;
}
-static void jump_label_swap(void *a, void *b, int size)
+static void jump_label_swap(void *a, void *b)
{
long delta = (unsigned long)a - (unsigned long)b;
struct jump_entry *jea = a;
diff --git a/lib/extable.c b/lib/extable.c
index f54996fdd0b8..0515a94538ca 100644
--- a/lib/extable.c
+++ b/lib/extable.c
@@ -28,7 +28,7 @@ static inline unsigned long ex_to_insn(const struct exception_table_entry *x)
#ifndef ARCH_HAS_RELATIVE_EXTABLE
#define swap_ex NULL
#else
-static void swap_ex(void *a, void *b, int size)
+static void swap_ex(void *a, void *b)
{
struct exception_table_entry *x = a, *y = b, tmp;
int delta = b - a;
diff --git a/lib/sort.c b/lib/sort.c
index 50855ea8c262..8704750e6bde 100644
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -114,7 +114,7 @@ static void swap_bytes(void *a, void *b, size_t n)
} while (n);
}
-typedef void (*swap_func_t)(void *a, void *b, int size);
+typedef void (*swap_func_t)(void *a, void *b);
/*
* The values are arbitrary as long as they can't be confused with
@@ -138,7 +138,7 @@ static void do_swap(void *a, void *b, size_t size, swap_func_t swap_func)
else if (swap_func == SWAP_BYTES)
swap_bytes(a, b, size);
else
- swap_func(a, b, (int)size);
+ swap_func(a, b);
}
/**
@@ -186,8 +186,7 @@ static size_t parent(size_t i, unsigned int lsbit, size_t size)
* it less suitable for kernel use.
*/
void sort(void *base, size_t num, size_t size,
- int (*cmp_func)(const void *, const void *),
- void (*swap_func)(void *, void *, int size))
+ int (*cmp_func)(const void *, const void *), swap_func_t swap_func)
{
/* pre-scale counters for performance */
size_t n = num * size, a = (num/2) * size;
--
2.21.0
next prev parent reply other threads:[~2019-04-02 20:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-02 20:41 [PATCH v3 0/5] simple sort swap function improvements Andrey Abramov
2019-04-02 20:45 ` [PATCH v3 1/5] arch/arc: unwind.c: replace swap function with built-in one Andrey Abramov
2019-04-02 20:47 ` [PATCH v3 2/5] powerpc: module_[32|64].c: " Andrey Abramov
2020-06-09 5:58 ` Michael Ellerman
2019-04-02 20:49 ` [PATCH v3 3/5] ocfs2: dir, refcounttree, xattr: replace swap functions " Andrey Abramov
2019-04-02 20:52 ` [PATCH v3 4/5] ubifs: find.c: replace swap function " Andrey Abramov
2019-04-02 20:55 ` Andrey Abramov [this message]
2019-04-03 11:33 ` [PATCH v3 5/5] Lib: sort.h: remove the size argument from the swap function Andy Shevchenko
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=793311554238525@sas1-87f9feb8d943.qloud-c.yandex.net \
--to=st5pub@yandex.ru \
--cc=adrian.hunter@intel.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ard.biesheuvel@linaro.org \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=darrick.wong@oracle.com \
--cc=dchinner@redhat.com \
--cc=dedekind1@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=jlbec@evilplan.org \
--cc=jpoimboe@redhat.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux@rasmusvillemoes.dk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lkml@sdf.org \
--cc=mark@fasheh.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=richard@nod.at \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=vgupta@synopsys.com \
--cc=x86@kernel.org \
--cc=yamada.masahiro@socionext.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).