sysvipc: unteach ids->next_id for !CHECKPOINT_RESTORE
authorDavidlohr Bueso <[email protected]>
Fri, 17 Nov 2017 23:31:08 +0000 (15:31 -0800)
committerLinus Torvalds <[email protected]>
Sat, 18 Nov 2017 00:10:04 +0000 (16:10 -0800)
commitb8fd99838435f9b420c3e848192bd43abc648b7f
tree793a6390f29e27fcd9b87ba8b65c2480627491af
parente35c4c64fe492b212f9c7d9e046626e48e89f863
sysvipc: unteach ids->next_id for !CHECKPOINT_RESTORE

Patch series "sysvipc: ipc-key management improvements".

Here are a few improvements I spotted while eyeballing Guillaume's
rhashtable implementation for ipc keys.  The first and fourth patches
are the interesting ones, the middle two are trivial.

This patch (of 4):

The next_id object-allocation functionality was introduced in commit
03f595668017 ("ipc: add sysctl to specify desired next object id").

Given that these new entries are _only_ exported under the
CONFIG_CHECKPOINT_RESTORE option, there is no point for the common case
to even know about ->next_id.  As such rewrite ipc_buildid() such that
it can do away with the field as well as unnecessary branches when
adding a new identifier.  The end result also better differentiates both
cases, so the code ends up being cleaner; albeit the small duplications
regarding the default case.

[[email protected]: coding-style fixes]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Davidlohr Bueso <[email protected]>
Cc: Manfred Spraul <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
include/linux/ipc_namespace.h
ipc/util.c
ipc/util.h