diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-12-15 20:47:16 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-26 13:39:47 +0200 |
| commit | b0008fbdc75f08d933842b7071110010234b434b (patch) | |
| tree | bcdb6c5b96bd8e91f988c03d0ac26b85eb8b7daa | |
| parent | 3226fb90cf5dc89611f742f122a33d4598076ad5 (diff) | |
| download | linux-stable-b0008fbdc75f08d933842b7071110010234b434b.tar.gz linux-stable-b0008fbdc75f08d933842b7071110010234b434b.tar.bz2 linux-stable-b0008fbdc75f08d933842b7071110010234b434b.zip | |
apparmor: remove duplicate macro list_entry_is_head()
commit 9801ca279ad37f72f71234fa81722afd95a3f997 upstream.
Strangely I hadn't had noticed the existence of the list_entry_is_head()
in apparmor code when added the same one in the list.h. Luckily it's
fully identical and didn't break builds. In any case we don't need a
duplicate anymore, thus remove it from apparmor code.
Link: https://lkml.kernel.org/r/20201208100639.88182-1-andriy.shevchenko@linux.intel.com
Fixes: e130816164e244 ("include/linux/list.h: add a macro to test if entry is pointing to the head")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: John Johansen <john.johansen@canonical.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E . Hallyn " <serge@hallyn.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | security/apparmor/apparmorfs.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 1ec1e928cc09..900c865b9e5f 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -1960,9 +1960,6 @@ fail2: return error; } - -#define list_entry_is_head(pos, head, member) (&pos->member == (head)) - /** * __next_ns - find the next namespace to list * @root: root namespace to stop search at (NOT NULL) |