diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-02 21:56:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-09-02 21:56:43 -0700 |
| commit | 4910099d3ab28deb4f7c2fd88ef5eef5362e26df (patch) | |
| tree | 4de7fc2634214ae72d7453183884b6b8b6e654be /ipc/mqueue.c | |
| parent | 2a61e30d4462de293371173af5c153e0ea195f0e (diff) | |
| parent | 7b0c4ab61ef1dc4eaa00ee0d9b4c50ca0193ad75 (diff) | |
Merge "Merge android-4.4.188 (886d085) into msm-4.4"
Diffstat (limited to 'ipc/mqueue.c')
| -rw-r--r-- | ipc/mqueue.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 598b8bf8d80c..a94880dc9094 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -371,7 +371,6 @@ static void mqueue_evict_inode(struct inode *inode) { struct mqueue_inode_info *info; struct user_struct *user; - unsigned long mq_bytes, mq_treesize; struct ipc_namespace *ipc_ns; struct msg_msg *msg, *nmsg; LIST_HEAD(tmp_msg); @@ -394,16 +393,18 @@ static void mqueue_evict_inode(struct inode *inode) free_msg(msg); } - /* Total amount of bytes accounted for the mqueue */ - mq_treesize = info->attr.mq_maxmsg * sizeof(struct msg_msg) + - min_t(unsigned int, info->attr.mq_maxmsg, MQ_PRIO_MAX) * - sizeof(struct posix_msg_tree_node); - - mq_bytes = mq_treesize + (info->attr.mq_maxmsg * - info->attr.mq_msgsize); - user = info->user; if (user) { + unsigned long mq_bytes, mq_treesize; + + /* Total amount of bytes accounted for the mqueue */ + mq_treesize = info->attr.mq_maxmsg * sizeof(struct msg_msg) + + min_t(unsigned int, info->attr.mq_maxmsg, MQ_PRIO_MAX) * + sizeof(struct posix_msg_tree_node); + + mq_bytes = mq_treesize + (info->attr.mq_maxmsg * + info->attr.mq_msgsize); + spin_lock(&mq_lock); user->mq_bytes -= mq_bytes; /* |