scsi/sg: move sg-big-buff sysctl to scsi/sg.c

kernel/sysctl.c is a kitchen sink where everyone leaves their dirty
dishes, this makes it very difficult to maintain.

To help with this maintenance let's start by moving sysctls to places
where they actually belong. The proc sysctl maintainers do not want to
know what sysctl knobs you wish to add for your own piece of code, we
just care about the core logic.

So move the sg-big-buff sysctl from kernel/sysctl.c to drivers/scsi/sg.c
and use register_sysctl() to register the sysctl interface.

[[e-mail]: commit log update]

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Xiaoming Ni <[e-mail]>
Signed-off-by: Luis Chamberlain <[e-mail]>
Cc: Al Viro <[e-mail]>
Cc: Amir Goldstein <[e-mail]>
Cc: Andy Shevchenko <[e-mail]>
Cc: Antti Palosaari <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
Cc: Benjamin Herrenschmidt <[e-mail]>
Cc: Benjamin LaHaise <[e-mail]>
Cc: Clemens Ladisch <[e-mail]>
Cc: David Airlie <[e-mail]>
Cc: Douglas Gilbert <[e-mail]>
Cc: Eric Biederman <[e-mail]>
Cc: Greg Kroah-Hartman <[e-mail]>
Cc: Iurii Zaikin <[e-mail]>
Cc: James E.J. Bottomley <[e-mail]>
Cc: Jani Nikula <[e-mail]>
Cc: Jani Nikula <[e-mail]>
Cc: Jan Kara <[e-mail]>
Cc: Joel Becker <[e-mail]>
Cc: John Ogness <[e-mail]>
Cc: Joonas Lahtinen <[e-mail]>
Cc: Joseph Qi <[e-mail]>
Cc: Julia Lawall <[e-mail]>
Cc: Kees Cook <[e-mail]>
Cc: Lukas Middendorf <[e-mail]>
Cc: Mark Fasheh <[e-mail]>
Cc: Martin K. Petersen <[e-mail]>
Cc: Paul Turner <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Petr Mladek <[e-mail]>
Cc: Phillip Potter <[e-mail]>
Cc: Qing Wang <[e-mail]>
Cc: "Rafael J. Wysocki" <[e-mail]>
Cc: Rodrigo Vivi <[e-mail]>
Cc: Sebastian Reichel <[e-mail]>
Cc: Sergey Senozhatsky <[e-mail]>
Cc: Stephen Kitt <[e-mail]>
Cc: Steven Rostedt (VMware) <[e-mail]>
Cc: Suren Baghdasaryan <[e-mail]>
Cc: Tetsuo Handa <[e-mail]>
Cc: "Theodore Ts'o" <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Signed-off-by: Linus Torvalds <[e-mail]>

drivers/scsi/sg.c

···
 
 #define SG_DEFAULT_TIMEOUT mult_frac(SG_DEFAULT_TIMEOUT_USER, HZ, USER_HZ)
 
-int sg_big_buff = SG_DEF_RESERVED_SIZE;
+static int sg_big_buff = SG_DEF_RESERVED_SIZE;
 /* N.B. This variable is readable and writeable via
    /proc/scsi/sg/def_reserved_size . Each time sg_open() is called a buffer
    of this size (or less if there is not enough memory) will be reserved
···
 MODULE_PARM_DESC(def_reserved_size, "size of buffer reserved for each fd");
 MODULE_PARM_DESC(allow_dio, "allow direct I/O (default: 0 (disallow))");
 
+#ifdef CONFIG_SYSCTL
+#include <linux/sysctl.h>
+
+static struct ctl_table sg_sysctls[] = {
+	{
+		.procname	= "sg-big-buff",
+		.data		= &sg_big_buff,
+		.maxlen		= sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= proc_dointvec,
+	},
+	{}
+};
+
+static struct ctl_table_header *hdr;
+static void register_sg_sysctls(void)
+{
+	if (!hdr)
+		hdr = register_sysctl("kernel", sg_sysctls);
+}
+
+static void unregister_sg_sysctls(void)
+{
+	if (hdr)
+		unregister_sysctl_table(hdr);
+}
+#else
+#define register_sg_sysctls() do { } while (0)
+#define unregister_sg_sysctls() do { } while (0)
+#endif /* CONFIG_SYSCTL */
+
 static int __init
 init_sg(void)
 {
···
 		return 0;
 	}
 	class_destroy(sg_sysfs_class);
+	register_sg_sysctls();
 err_out:
 	unregister_chrdev_region(MKDEV(SCSI_GENERIC_MAJOR, 0), SG_MAX_DEVS);
 	return rc;
···
 static void __exit
 exit_sg(void)
 {
+	unregister_sg_sysctls();
 #ifdef CONFIG_SCSI_PROC_FS
 	remove_proc_subtree("scsi/sg", NULL);
 #endif				/* CONFIG_SCSI_PROC_FS */

include/scsi/sg.h

···
  * For utility and test programs see: http://sg.danny.cz/sg/sg3_utils.html
  */
 
-#ifdef __KERNEL__
-extern int sg_big_buff; /* for sysctl */
-#endif
-
 
 typedef struct sg_iovec /* same structure as used by readv() Linux system */
 {                       /* call. It defines one scatter-gather element. */

kernel/sysctl.c

···
 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
 #include <linux/lockdep.h>
 #endif
-#ifdef CONFIG_CHR_DEV_SG
-#include <scsi/sg.h>
-#endif
 #ifdef CONFIG_STACKLEAK_RUNTIME_DISABLE
 #include <linux/stackleak.h>
 #endif
···
 		.maxlen		= UEVENT_HELPER_PATH_LEN,
 		.mode		= 0644,
 		.proc_handler	= proc_dostring,
-	},
-#endif
-#ifdef CONFIG_CHR_DEV_SG
-	{
-		.procname	= "sg-big-buff",
-		.data		= &sg_big_buff,
-		.maxlen		= sizeof (int),
-		.mode		= 0444,
-		.proc_handler	= proc_dointvec,
 	},
 #endif
 #ifdef CONFIG_BSD_PROCESS_ACCT