From 6f100596e5c666d897a3244afa445fb97ff10f80 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Tue, 20 Dec 2011 20:39:00 +0000 Subject: [PATCH] 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. Diagnosed by: Michiel Boland PR: sparc64/163460 Tested by: pho (x86), flo (sparc64) MFC after: 1 week --- sbin/fsck_ffs/fsck.h | 2 +- sbin/fsck_ffs/suj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 8091d0f9a370..4e30a7e6393b 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -268,7 +268,7 @@ char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ 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 */ diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index ec8b5ab4729a..b784519062b2 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -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); } /*