powerpc/64e: KASAN Full support for BOOK3E/64

[linux-2.6-microblaze.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 54cb626..12ad786 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -164,8 +164,6 @@ static void remove_notification(struct mqueue_inode_info *info);
 
 static struct kmem_cache *mqueue_inode_cachep;
 
-static struct ctl_table_header *mq_sysctl_table;
-
 static inline struct mqueue_inode_info *MQUEUE_I(struct inode *inode)
 {
        return container_of(inode, struct mqueue_inode_info, vfs_inode);
@@ -1727,8 +1725,10 @@ static int __init init_mqueue_fs(void)
        if (mqueue_inode_cachep == NULL)
                return -ENOMEM;
 
-       /* ignore failures - they are not fatal */
-       mq_sysctl_table = mq_register_sysctl_table();
+       if (!setup_mq_sysctls(&init_ipc_ns)) {
+               pr_warn("sysctl registration failed\n");
+               return -ENOMEM;
+       }
 
        error = register_filesystem(&mqueue_fs_type);
        if (error)
@@ -1745,8 +1745,6 @@ static int __init init_mqueue_fs(void)
 out_filesystem:
        unregister_filesystem(&mqueue_fs_type);
 out_sysctl:
-       if (mq_sysctl_table)
-               unregister_sysctl_table(mq_sysctl_table);
        kmem_cache_destroy(mqueue_inode_cachep);
        return error;
 }