]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: sg: Fix sysctl sg-big-buff register during sg_init()
authorYang Erkun <yangerkun@huawei.com>
Tue, 27 Jan 2026 06:20:42 +0000 (14:20 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sun, 1 Mar 2026 01:25:04 +0000 (20:25 -0500)
Commit 26d1c80fd61e ("scsi/sg: move sg-big-buff sysctl to scsi/sg.c") made
a mistake. sysctl sg-big-buff was not created because the call to
register_sg_sysctls() was placed on the wrong code path.

Fixes: 26d1c80fd61e ("scsi/sg: move sg-big-buff sysctl to scsi/sg.c")
Signed-off-by: Yang Erkun <yangerkun@huawei.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20260127062044.3034148-2-yangerkun@huawei.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/sg.c

index 37bac49f30f0db354fd1bcf6a1bf8c31e2493ac2..71d34186dec938197196a9db019cf03e8b9e8550 100644 (file)
@@ -1691,13 +1691,13 @@ init_sg(void)
        sg_sysfs_valid = 1;
        rc = scsi_register_interface(&sg_interface);
        if (0 == rc) {
+               register_sg_sysctls();
 #ifdef CONFIG_SCSI_PROC_FS
                sg_proc_init();
 #endif                         /* CONFIG_SCSI_PROC_FS */
                return 0;
        }
        class_unregister(&sg_sysfs_class);
-       register_sg_sysctls();
 err_out:
        unregister_chrdev_region(MKDEV(SCSI_GENERIC_MAJOR, 0), SG_MAX_DEVS);
        return rc;