git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd: track last inode only in use_wgather case
[safe/jmp/linux-2.6]
/
kernel
/
sys.c
diff --git
a/kernel/sys.c
b/kernel/sys.c
index
ce182aa
..
e7998cf
100644
(file)
--- a/
kernel/sys.c
+++ b/
kernel/sys.c
@@
-360,6
+360,7
@@
SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
void __user *, arg)
{
char buffer[256];
void __user *, arg)
{
char buffer[256];
+ int ret = 0;
/* We only trust the superuser with rebooting the system. */
if (!capable(CAP_SYS_BOOT))
/* We only trust the superuser with rebooting the system. */
if (!capable(CAP_SYS_BOOT))
@@
-397,7
+398,7
@@
SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
kernel_halt();
unlock_kernel();
do_exit(0);
kernel_halt();
unlock_kernel();
do_exit(0);
-
break
;
+
panic("cannot halt")
;
case LINUX_REBOOT_CMD_POWER_OFF:
kernel_power_off();
case LINUX_REBOOT_CMD_POWER_OFF:
kernel_power_off();
@@
-417,29
+418,22
@@
SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
#ifdef CONFIG_KEXEC
case LINUX_REBOOT_CMD_KEXEC:
#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:
#endif
#ifdef CONFIG_HIBERNATION
case LINUX_REBOOT_CMD_SW_SUSPEND:
- {
- int ret = hibernate();
- unlock_kernel();
- return ret;
- }
+ ret = hibernate();
+ break;
#endif
default:
#endif
default:
-
unlock_kernel()
;
-
return -EINVAL
;
+
ret = -EINVAL
;
+
break
;
}
unlock_kernel();
}
unlock_kernel();
- return
0
;
+ return
ret
;
}
static void deferred_cad(struct work_struct *dummy)
}
static void deferred_cad(struct work_struct *dummy)
@@
-1014,10
+1008,8
@@
SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid)
if (err)
goto out;
if (err)
goto out;
- if (task_pgrp(p) != pgrp)
{
+ if (task_pgrp(p) != pgrp)
change_pid(p, PIDTYPE_PGID, pgrp);
change_pid(p, PIDTYPE_PGID, pgrp);
- set_task_pgrp(p, pid_nr(pgrp));
- }
err = 0;
out:
err = 0;
out: