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

[Dmitry Chagin]

Author: dchagin
Date: Sun May 24 17:30:31 2015
New Revision: 283464
URL: https://svnweb.freebsd.org/changeset/base/283464

Log:
  Delete the duplicate of linux_to_native_clockid() function.
  
  Differential Revision:	https://reviews.freebsd.org/D1521
  Reviewed by:	trasz

Modified:
  head/sys/compat/linux/linux_time.c
  head/sys/compat/linux/linux_timer.c
  head/sys/compat/linux/linux_timer.h

Modified: head/sys/compat/linux/linux_time.c
==============================================================================
--- head/sys/compat/linux/linux_time.c	Sun May 24 17:29:18 2015	(r283463)
+++ head/sys/compat/linux/linux_time.c	Sun May 24 17:30:31 2015	(r283464)
@@ -119,8 +119,6 @@ LIN_SDT_PROBE_DEFINE1(time, linux_clock_
 LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, unsupported_clockid, "int");
 LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, return, "int");
 
-static int linux_to_native_clockid(clockid_t *, clockid_t);
-
 
 void
 native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp)
@@ -151,7 +149,7 @@ linux_to_native_timespec(struct timespec
 	return (0);
 }
 
-static int
+int
 linux_to_native_clockid(clockid_t *n, clockid_t l)
 {
 

Modified: head/sys/compat/linux/linux_timer.c
==============================================================================
--- head/sys/compat/linux/linux_timer.c	Sun May 24 17:29:18 2015	(r283463)
+++ head/sys/compat/linux/linux_timer.c	Sun May 24 17:30:31 2015	(r283464)
@@ -49,23 +49,6 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <compat/linux/linux_timer.h>
 
-static int
-linux_convert_l_clockid(clockid_t *clock_id)
-{
-
-	switch (*clock_id) {
-	case LINUX_CLOCK_REALTIME:
-		*clock_id = CLOCK_REALTIME;
-		break;
-	case LINUX_CLOCK_MONOTONIC:
-		*clock_id = CLOCK_MONOTONIC;
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	return (0);
-}
 
 static int
 linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig)
@@ -106,6 +89,7 @@ linux_timer_create(struct thread *td, st
 {
 	struct l_sigevent l_ev;
 	struct sigevent ev, *evp;
+	clockid_t nwhich;
 	int error, id;
 
 	if (uap->evp == NULL) {
@@ -119,10 +103,10 @@ linux_timer_create(struct thread *td, st
 			return (error);
 		evp = &ev;
 	}
-	error = linux_convert_l_clockid(&uap->clock_id);
+	error = linux_to_native_clockid(&nwhich, uap->clock_id);
 	if (error != 0)
 		return (error);
-	error = kern_ktimer_create(td, uap->clock_id, evp, &id, -1);
+	error = kern_ktimer_create(td, nwhich, evp, &id, -1);
 	if (error == 0) {
 		error = copyout(&id, uap->timerid, sizeof(int));
 		if (error != 0)
@@ -179,4 +163,3 @@ linux_timer_delete(struct thread *td, st
 
 	return (kern_ktimer_delete(td, uap->timerid));
 }
-

Modified: head/sys/compat/linux/linux_timer.h
==============================================================================
--- head/sys/compat/linux/linux_timer.h	Sun May 24 17:29:18 2015	(r283463)
+++ head/sys/compat/linux/linux_timer.h	Sun May 24 17:30:31 2015	(r283464)
@@ -115,5 +115,6 @@ void native_to_linux_timespec(struct l_t
 				     struct timespec *);
 int linux_to_native_timespec(struct timespec *,
 				     struct l_timespec *);
+int linux_to_native_clockid(clockid_t *, clockid_t);
 
 #endif	/* _LINUX_TIMER_H */