svn commit: r321920 - head/sys/sys

[Konstantin Belousov]

Author: kib
Date: Wed Aug  2 10:14:17 2017
New Revision: 321920
URL: https://svnweb.freebsd.org/changeset/base/321920

Log:
  Change major()/minor() to work with 64bit dev_t.
  
  Since traditional types for the macros values are int, remove the
  cookie trick and just split the dev_t at the word boundary.
  
  Reported by:	Victor Stinner <victor.stinner at gmail.com>
  PR:	221048
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/sys/types.h

Modified: head/sys/sys/types.h
==============================================================================
--- head/sys/sys/types.h	Wed Aug  2 10:12:10 2017	(r321919)
+++ head/sys/sys/types.h	Wed Aug  2 10:14:17 2017	(r321920)
@@ -364,14 +364,9 @@ __bitcount64(__uint64_t _x)
 
 #include <sys/select.h>
 
-/*
- * minor() gives a cookie instead of an index since we don't want to
- * change the meanings of bits 0-15 or waste time and space shifting
- * bits 16-31 for devices that don't use them.
- */
-#define	major(x)	((int)(((u_int)(x) >> 8)&0xff))	/* major number */
-#define	minor(x)	((int)((x)&0xffff00ff))		/* minor number */
-#define	makedev(x,y)	((dev_t)(((x) << 8) | (y)))	/* create dev_t */
+#define	major(x)	((int)((dev_t)(x) >> 32))	/* major number */
+#define	minor(x)	((int)((x) & 0xffffffff))	/* minor number */
+#define	makedev(x, y)	(((dev_t)(x) << 32) | (y))	/* create dev_t */
 
 /*
  * These declarations belong elsewhere, but are repeated here and in