[PATCH] Clean up sys_shutdown

From: Andi Kleen
Date: Tue Apr 07 2009 - 18:36:40 EST


Clean up sys_shutdown exit path

Impact: cleanup, fix

Clean up sys_shutdown exit path. Factor out common code. Return
correct error code instead of always 0 on failure.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>

---
kernel/sys.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)

Index: linux/kernel/sys.c
===================================================================
--- 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;
}

static void deferred_cad(struct work_struct *dummy)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/