svn commit: r254326 - head/sys/fs/ext2fs

[Pedro F. Giffuni]

Author: pfg
Date: Wed Aug 14 14:22:46 2013
New Revision: 254326
URL: http://svnweb.freebsd.org/changeset/base/254326

Log:
  ext2fs: update format specifiers for ext4 type.
  
  Previous bandaid was not appropriate and didn't really work for
  all platforms. While here, cleanup the surrounding code to match
  ffs_checkoverlap()
  
  Reported by:	dim, jmallet and bde
  MFC after:	3 weeks

Modified:
  head/sys/fs/ext2fs/ext2_subr.c

Modified: head/sys/fs/ext2fs/ext2_subr.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_subr.c	Wed Aug 14 12:43:01 2013	(r254325)
+++ head/sys/fs/ext2fs/ext2_subr.c	Wed Aug 14 14:22:46 2013	(r254326)
@@ -150,10 +150,10 @@ ext2_checkoverlap(struct buf *bp, struct
 		    ep->b_blkno + btodb(ep->b_bcount) <= start)
 			continue;
 		vprint("Disk overlap", vp);
-		(void)printf("\tstart %ld, end %ld overlap start %lld, end %ld\n",
-			start, last, (long long)ep->b_blkno,
-			(long)(ep->b_blkno + btodb(ep->b_bcount) - 1));
-		panic("Disk buffer overlap");
+		printf("\tstart %jd, end %jd overlap start %jd, end %jd\n",
+		    (intmax_t)start, (intmax_t)last, (intmax_t)ep->b_blkno,
+		    (intmax_t)(ep->b_blkno + btodb(ep->b_bcount) - 1));
+		panic("ext2_checkoverlap: Disk buffer overlap");
 	}
 }
 #endif /* KDB */