Merge tag 'slab-for-6.1-rc1-hotfix' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index f98de32..467a194 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -986,8 +986,7 @@ SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name)
 
 out_unlock:
        inode_unlock(d_inode(mnt->mnt_root));
-       if (inode)
-               iput(inode);
+       iput(inode);
        mnt_drop_write(mnt);
 out_name:
        putname(name);
@@ -1746,6 +1745,7 @@ out_filesystem:
        unregister_filesystem(&mqueue_fs_type);
 out_sysctl:
        kmem_cache_destroy(mqueue_inode_cachep);
+       retire_mq_sysctls(&init_ipc_ns);
        return error;
 }