svn commit: r296502 - head/sys/compat/linux

Dmitry Chagin dchagin at FreeBSD.org
Tue Mar 8 15:12:51 UTC 2016


Author: dchagin
Date: Tue Mar  8 15:12:49 2016
New Revision: 296502
URL: https://svnweb.freebsd.org/changeset/base/296502

Log:
  According to POSIX and Linux implementation the alarm() system call
  is always successfull.
  So, ignore any errors and return 0 as a Linux do.
  
  XXX. Unlike POSIX, Linux in case when the invalid seconds value specified
  always return 0, so in that case Linux does not return proper remining time.
  
  MFC after:	1 week

Modified:
  head/sys/compat/linux/linux_misc.c

Modified: head/sys/compat/linux/linux_misc.c
==============================================================================
--- head/sys/compat/linux/linux_misc.c	Tue Mar  8 15:08:22 2016	(r296501)
+++ head/sys/compat/linux/linux_misc.c	Tue Mar  8 15:12:49 2016	(r296502)
@@ -191,7 +191,6 @@ linux_alarm(struct thread *td, struct li
 {
 	struct itimerval it, old_it;
 	u_int secs;
-	int error;
 
 #ifdef DEBUG
 	if (ldebug(alarm))
@@ -207,9 +206,7 @@ linux_alarm(struct thread *td, struct li
 	it.it_value.tv_usec = 0;
 	it.it_interval.tv_sec = 0;
 	it.it_interval.tv_usec = 0;
-	error = kern_setitimer(td, ITIMER_REAL, &it, &old_it);
-	if (error)
-		return (error);
+	kern_setitimer(td, ITIMER_REAL, &it, &old_it);
 	if (timevalisset(&old_it.it_value)) {
 		if (old_it.it_value.tv_usec != 0)
 			old_it.it_value.tv_sec++;


More information about the svn-src-head mailing list