Date: Wed, 2 Aug 2017 12:23:22 +0200 From: Hans Petter Selasky <hps@selasky.org> To: Konstantin Belousov <kib@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r321920 - head/sys/sys Message-ID: <50d380b1-806a-6114-7324-e4cd3d6a2b2f@selasky.org> In-Reply-To: <201708021014.v72AEHEk061037@repo.freebsd.org> References: <201708021014.v72AEHEk061037@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 08/02/17 12:14, Konstantin Belousov wrote: > 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@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 Hi, This change looks like it affects user-space applications? Why is not the FreeBSD version number bumped? --HPS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50d380b1-806a-6114-7324-e4cd3d6a2b2f>