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

Conrad Meyer cem at FreeBSD.org
Mon Nov 2 06:16:12 UTC 2020


Author: cem
Date: Mon Nov  2 06:16:11 2020
New Revision: 367267
URL: https://svnweb.freebsd.org/changeset/base/367267

Log:
  linux(4): Disambiguate identical ioctl errors in distinct paths
  
  And stop truncating the full ioctl number in the error message.
  
  Reviewed by:	emaste
  Differential Revision:	https://reviews.freebsd.org/D27048

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

Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c	Mon Nov  2 01:34:58 2020	(r367266)
+++ head/sys/compat/linux/linux_ioctl.c	Mon Nov  2 06:16:11 2020	(r367267)
@@ -275,8 +275,8 @@ linux_ioctl_hdio(struct thread *td, struct linux_ioctl
 	default:
 		/* XXX */
 		linux_msg(td,
-			"ioctl fd=%d, cmd=0x%x ('%c',%d) is not implemented",
-			args->fd, (int)(args->cmd & 0xffff),
+			"%s fd=%d, cmd=0x%x ('%c',%d) is not implemented",
+			__func__, args->fd, args->cmd,
 			(int)(args->cmd & 0xff00) >> 8,
 			(int)(args->cmd & 0xff));
 		break;
@@ -3670,8 +3670,8 @@ linux_ioctl_fallback(struct thread *td, struct linux_i
 		return (ENOTSUP);
 
 	default:
-		linux_msg(td, "ioctl fd=%d, cmd=0x%x ('%c',%d) is not implemented",
-		    args->fd, (int)(args->cmd & 0xffff),
+		linux_msg(td, "%s fd=%d, cmd=0x%x ('%c',%d) is not implemented",
+		    __func__, args->fd, args->cmd,
 		    (int)(args->cmd & 0xff00) >> 8, (int)(args->cmd & 0xff));
 		break;
 	}


More information about the svn-src-all mailing list