blk-mq: remember to start timeout handler for direct queue

[firefly-linux-kernel-4.4.55.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index ccf1f9fd263acdfae7dc56a87bceddd3170f69d9..4fcf39af17768345be5f60e08e44af14b14bad76 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -433,9 +433,9 @@ static int mqueue_create(struct inode *dir, struct dentry *dentry,
                error = -EACCES;
                goto out_unlock;
        }
-       if (ipc_ns->mq_queues_count >= HARD_QUEUESMAX ||
-           (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max &&
-            !capable(CAP_SYS_RESOURCE))) {
+
+       if (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max &&
+           !capable(CAP_SYS_RESOURCE)) {
                error = -ENOSPC;
                goto out_unlock;
        }
@@ -1459,4 +1459,4 @@ out_sysctl:
        return error;
 }
 
-__initcall(init_mqueue_fs);
+device_initcall(init_mqueue_fs);