[Glibc-bsd-commits] r3020 - in trunk/ufsutils/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2010-04-12 10:09:30 +0000 (Mon, 12 Apr 2010)
New Revision: 3020

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/01_libufs.patch
Log:
Use intmax_t cast in fsbtodb() to fix aborts when making a filesystem larger than 2048 MiB. Closes: #559647.



Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2010-04-12 08:38:56 UTC (rev 3019)
+++ trunk/ufsutils/debian/changelog	2010-04-12 10:09:30 UTC (rev 3020)
@@ -2,6 +2,8 @@
 
   [ Petr Salinger ]
   * New upstream version (RELENG_7_3_0_RELEASE)
+  * Use intmax_t cast in fsbtodb() to fix aborts when 
+    making a filesystem larger than 2048 MiB. Closes: #559647.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 12 Apr 2010 10:21:23 +0200
 

Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch	2010-04-12 08:38:56 UTC (rev 3019)
+++ trunk/ufsutils/debian/patches/01_libufs.patch	2010-04-12 10:09:30 UTC (rev 3020)
@@ -36,6 +36,15 @@
  /*
   * Each disk drive contains some number of filesystems.
   * A filesystem consists of a number of cylinder groups.
+@@ -502,7 +502,7 @@
+  * Turn filesystem block numbers into disk block addresses.
+  * This maps filesystem blocks to device size blocks.
+  */
+-#define	fsbtodb(fs, b)	((daddr_t)(b) << (fs)->fs_fsbtodb)
++#define	fsbtodb(fs, b)	(((intmax_t)(b)) << (fs)->fs_fsbtodb)
+ #define	dbtofsb(fs, b)	((b) >> (fs)->fs_fsbtodb)
+ 
+ /*
 Index: ufsutils/include/ufs/ufs/dinode.h
 ===================================================================
 --- ufsutils.orig/include/ufs/ufs/dinode.h