summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@stgolabs.net>2017-11-17 15:31:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-17 16:10:04 -0800
commitebf66799acfb5f52ada4ff96ecc9579867941ea9 (patch)
tree009527abb6375f6898ac1dd833ee9db31f863a08 /ipc
parent39c96a1b96a5991b1c9e79b85a8d74ef93b36026 (diff)
downloadlinux-stable-ebf66799acfb5f52ada4ff96ecc9579867941ea9.tar.gz
linux-stable-ebf66799acfb5f52ada4ff96ecc9579867941ea9.tar.bz2
linux-stable-ebf66799acfb5f52ada4ff96ecc9579867941ea9.zip
sysvipc: properly name ipc_addid() limit parameter
This is better understood as a limit, instead of size; exactly like the function comment indicates. Rename it. Link: http://lkml.kernel.org/r/20170831172049.14576-4-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>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ipc/util.c b/ipc/util.c
index 429c06bdb8ef..e09bf76610ef 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -262,7 +262,7 @@ static inline int ipc_buildid(int id, struct ipc_ids *ids,
* ipc_addid - add an ipc identifier
* @ids: ipc identifier set
* @new: new ipc permission set
- * @size: limit for the number of used ids
+ * @limit: limit for the number of used ids
*
* Add an entry 'new' to the ipc ids idr. The permissions object is
* initialised and the first free entry is set up and the id assigned
@@ -271,16 +271,16 @@ static inline int ipc_buildid(int id, struct ipc_ids *ids,
*
* Called with writer ipc_ids.rwsem held.
*/
-int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size)
+int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int limit)
{
kuid_t euid;
kgid_t egid;
int id, err;
- if (size > IPCMNI)
- size = IPCMNI;
+ if (limit > IPCMNI)
+ limit = IPCMNI;
- if (!ids->tables_initialized || ids->in_use >= size)
+ if (!ids->tables_initialized || ids->in_use >= limit)
return -ENOSPC;
idr_preload(GFP_KERNEL);