lkml.org 
[lkml]   [2015]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/2] kernel/reboot.c: Add orderly_reboot for graceful reboot
On 03/30/2015 07:45 AM, Joel Stanley wrote:
> The kernel has orderly_poweroff which allows the kernel to initiate a
> graceful shutdown of userspace, by running /sbin/poweroff. This adds
> orderly_reboot that will cause userspace to shut itself down by calling
> /sbin/reboot.
>
> This will be used for shutdown initiated by a system controller on
> platforms that do not use ACPI.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
> include/linux/reboot.h | 1 +
> kernel/reboot.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---
> 2 files changed, 49 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/reboot.h b/include/linux/reboot.h
> index 48bf152..a4ffcd9 100644
> --- a/include/linux/reboot.h
> +++ b/include/linux/reboot.h
> @@ -68,6 +68,7 @@ void ctrl_alt_del(void);
> extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN];
>
> extern int orderly_poweroff(bool force);
> +extern int orderly_reboot(void);
>
> /*
> * Emergency restart, callable from an interrupt handler.
> diff --git a/kernel/reboot.c b/kernel/reboot.c
> index a3a9e24..d0aa1ec 100644
> --- a/kernel/reboot.c
> +++ b/kernel/reboot.c
> @@ -306,8 +306,9 @@ void ctrl_alt_del(void)
> }
>
> char poweroff_cmd[POWEROFF_CMD_PATH_LEN] = "/sbin/poweroff";
> +char reboot_cmd[POWEROFF_CMD_PATH_LEN] = "/sbin/reboot";

Should not we declare one more REBOOT_CMD_PATH_LEN to make it cleaner.

>
> -static int __orderly_poweroff(bool force)
> +static int run_cmd(const char *cmd)
> {
> char **argv;
> static char *envp[] = {
> @@ -316,8 +317,7 @@ static int __orderly_poweroff(bool force)
> NULL
> };
> int ret;
> -
> - argv = argv_split(GFP_KERNEL, poweroff_cmd, NULL);
> + argv = argv_split(GFP_KERNEL, cmd, NULL);
> if (argv) {
> ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
> argv_free(argv);
> @@ -325,8 +325,33 @@ static int __orderly_poweroff(bool force)
> ret = -ENOMEM;
> }
>
> + return ret;
> +}
> +
> +static int __orderly_reboot(void)
> +{
> + int ret;
> +
> + ret = run_cmd(reboot_cmd);
> +
> + if (ret) {
> + pr_warn("Failed to start orderly reboot: forcing the issue\n");
> + emergency_sync();
> + kernel_restart(NULL);
> + }
> +
> + return ret;
> +}
> +
> +static int __orderly_poweroff(bool force)
> +{
> + int ret;
> +
> + ret = run_cmd(reboot_cmd);

Would it be poweroff_cmd instead of reboot_cmd ? Dont see poweroff_cmd getting used.



\
 
 \ /
  Last update: 2015-04-01 07:21    [W:0.138 / U:1.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site