d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change major()/minor() to work with 64bit dev_t.

Browse Source 
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@gmail.com>
PR:	221048
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2017-08-02 10:14:17 +00:00
parent 6632a4330f
commit 5dd371944e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/sys/types.h
View File

@ -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