svn commit: r229256 - stable/9/sbin/fsck_ffs

[Konstantin Belousov]

Author: kib
Date: Mon Jan  2 00:04:51 2012
New Revision: 229256
URL: http://svn.freebsd.org/changeset/base/229256

Log:
  MFC r228751:
  Change the type of real_dev_bsize variable from long to u_int.
  The DIOCGSECTORSIZE takes u_int * as an argument, using long *
  causes failures on big-endian targets.
  
  PR:	sparc64/163460

Modified:
  stable/9/sbin/fsck_ffs/fsck.h
  stable/9/sbin/fsck_ffs/suj.c
Directory Properties:
  stable/9/sbin/fsck_ffs/   (props changed)

Modified: stable/9/sbin/fsck_ffs/fsck.h
==============================================================================
--- stable/9/sbin/fsck_ffs/fsck.h	Mon Jan  2 00:02:50 2012	(r229255)
+++ stable/9/sbin/fsck_ffs/fsck.h	Mon Jan  2 00:04:51 2012	(r229256)
@@ -268,7 +268,7 @@ char	snapname[BUFSIZ];	/* when doing sna
 char	*cdevname;		/* name of device being checked */
 long	dev_bsize;		/* computed value of DEV_BSIZE */
 long	secsize;		/* actual disk sector size */
-long	real_dev_bsize;
+u_int	real_dev_bsize;		/* actual disk sector size, not overriden */
 char	nflag;			/* assume a no response */
 char	yflag;			/* assume a yes response */
 int	bkgrdflag;		/* use a snapshot to run on an active system */

Modified: stable/9/sbin/fsck_ffs/suj.c
==============================================================================
--- stable/9/sbin/fsck_ffs/suj.c	Mon Jan  2 00:02:50 2012	(r229255)
+++ stable/9/sbin/fsck_ffs/suj.c	Mon Jan  2 00:04:51 2012	(r229256)
@@ -206,7 +206,7 @@ opendisk(const char *devnam)
 	    &real_dev_bsize) == -1)
 		real_dev_bsize = secsize;
 	if (debug)
-		printf("dev_bsize %ld\n", real_dev_bsize);
+		printf("dev_bsize %u\n", real_dev_bsize);
 }
 
 /*