Skip to content

Commit

Permalink
whitespace fixes: compat syscalls
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Walker <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Daniel Walker authored and Linus Torvalds committed Oct 18, 2007
1 parent 9f8dbe9 commit bd3a849
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions kernel/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ asmlinkage long compat_sys_setrlimit(unsigned int resource,
int ret;
mm_segment_t old_fs = get_fs ();

if (resource >= RLIM_NLIMITS)
return -EINVAL;
if (resource >= RLIM_NLIMITS)
return -EINVAL;

if (!access_ok(VERIFY_READ, rlim, sizeof(*rlim)) ||
__get_user(r.rlim_cur, &rlim->rlim_cur) ||
Expand Down Expand Up @@ -477,21 +477,21 @@ asmlinkage long compat_sys_sched_getaffinity(compat_pid_t pid, unsigned int len,

int get_compat_itimerspec(struct itimerspec *dst,
const struct compat_itimerspec __user *src)
{
{
if (get_compat_timespec(&dst->it_interval, &src->it_interval) ||
get_compat_timespec(&dst->it_value, &src->it_value))
return -EFAULT;
return 0;
}
}

int put_compat_itimerspec(struct compat_itimerspec __user *dst,
const struct itimerspec *src)
{
{
if (put_compat_timespec(&src->it_interval, &dst->it_interval) ||
put_compat_timespec(&src->it_value, &dst->it_value))
return -EFAULT;
return 0;
}
}

long compat_sys_timer_create(clockid_t which_clock,
struct compat_sigevent __user *timer_event_spec,
Expand All @@ -512,95 +512,95 @@ long compat_sys_timer_create(clockid_t which_clock,
}

long compat_sys_timer_settime(timer_t timer_id, int flags,
struct compat_itimerspec __user *new,
struct compat_itimerspec __user *new,
struct compat_itimerspec __user *old)
{
{
long err;
mm_segment_t oldfs;
struct itimerspec newts, oldts;

if (!new)
return -EINVAL;
if (get_compat_itimerspec(&newts, new))
return -EFAULT;
return -EFAULT;
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_timer_settime(timer_id, flags,
(struct itimerspec __user *) &newts,
(struct itimerspec __user *) &oldts);
set_fs(oldfs);
set_fs(oldfs);
if (!err && old && put_compat_itimerspec(old, &oldts))
return -EFAULT;
return err;
}
}

long compat_sys_timer_gettime(timer_t timer_id,
struct compat_itimerspec __user *setting)
{
{
long err;
mm_segment_t oldfs;
struct itimerspec ts;
struct itimerspec ts;

oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_timer_gettime(timer_id,
(struct itimerspec __user *) &ts);
set_fs(oldfs);
(struct itimerspec __user *) &ts);
set_fs(oldfs);
if (!err && put_compat_itimerspec(setting, &ts))
return -EFAULT;
return err;
}
}

long compat_sys_clock_settime(clockid_t which_clock,
struct compat_timespec __user *tp)
{
long err;
mm_segment_t oldfs;
struct timespec ts;
struct timespec ts;

if (get_compat_timespec(&ts, tp))
return -EFAULT;
return -EFAULT;
oldfs = get_fs();
set_fs(KERNEL_DS);
set_fs(KERNEL_DS);
err = sys_clock_settime(which_clock,
(struct timespec __user *) &ts);
set_fs(oldfs);
return err;
}
}

long compat_sys_clock_gettime(clockid_t which_clock,
struct compat_timespec __user *tp)
{
long err;
mm_segment_t oldfs;
struct timespec ts;
struct timespec ts;

oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_gettime(which_clock,
(struct timespec __user *) &ts);
set_fs(oldfs);
if (!err && put_compat_timespec(&ts, tp))
return -EFAULT;
return -EFAULT;
return err;
}
}

long compat_sys_clock_getres(clockid_t which_clock,
struct compat_timespec __user *tp)
{
long err;
mm_segment_t oldfs;
struct timespec ts;
struct timespec ts;

oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_getres(which_clock,
(struct timespec __user *) &ts);
set_fs(oldfs);
if (!err && tp && put_compat_timespec(&ts, tp))
return -EFAULT;
return -EFAULT;
return err;
}
}

static long compat_clock_nanosleep_restart(struct restart_block *restart)
{
Expand Down Expand Up @@ -632,10 +632,10 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
{
long err;
mm_segment_t oldfs;
struct timespec in, out;
struct timespec in, out;
struct restart_block *restart;

if (get_compat_timespec(&in, rqtp))
if (get_compat_timespec(&in, rqtp))
return -EFAULT;

oldfs = get_fs();
Expand All @@ -654,8 +654,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
restart->fn = compat_clock_nanosleep_restart;
restart->arg1 = (unsigned long) rmtp;
}
return err;
}
return err;
}

/*
* We currently only need the following fields from the sigevent
Expand Down

0 comments on commit bd3a849

Please sign in to comment.