aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/mqueue.c
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2010-05-17 12:11:21 -0400
committerMatthew Garrett <mjg@redhat.com>2010-05-17 12:11:21 -0400
commita1e66dd0515c8cfa72b8e2a3834d59548cf84ba5 (patch)
treee1e1edf210c8dde6edbdfa32ed6ff59ac553729b /ipc/mqueue.c
parentd89d63a973986bf6c1d8b28ab62eb61491a3bb34 (diff)
parent6c62673cf58516e1b82329ac90ebf3ff3f485672 (diff)
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r--ipc/mqueue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 722b0130aa94..59a009dc54a8 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -158,7 +158,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
158 u->mq_bytes + mq_bytes > 158 u->mq_bytes + mq_bytes >
159 task_rlimit(p, RLIMIT_MSGQUEUE)) { 159 task_rlimit(p, RLIMIT_MSGQUEUE)) {
160 spin_unlock(&mq_lock); 160 spin_unlock(&mq_lock);
161 kfree(info->messages); 161 /* mqueue_delete_inode() releases info->messages */
162 goto out_inode; 162 goto out_inode;
163 } 163 }
164 u->mq_bytes += mq_bytes; 164 u->mq_bytes += mq_bytes;