]> git.baikalelectronics.ru Git - kernel.git/commitdiff
sysvipc: duplicate lock comments wrt ipc_addid()
authorDavidlohr Bueso <dave@stgolabs.net>
Fri, 17 Nov 2017 23:31:11 +0000 (15:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Nov 2017 00:10:04 +0000 (16:10 -0800)
The comment in msgqueues when using ipc_addid() is quite useful imo.
Duplicate it for shm and semaphores.

Link: http://lkml.kernel.org/r/20170831172049.14576-3-dave@stgolabs.net
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
ipc/sem.c
ipc/shm.c

index b2698ebdcb31e65ea2f3e94f64cc567607b8ca2a..28a5c9f0be876bd6614cd9a6e6a04214b5b68747 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -515,6 +515,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
        sma->sem_nsems = nsems;
        sma->sem_ctime = ktime_get_real_seconds();
 
+       /* ipc_addid() locks sma upon success. */
        retval = ipc_addid(&sem_ids(ns), &sma->sem_perm, ns->sc_semmni);
        if (retval < 0) {
                call_rcu(&sma->sem_perm.rcu, sem_rcu_free);
index bd652755d32cc6fee7598b7a8dc257bd65e0c807..378c929194ce68207d5742eeadcd1cd0c755ff15 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -601,6 +601,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
        shp->shm_file = file;
        shp->shm_creator = current;
 
+       /* ipc_addid() locks shp upon success. */
        error = ipc_addid(&shm_ids(ns), &shp->shm_perm, ns->shm_ctlmni);
        if (error < 0)
                goto no_id;