diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-08-18 00:33:29 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-08-18 00:33:29 -0300 |
| commit | 6ece15cc69504348ad484564d14968c542987053 (patch) | |
| tree | cd6194a333518d78edd611023f2e255e4b66c8c9 /ipc | |
| parent | 0a2bb03fe20f81dc4cac96d7fe0e4194ae6efffd (diff) | |
Linux-libre 4.1.6-gnu
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/kdbus/pool.c | 2 | ||||
| -rw-r--r-- | ipc/mqueue.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/ipc/kdbus/pool.c b/ipc/kdbus/pool.c index c65043e8c..63ccd5571 100644 --- a/ipc/kdbus/pool.c +++ b/ipc/kdbus/pool.c @@ -482,7 +482,7 @@ struct kdbus_pool *kdbus_pool_new(const char *name, size_t size) } } - f = shmem_file_setup(n ?: KBUILD_MODNAME "-conn", size, 0, 0); + f = shmem_file_setup(n ?: KBUILD_MODNAME "-conn", size, 0); kfree(n); if (IS_ERR(f)) { diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 3aaea7ffd..c3fc5c2b6 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -143,7 +143,6 @@ static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info) if (!leaf) return -ENOMEM; INIT_LIST_HEAD(&leaf->msg_list); - info->qsize += sizeof(*leaf); } leaf->priority = msg->m_type; rb_link_node(&leaf->rb_node, parent, p); @@ -188,7 +187,6 @@ try_again: "lazy leaf delete!\n"); rb_erase(&leaf->rb_node, &info->msg_tree); if (info->node_cache) { - info->qsize -= sizeof(*leaf); kfree(leaf); } else { info->node_cache = leaf; @@ -201,7 +199,6 @@ try_again: if (list_empty(&leaf->msg_list)) { rb_erase(&leaf->rb_node, &info->msg_tree); if (info->node_cache) { - info->qsize -= sizeof(*leaf); kfree(leaf); } else { info->node_cache = leaf; @@ -1026,7 +1023,6 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, /* Save our speculative allocation into the cache */ INIT_LIST_HEAD(&new_leaf->msg_list); info->node_cache = new_leaf; - info->qsize += sizeof(*new_leaf); new_leaf = NULL; } else { kfree(new_leaf); @@ -1133,7 +1129,6 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, /* Save our speculative allocation into the cache */ INIT_LIST_HEAD(&new_leaf->msg_list); info->node_cache = new_leaf; - info->qsize += sizeof(*new_leaf); } else { kfree(new_leaf); } |