git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/mempolicy.c: avoid use uninitialized preferred_node
[pandora-kernel.git]
/
ipc
/
mqueue.c
diff --git
a/ipc/mqueue.c
b/ipc/mqueue.c
index
2e0ecfc
..
081a2d7
100644
(file)
--- a/
ipc/mqueue.c
+++ b/
ipc/mqueue.c
@@
-1095,8
+1095,10
@@
retry:
timeo = MAX_SCHEDULE_TIMEOUT;
ret = netlink_attachskb(sock, nc, &timeo, NULL);
timeo = MAX_SCHEDULE_TIMEOUT;
ret = netlink_attachskb(sock, nc, &timeo, NULL);
- if (ret == 1)
+ if (ret == 1) {
+ sock = NULL;
goto retry;
goto retry;
+ }
if (ret) {
sock = NULL;
nc = NULL;
if (ret) {
sock = NULL;
nc = NULL;
@@
-1269,7
+1271,7
@@
void mq_clear_sbinfo(struct ipc_namespace *ns)
void mq_put_mnt(struct ipc_namespace *ns)
{
void mq_put_mnt(struct ipc_namespace *ns)
{
-
mntpu
t(ns->mq_mnt);
+
kern_unmoun
t(ns->mq_mnt);
}
static int __init init_mqueue_fs(void)
}
static int __init init_mqueue_fs(void)
@@
-1291,11
+1293,9
@@
static int __init init_mqueue_fs(void)
spin_lock_init(&mq_lock);
spin_lock_init(&mq_lock);
- init_ipc_ns.mq_mnt = kern_mount_data(&mqueue_fs_type, &init_ipc_ns);
- if (IS_ERR(init_ipc_ns.mq_mnt)) {
- error = PTR_ERR(init_ipc_ns.mq_mnt);
+ error = mq_init_ns(&init_ipc_ns);
+ if (error)
goto out_filesystem;
goto out_filesystem;
- }
return 0;
return 0;