Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Oct 2014 17:26:30 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r272832 - head/sys/ufs/ufs
Message-ID:  <201410091726.s99HQU54004194@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Oct  9 17:26:29 2014
New Revision: 272832
URL: https://svnweb.freebsd.org/changeset/base/272832

Log:
  Backout r272825 every useland usage of ufs/ufs/dir.h are now broken with that change

Modified:
  head/sys/ufs/ufs/dir.h

Modified: head/sys/ufs/ufs/dir.h
==============================================================================
--- head/sys/ufs/ufs/dir.h	Thu Oct  9 16:48:42 2014	(r272831)
+++ head/sys/ufs/ufs/dir.h	Thu Oct  9 17:26:29 2014	(r272832)
@@ -110,7 +110,7 @@ struct	direct {
  * 
  */
 #define	DIRECTSIZ(namlen)						\
-	((offsetof(struct direct, d_name) +			\
+	(((uintptr_t)&((struct direct *)0)->d_name +			\
 	  ((namlen)+1)*sizeof(((struct direct *)0)->d_name[0]) + 3) & ~3)
 #if (BYTE_ORDER == LITTLE_ENDIAN)
 #define	DIRSIZ(oldfmt, dp) \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410091726.s99HQU54004194>