Merge tag 'sysctl-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl...

[linux-2.6-block.git] / ipc / mq_sysctl.c

diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
index 69c709262f5adf97eef052cbc81656dd7ce2f641..068e7d5aa42b8bd3cc506a677d13f215fdb89088 100644 (file)
--- a/ipc/mq_sysctl.c
+++ b/ipc/mq_sysctl.c
@@ -78,7 +78,6 @@ static int set_is_seen(struct ctl_table_set *set)
 }
 
 static void mq_set_ownership(struct ctl_table_header *head,
-                            struct ctl_table *table,
                             kuid_t *uid, kgid_t *gid)
 {
        struct ipc_namespace *ns =
@@ -91,13 +90,13 @@ static void mq_set_ownership(struct ctl_table_header *head,
        *gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
 }
 
-static int mq_permissions(struct ctl_table_header *head, struct ctl_table *table)
+static int mq_permissions(struct ctl_table_header *head, const struct ctl_table *table)
 {
        int mode = table->mode;
        kuid_t ns_root_uid;
        kgid_t ns_root_gid;
 
-       mq_set_ownership(head, table, &ns_root_uid, &ns_root_gid);
+       mq_set_ownership(head, &ns_root_uid, &ns_root_gid);
 
        if (uid_eq(current_euid(), ns_root_uid))
                mode >>= 6;