lkml.org 
[lkml]   [2009]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Clean up sys_shutdown
On Wed, 8 Apr 2009 00:36:26 +0200 Andi Kleen <andi@firstfloor.org> wrote:

> Clean up sys_shutdown exit path
>
> Impact: cleanup, fix
>
> Clean up sys_shutdown exit path. Factor out common code.

OK.

> Return
> correct error code instead of always 0 on failure.

oh goody, that makes the patch a bugfix.

> --- linux.orig/kernel/sys.c 2009-04-07 16:09:58.000000000 +0200
> +++ linux/kernel/sys.c 2009-04-07 16:43:17.000000000 +0200
> @@ -360,6 +360,7 @@
> void __user *, arg)
> {
> char buffer[256];
> + int ret = 0;
>
> /* We only trust the superuser with rebooting the system. */
> if (!capable(CAP_SYS_BOOT))
> @@ -397,7 +398,7 @@
> kernel_halt();
> unlock_kernel();
> do_exit(0);
> - break;
> + panic("cannot halt");
>
> case LINUX_REBOOT_CMD_POWER_OFF:
> kernel_power_off();
> @@ -417,29 +418,22 @@
>
> #ifdef CONFIG_KEXEC
> case LINUX_REBOOT_CMD_KEXEC:
> - {
> - int ret;
> - ret = kernel_kexec();
> - unlock_kernel();
> - return ret;
> - }
> + ret = kernel_kexec();
> + break;
> #endif
>
> #ifdef CONFIG_HIBERNATION
> case LINUX_REBOOT_CMD_SW_SUSPEND:
> - {
> - int ret = hibernate();
> - unlock_kernel();
> - return ret;
> - }
> + ret = hibernate();
> + break;
> #endif
>
> default:
> - unlock_kernel();
> - return -EINVAL;
> + ret = -EINVAL;
> + break;
> }
> unlock_kernel();
> - return 0;
> + return ret;
> }

I wonder why this code uses lock_kernel().


\
 
 \ /
  Last update: 2009-04-10 07:17    [W:0.058 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site