Module Name: src
Committed By: dholland
Date: Sun Aug 2 18:10:08 UTC 2015
Modified Files:
src/libexec/lfs_cleanerd: cleaner.h lfs_cleanerd.c
src/sbin/fsck_lfs: lfs.c setup.c
src/sbin/newfs_lfs: make_lfs.c
src/sys/ufs/lfs: lfs.h lfs_accessors.h lfs_debug.c lfs_extern.h
lfs_pages.c lfs_segment.c lfs_vfsops.c
src/usr.sbin/dumplfs: dumplfs.c
Log Message:
Second batch of 64 -> 32 truncations in lfs, along with more minor
tidyups and corrections in passing.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/libexec/lfs_cleanerd/cleaner.h
cvs rdiff -u -r1.41 -r1.42 src/libexec/lfs_cleanerd/lfs_cleanerd.c
cvs rdiff -u -r1.49 -r1.50 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.35 -r1.36 src/sbin/newfs_lfs/make_lfs.c
cvs rdiff -u -r1.168 -r1.169 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/lfs/lfs_accessors.h
cvs rdiff -u -r1.47 -r1.48 src/sys/ufs/lfs/lfs_debug.c
cvs rdiff -u -r1.105 -r1.106 src/sys/ufs/lfs/lfs_extern.h
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/lfs/lfs_pages.c
cvs rdiff -u -r1.245 -r1.246 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.330 -r1.331 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/dumplfs/dumplfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/lfs_cleanerd/cleaner.h
diff -u src/libexec/lfs_cleanerd/cleaner.h:1.9 src/libexec/lfs_cleanerd/cleaner.h:1.10
--- src/libexec/lfs_cleanerd/cleaner.h:1.9 Tue Jul 28 05:14:23 2015
+++ src/libexec/lfs_cleanerd/cleaner.h Sun Aug 2 18:10:07 2015
@@ -63,7 +63,6 @@ int invalidate_segment(struct clfs *, in
void lfs_ientry(IFILE **, struct clfs *, ino_t, struct ubuf **);
int load_segment(struct clfs *, int, BLOCK_INFO **, int *);
int needs_cleaning(struct clfs *, CLEANERINFO *);
-int32_t parse_pseg(struct clfs *, daddr_t, BLOCK_INFO **, int *);
int reinit_fs(struct clfs *);
void reload_ifile(struct clfs *);
void toss_old_blocks(struct clfs *, BLOCK_INFO **, int *, int *);
Index: src/libexec/lfs_cleanerd/lfs_cleanerd.c
diff -u src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.41 src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.42
--- src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.41 Tue Jul 28 05:14:23 2015
+++ src/libexec/lfs_cleanerd/lfs_cleanerd.c Sun Aug 2 18:10:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.41 2015/07/28 05:14:23 dholland Exp $ */
+/* $NetBSD: lfs_cleanerd.c,v 1.42 2015/08/02 18:10:07 dholland Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -380,13 +380,14 @@ check_test_pattern(BLOCK_INFO *bip)
* Parse the partial segment at daddr, adding its information to
* bip. Return the address of the next partial segment to read.
*/
-int32_t
+static daddr_t
parse_pseg(struct clfs *fs, daddr_t daddr, BLOCK_INFO **bipp, int *bic)
{
SEGSUM *ssp;
IFILE *ifp;
BLOCK_INFO *bip, *nbip;
- int32_t *iaddrp, idaddr, odaddr;
+ int32_t *iaddrp;
+ daddr_t idaddr, odaddr;
FINFO *fip;
struct ubuf *ifbp;
struct ulfs1_dinode *dip;
@@ -405,6 +406,7 @@ parse_pseg(struct clfs *fs, daddr_t dadd
*/
cp = fd_ptrget(fs->clfs_devvp, daddr);
ssp = (SEGSUM *)cp;
+ /* XXX ondisk32 */
iaddrp = ((int32_t *)(cp + lfs_sb_getibsize(fs))) - 1;
fip = (FINFO *)(cp + sizeof(SEGSUM));
@@ -412,16 +414,16 @@ parse_pseg(struct clfs *fs, daddr_t dadd
* Check segment header magic and checksum
*/
if (ssp->ss_magic != SS_MAGIC) {
- syslog(LOG_WARNING, "%s: sumsum magic number bad at 0x%x:"
+ syslog(LOG_WARNING, "%s: sumsum magic number bad at 0x%jx:"
" read 0x%x, expected 0x%x", lfs_sb_getfsmnt(fs),
- (int32_t)daddr, ssp->ss_magic, SS_MAGIC);
+ (intmax_t)daddr, ssp->ss_magic, SS_MAGIC);
return 0x0;
}
ck = cksum(&ssp->ss_datasum, lfs_sb_getsumsize(fs) - sizeof(ssp->ss_sumsum));
if (ck != ssp->ss_sumsum) {
- syslog(LOG_WARNING, "%s: sumsum checksum mismatch at 0x%x:"
+ syslog(LOG_WARNING, "%s: sumsum checksum mismatch at 0x%jx:"
" read 0x%x, computed 0x%x", lfs_sb_getfsmnt(fs),
- (int32_t)daddr, ssp->ss_sumsum, ck);
+ (intmax_t)daddr, ssp->ss_sumsum, ck);
return 0x0;
}
@@ -443,8 +445,8 @@ parse_pseg(struct clfs *fs, daddr_t dadd
* If we don't have either one, it's an error.
*/
if (fic >= ssp->ss_nfinfo && *iaddrp != daddr) {
- syslog(LOG_WARNING, "%s: bad pseg at %x (seg %d)",
- lfs_sb_getfsmnt(fs), odaddr, lfs_dtosn(fs, odaddr));
+ syslog(LOG_WARNING, "%s: bad pseg at %jx (seg %d)",
+ lfs_sb_getfsmnt(fs), (intmax_t)odaddr, lfs_dtosn(fs, odaddr));
*bipp = bip;
return 0x0;
}
@@ -517,8 +519,8 @@ parse_pseg(struct clfs *fs, daddr_t dadd
struct ubuf *nbp;
SEGSUM *nssp;
- syslog(LOG_WARNING, "fixing short FINFO at %x (seg %d)",
- odaddr, lfs_dtosn(fs, odaddr));
+ syslog(LOG_WARNING, "fixing short FINFO at %jx (seg %d)",
+ (intmax_t)odaddr, lfs_dtosn(fs, odaddr));
bread(fs->clfs_devvp, odaddr, lfs_sb_getfsize(fs),
0, &nbp);
nssp = (SEGSUM *)nbp->b_data;
@@ -527,8 +529,8 @@ parse_pseg(struct clfs *fs, daddr_t dadd
lfs_sb_getsumsize(fs) - sizeof(nssp->ss_sumsum));
bwrite(nbp);
#endif
- syslog(LOG_WARNING, "zero-length FINFO at %x (seg %d)",
- odaddr, lfs_dtosn(fs, odaddr));
+ syslog(LOG_WARNING, "zero-length FINFO at %jx (seg %d)",
+ (intmax_t)odaddr, lfs_dtosn(fs, odaddr));
continue;
}
@@ -590,8 +592,9 @@ parse_pseg(struct clfs *fs, daddr_t dadd
#ifndef REPAIR_ZERO_FINFO
if (ssp->ss_datasum != ck) {
- syslog(LOG_WARNING, "%s: data checksum bad at 0x%x:"
- " read 0x%x, computed 0x%x", lfs_sb_getfsmnt(fs), odaddr,
+ syslog(LOG_WARNING, "%s: data checksum bad at 0x%jx:"
+ " read 0x%x, computed 0x%x", lfs_sb_getfsmnt(fs),
+ (intmax_t)odaddr,
ssp->ss_datasum, ck);
*bic = obic;
return 0x0;
@@ -637,7 +640,7 @@ log_segment_read(struct clfs *fs, int sn
int
load_segment(struct clfs *fs, int sn, BLOCK_INFO **bipp, int *bic)
{
- int32_t daddr;
+ daddr_t daddr;
int i, npseg;
daddr = lfs_sntod(fs, sn);
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.49 src/sbin/fsck_lfs/lfs.c:1.50
--- src/sbin/fsck_lfs/lfs.c:1.49 Sun Aug 2 18:08:12 2015
+++ src/sbin/fsck_lfs/lfs.c Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.49 2015/08/02 18:08:12 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.50 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -644,7 +644,7 @@ try_verify(struct lfs *osb, struct uvnod
break;
}
if (debug)
- pwarn("summary good: 0x%x/%d\n", (int)daddr,
+ pwarn("summary good: 0x%x/%d\n", (uintmax_t)daddr,
(int)sp->ss_serial);
assert (bc > 0);
odaddr = daddr;
@@ -818,15 +818,15 @@ check_summary(struct lfs *fs, SEGSUM *sp
}
if (datac != nblocks) {
- pwarn("Partial segment at 0x%llx expected %d blocks counted %d\n",
- (long long) pseg_addr, nblocks, datac);
+ pwarn("Partial segment at 0x%jx expected %d blocks counted %d\n",
+ (intmax_t)pseg_addr, nblocks, datac);
}
ccksum = cksum(datap, nblocks * sizeof(u_int32_t));
/* Check the data checksum */
if (ccksum != sp->ss_datasum) {
- pwarn("Partial segment at 0x%" PRIx32 " data checksum"
+ pwarn("Partial segment at 0x%jx data checksum"
" mismatch: given 0x%x, computed 0x%x\n",
- pseg_addr, sp->ss_datasum, ccksum);
+ (uintmax_t)pseg_addr, sp->ss_datasum, ccksum);
free(datap);
return 0;
}
Index: src/sbin/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.50 src/sbin/fsck_lfs/setup.c:1.51
--- src/sbin/fsck_lfs/setup.c:1.50 Sun Aug 2 17:56:24 2015
+++ src/sbin/fsck_lfs/setup.c Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.50 2015/08/02 17:56:24 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.51 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
#include "fsutil.h"
extern u_int32_t cksum(void *, size_t);
-static uint64_t calcmaxfilesize(int);
+static uint64_t calcmaxfilesize(unsigned);
ulfs_daddr_t *din_table;
SEGUSE *seg_table;
@@ -118,11 +118,12 @@ useless(void)
* calculate the maximum file size allowed with the specified block shift.
*/
static uint64_t
-calcmaxfilesize(int bshift)
+calcmaxfilesize(unsigned bshift)
{
uint64_t nptr; /* number of block pointers per block */
uint64_t maxblock;
+ /* XXX ondisk32 */
nptr = (1 << bshift) / sizeof(uint32_t);
maxblock = ULFS_NDADDR + nptr + nptr * nptr + nptr * nptr * nptr;
@@ -237,8 +238,8 @@ setup(const char *dev)
int bc;
if (debug)
- pwarn("adjusting offset, serial for -i 0x%lx\n",
- (unsigned long)idaddr);
+ pwarn("adjusting offset, serial for -i 0x%jx\n",
+ (uintmax_t)idaddr);
tdaddr = lfs_sntod(fs, lfs_dtosn(fs, idaddr));
if (lfs_sntod(fs, lfs_dtosn(fs, tdaddr)) == tdaddr) {
if (tdaddr == lfs_sb_gets0addr(fs))
@@ -265,8 +266,8 @@ setup(const char *dev)
sizeof(sp->ss_sumsum))) {
brelse(bp, 0);
if (debug)
- printf("bad cksum at %x\n",
- (unsigned)tdaddr);
+ printf("bad cksum at %jx\n",
+ (uintmax_t)tdaddr);
break;
}
fp = (FINFO *)(sp + 1);
@@ -311,9 +312,9 @@ setup(const char *dev)
++fs->lfs_nactive;
lfs_sb_setnextseg(fs, lfs_sntod(fs, sn));
if (debug) {
- pwarn("offset = 0x%" PRIx32 ", serial = %" PRIu64 "\n",
+ pwarn("offset = 0x%" PRIx64 ", serial = %" PRIu64 "\n",
lfs_sb_getoffset(fs), lfs_sb_getserial(fs));
- pwarn("curseg = %" PRIx32 ", nextseg = %" PRIx32 "\n",
+ pwarn("curseg = %" PRIx64 ", nextseg = %" PRIx64 "\n",
lfs_sb_getcurseg(fs), lfs_sb_getnextseg(fs));
}
@@ -381,9 +382,9 @@ setup(const char *dev)
}
if (lfs_sb_getmaxfilesize(fs) != maxfilesize) {
pwarn(
- "INCORRECT MAXFILESIZE=%llu IN SUPERBLOCK (SHOULD BE %llu WITH BSHIFT %u)",
- (unsigned long long) lfs_sb_getmaxfilesize(fs),
- (unsigned long long) maxfilesize, lfs_sb_getbshift(fs));
+ "INCORRECT MAXFILESIZE=%ju IN SUPERBLOCK (SHOULD BE %ju WITH BSHIFT %u)",
+ (uintmax_t) lfs_sb_getmaxfilesize(fs),
+ (uintmax_t) maxfilesize, lfs_sb_getbshift(fs));
if (preen)
printf(" (FIXED)\n");
if (preen || reply("FIX") == 1) {
Index: src/sbin/newfs_lfs/make_lfs.c
diff -u src/sbin/newfs_lfs/make_lfs.c:1.35 src/sbin/newfs_lfs/make_lfs.c:1.36
--- src/sbin/newfs_lfs/make_lfs.c:1.35 Sun Aug 2 18:08:12 2015
+++ src/sbin/newfs_lfs/make_lfs.c Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: make_lfs.c,v 1.35 2015/08/02 18:08:12 dholland Exp $ */
+/* $NetBSD: make_lfs.c,v 1.36 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: make_lfs.c,v 1.35 2015/08/02 18:08:12 dholland Exp $");
+__RCSID("$NetBSD: make_lfs.c,v 1.36 2015/08/02 18:10:08 dholland Exp $");
#endif
#endif /* not lint */
@@ -209,6 +209,7 @@ maxfilesize(int bshift)
uint64_t nptr; /* number of block pointers per block */
uint64_t maxblock;
+ /* XXX ondisk32 */
nptr = (1 << bshift) / sizeof(uint32_t);
maxblock = ULFS_NDADDR + nptr + nptr * nptr + nptr * nptr * nptr;
Index: src/sys/ufs/lfs/lfs.h
diff -u src/sys/ufs/lfs/lfs.h:1.168 src/sys/ufs/lfs/lfs.h:1.169
--- src/sys/ufs/lfs/lfs.h:1.168 Sun Aug 2 18:08:13 2015
+++ src/sys/ufs/lfs/lfs.h Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.168 2015/08/02 18:08:13 dholland Exp $ */
+/* $NetBSD: lfs.h,v 1.169 2015/08/02 18:10:08 dholland Exp $ */
/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
/* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */
@@ -554,7 +554,7 @@ struct segsum {
u_int32_t ss_sumsum; /* 0: check sum of summary block */
u_int32_t ss_datasum; /* 4: check sum of data */
u_int32_t ss_magic; /* 8: segment summary magic number */
- int32_t ss_next; /* 12: next segment */
+ int32_t ss_next; /* 12: next segment (disk address) */
u_int32_t ss_ident; /* 16: roll-forward fsid */
#define ss_ocreate ss_ident /* ident is where create was in v1 */
u_int16_t ss_nfinfo; /* 20: number of file info structures */
@@ -587,7 +587,7 @@ struct dlfs {
u_int32_t dlfs_frag; /* 28: number of frags in a block in fs */
/* Checkpoint region. */
- u_int32_t dlfs_freehd; /* 32: start of the free list */
+ u_int32_t dlfs_freehd; /* 32: start of the free inode list */
int32_t dlfs_bfree; /* 36: number of free frags */
u_int32_t dlfs_nfiles; /* 40: number of allocated inodes */
int32_t dlfs_avail; /* 44: blocks available for writing */
@@ -730,7 +730,7 @@ struct lfs {
int lfs_wrappass; /* Allow first log wrap requester to pass */
int lfs_wrapstatus; /* Wrap status */
int lfs_reclino; /* Inode being reclaimed */
- int lfs_startseg; /* Segment we started writing at */
+ daddr_t lfs_startseg; /* Segment we started writing at */
LIST_HEAD(, segdelta) lfs_segdhd; /* List of pending trunc accounting events */
#ifdef _KERNEL
Index: src/sys/ufs/lfs/lfs_accessors.h
diff -u src/sys/ufs/lfs/lfs_accessors.h:1.4 src/sys/ufs/lfs/lfs_accessors.h:1.5
--- src/sys/ufs/lfs/lfs_accessors.h:1.4 Sun Aug 2 18:08:13 2015
+++ src/sys/ufs/lfs/lfs_accessors.h Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_accessors.h,v 1.4 2015/08/02 18:08:13 dholland Exp $ */
+/* $NetBSD: lfs_accessors.h,v 1.5 2015/08/02 18:10:08 dholland Exp $ */
/* from NetBSD: lfs.h,v 1.165 2015/07/24 06:59:32 dholland Exp */
/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
@@ -427,13 +427,13 @@ LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_
LFS_DEF_SB_ACCESSOR(u_int32_t, nfiles);
LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, avail);
LFS_DEF_SB_ACCESSOR(int32_t, uinodes);
-LFS_DEF_SB_ACCESSOR(int32_t, idaddr);
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, idaddr);
LFS_DEF_SB_ACCESSOR(u_int32_t, ifile);
-LFS_DEF_SB_ACCESSOR(int32_t, lastseg);
-LFS_DEF_SB_ACCESSOR(int32_t, nextseg);
-LFS_DEF_SB_ACCESSOR(int32_t, curseg);
-LFS_DEF_SB_ACCESSOR(int32_t, offset);
-LFS_DEF_SB_ACCESSOR(int32_t, lastpseg);
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, lastseg);
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, nextseg);
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, curseg);
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, offset);
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, lastpseg);
LFS_DEF_SB_ACCESSOR(u_int32_t, inopf);
LFS_DEF_SB_ACCESSOR(u_int32_t, minfree);
LFS_DEF_SB_ACCESSOR(uint64_t, maxfilesize);
@@ -466,7 +466,7 @@ LFS_DEF_SB_ACCESSOR(u_int32_t, minfreese
LFS_DEF_SB_ACCESSOR(u_int32_t, sumsize);
LFS_DEF_SB_ACCESSOR(u_int64_t, serial);
LFS_DEF_SB_ACCESSOR(u_int32_t, ibsize);
-LFS_DEF_SB_ACCESSOR(int32_t, s0addr);
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, s0addr);
LFS_DEF_SB_ACCESSOR(u_int64_t, tstamp);
LFS_DEF_SB_ACCESSOR(u_int32_t, inodefmt);
LFS_DEF_SB_ACCESSOR(u_int32_t, interleave);
Index: src/sys/ufs/lfs/lfs_debug.c
diff -u src/sys/ufs/lfs/lfs_debug.c:1.47 src/sys/ufs/lfs/lfs_debug.c:1.48
--- src/sys/ufs/lfs/lfs_debug.c:1.47 Sun Aug 2 18:08:13 2015
+++ src/sys/ufs/lfs/lfs_debug.c Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_debug.c,v 1.47 2015/08/02 18:08:13 dholland Exp $ */
+/* $NetBSD: lfs_debug.c,v 1.48 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_debug.c,v 1.47 2015/08/02 18:08:13 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_debug.c,v 1.48 2015/08/02 18:10:08 dholland Exp $");
#ifdef DEBUG
@@ -162,29 +162,29 @@ lfs_dump_super(struct lfs *lfsp)
"fbmask ", (unsigned long)lfs_sb_getfbmask(lfsp),
"fbshift ", lfs_sb_getfbshift(lfsp));
- printf("%s%d\t%s%d\t%s%x\t%s%qx\n",
+ printf("%s%d\t%s%d\t%s%x\t%s%jx\n",
"sushift ", lfs_sb_getsushift(lfsp),
"fsbtodb ", lfs_sb_getfsbtodb(lfsp),
"cksum ", lfs_sb_getcksum(lfsp),
- "maxfilesize ", (long long)lfs_sb_getmaxfilesize(lfsp));
+ "maxfilesize ", (uintmax_t)lfs_sb_getmaxfilesize(lfsp));
printf("Superblock disk addresses:");
for (i = 0; i < LFS_MAXNUMSB; i++)
- printf(" %x", lfs_sb_getsboff(lfsp, i));
+ printf(" %jx", (intmax_t)lfs_sb_getsboff(lfsp, i));
printf("\n");
printf("Checkpoint Info\n");
- printf("%s%d\t%s%x\t%s%d\n",
+ printf("%s%d\t%s%jx\t%s%d\n",
"freehd ", lfs_sb_getfreehd(lfsp),
- "idaddr ", lfs_sb_getidaddr(lfsp),
+ "idaddr ", (intmax_t)lfs_sb_getidaddr(lfsp),
"ifile ", lfs_sb_getifile(lfsp));
- printf("%s%jx\t%s%d\t%s%x\t%s%x\t%s%x\t%s%x\n",
+ printf("%s%jx\t%s%d\t%s%jx\t%s%jx\t%s%jx\t%s%jx\n",
"bfree ", (intmax_t)lfs_sb_getbfree(lfsp),
"nfiles ", lfs_sb_getnfiles(lfsp),
- "lastseg ", lfs_sb_getlastseg(lfsp),
- "nextseg ", lfs_sb_getnextseg(lfsp),
- "curseg ", lfs_sb_getcurseg(lfsp),
- "offset ", lfs_sb_getoffset(lfsp));
+ "lastseg ", (intmax_t)lfs_sb_getlastseg(lfsp),
+ "nextseg ", (intmax_t)lfs_sb_getnextseg(lfsp),
+ "curseg ", (intmax_t)lfs_sb_getcurseg(lfsp),
+ "offset ", (intmax_t)lfs_sb_getoffset(lfsp));
printf("tstamp %llx\n", (long long)lfs_sb_gettstamp(lfsp));
}
Index: src/sys/ufs/lfs/lfs_extern.h
diff -u src/sys/ufs/lfs/lfs_extern.h:1.105 src/sys/ufs/lfs/lfs_extern.h:1.106
--- src/sys/ufs/lfs/lfs_extern.h:1.105 Sun May 31 15:48:03 2015
+++ src/sys/ufs/lfs/lfs_extern.h Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_extern.h,v 1.105 2015/05/31 15:48:03 hannken Exp $ */
+/* $NetBSD: lfs_extern.h,v 1.106 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -182,7 +182,7 @@ int lfs_writeinode(struct lfs *, struct
int lfs_gatherblock(struct segment *, struct buf *, kmutex_t *);
int lfs_gather(struct lfs *, struct segment *, struct vnode *, int (*match )(struct lfs *, struct buf *));
void lfs_update_single(struct lfs *, struct segment *, struct vnode *,
- daddr_t, int32_t, int);
+ daddr_t, daddr_t, int);
void lfs_updatemeta(struct segment *);
int lfs_rewind(struct lfs *, int);
void lfs_unset_inval_all(struct lfs *);
Index: src/sys/ufs/lfs/lfs_pages.c
diff -u src/sys/ufs/lfs/lfs_pages.c:1.5 src/sys/ufs/lfs/lfs_pages.c:1.6
--- src/sys/ufs/lfs/lfs_pages.c:1.5 Tue Jul 28 05:09:34 2015
+++ src/sys/ufs/lfs/lfs_pages.c Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_pages.c,v 1.5 2015/07/28 05:09:34 dholland Exp $ */
+/* $NetBSD: lfs_pages.c,v 1.6 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.5 2015/07/28 05:09:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.6 2015/08/02 18:10:08 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -784,8 +784,8 @@ lfs_putpages(void *v)
if (error == EDEADLK || error == EAGAIN) {
DLOG((DLOG_PAGE, "lfs_putpages: genfs_putpages returned"
- " %d ino %d off %x (seg %d)\n", error,
- ip->i_number, lfs_sb_getoffset(fs),
+ " %d ino %d off %jx (seg %d)\n", error,
+ ip->i_number, (uintmax_t)lfs_sb_getoffset(fs),
lfs_dtosn(fs, lfs_sb_getoffset(fs))));
if (oreclaim) {
@@ -799,8 +799,8 @@ lfs_putpages(void *v)
}
} else if (error) {
DLOG((DLOG_PAGE, "lfs_putpages: genfs_putpages returned"
- " %d ino %d off %x (seg %d)\n", error,
- (int)ip->i_number, lfs_sb_getoffset(fs),
+ " %d ino %d off %jx (seg %d)\n", error,
+ (int)ip->i_number, (uintmax_t)lfs_sb_getoffset(fs),
lfs_dtosn(fs, lfs_sb_getoffset(fs))));
}
/* genfs_do_putpages loses the interlock */
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.245 src/sys/ufs/lfs/lfs_segment.c:1.246
--- src/sys/ufs/lfs/lfs_segment.c:1.245 Tue Jul 28 05:09:35 2015
+++ src/sys/ufs/lfs/lfs_segment.c Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.245 2015/07/28 05:09:35 dholland Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.246 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.245 2015/07/28 05:09:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.246 2015/08/02 18:10:08 dholland Exp $");
#define _VFS_VNODE_PRIVATE /* XXX: check for VI_MARKER, this has to go */
@@ -1128,6 +1128,7 @@ lfs_writeinode(struct lfs *fs, struct se
sp->sum_bytes_left -= sizeof(int32_t);
ndx = lfs_sb_getsumsize(fs) / sizeof(int32_t) -
sp->ninodes / LFS_INOPB(fs) - 1;
+ /* XXX ondisk32 */
((int32_t *)(sp->segsum))[ndx] = daddr;
}
@@ -1454,7 +1455,7 @@ loop:
*/
void
lfs_update_single(struct lfs *fs, struct segment *sp,
- struct vnode *vp, daddr_t lbn, int32_t ndaddr, int size)
+ struct vnode *vp, daddr_t lbn, daddr_t ndaddr, int size)
{
SEGUSE *sup;
struct buf *bp;
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.330 src/sys/ufs/lfs/lfs_vfsops.c:1.331
--- src/sys/ufs/lfs/lfs_vfsops.c:1.330 Sun Aug 2 18:08:13 2015
+++ src/sys/ufs/lfs/lfs_vfsops.c Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.330 2015/08/02 18:08:13 dholland Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.331 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.330 2015/08/02 18:08:13 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.331 2015/08/02 18:10:08 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -459,7 +459,7 @@ lfs_writerd(void *arg)
sizeof(mp->mnt_stat.f_fstypename)) == 0) {
++lfsc;
fs = VFSTOULFS(mp)->um_lfs;
- int32_t ooffset = 0;
+ daddr_t ooffset = 0;
fsflags = SEGM_SINGLE;
mutex_enter(&lfs_lock);
Index: src/usr.sbin/dumplfs/dumplfs.c
diff -u src/usr.sbin/dumplfs/dumplfs.c:1.46 src/usr.sbin/dumplfs/dumplfs.c:1.47
--- src/usr.sbin/dumplfs/dumplfs.c:1.46 Sun Aug 2 18:08:13 2015
+++ src/usr.sbin/dumplfs/dumplfs.c Sun Aug 2 18:10:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dumplfs.c,v 1.46 2015/08/02 18:08:13 dholland Exp $ */
+/* $NetBSD: dumplfs.c,v 1.47 2015/08/02 18:10:08 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)dumplfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: dumplfs.c,v 1.46 2015/08/02 18:08:13 dholland Exp $");
+__RCSID("$NetBSD: dumplfs.c,v 1.47 2015/08/02 18:10:08 dholland Exp $");
#endif
#endif /* not lint */
@@ -284,8 +284,8 @@ dump_ifile(int fd, struct lfs *lfsp, int
break;
if (dip < dpage) {
- warnx("unable to locate ifile inode at disk address 0x%llx",
- (long long)addr);
+ warnx("unable to locate ifile inode at disk address 0x%jx",
+ (uintmax_t)addr);
return;
}
@@ -771,35 +771,35 @@ dump_super(struct lfs *lfsp)
"roll_id ", lfs_sb_getident(lfsp),
"interleave ", lfs_sb_getinterleave(lfsp),
"sumsize ", lfs_sb_getsumsize(lfsp));
- (void)printf(" %s%-10d %s0x%-8jx\n",
- "seg0addr ", lfs_sb_gets0addr(lfsp),
+ (void)printf(" %s%-10jd %s0x%-8jx\n",
+ "seg0addr ", (intmax_t)lfs_sb_gets0addr(lfsp),
"maxfilesize ", (uintmax_t)lfs_sb_getmaxfilesize(lfsp));
(void)printf(" Superblock disk addresses:\n ");
for (i = 0; i < LFS_MAXNUMSB; i++) {
- (void)printf(" 0x%-8x", lfs_sb_getsboff(lfsp, i));
+ (void)printf(" 0x%-8jx", (intmax_t)lfs_sb_getsboff(lfsp, i));
if (i == (LFS_MAXNUMSB >> 1))
(void)printf("\n ");
}
(void)printf("\n");
(void)printf(" Checkpoint Info\n");
- (void)printf(" %s%-10d %s0x%-8x %s%-10d\n",
+ (void)printf(" %s%-10d %s0x%-8jx %s%-10d\n",
"freehd ", lfs_sb_getfreehd(lfsp),
- "idaddr ", lfs_sb_getidaddr(lfsp),
+ "idaddr ", (intmax_t)lfs_sb_getidaddr(lfsp),
"ifile ", lfs_sb_getifile(lfsp));
(void)printf(" %s%-10d %s%-10jd %s%-10jd\n",
"uinodes ", lfs_sb_getuinodes(lfsp),
"bfree ", (intmax_t)lfs_sb_getbfree(lfsp),
"avail ", (intmax_t)lfs_sb_getavail(lfsp));
- (void)printf(" %s%-10d %s0x%-8x %s0x%-8x\n",
+ (void)printf(" %s%-10d %s0x%-8jx %s0x%-8jx\n",
"nfiles ", lfs_sb_getnfiles(lfsp),
- "lastseg ", lfs_sb_getlastseg(lfsp),
- "nextseg ", lfs_sb_getnextseg(lfsp));
- (void)printf(" %s0x%-8x %s0x%-8x %s%-10ju\n",
- "curseg ", lfs_sb_getcurseg(lfsp),
- "offset ", lfs_sb_getoffset(lfsp),
+ "lastseg ", (uintmax_t)lfs_sb_getlastseg(lfsp),
+ "nextseg ", (uintmax_t)lfs_sb_getnextseg(lfsp));
+ (void)printf(" %s0x%-8jx %s0x%-8jx %s%-10ju\n",
+ "curseg ", (uintmax_t)lfs_sb_getcurseg(lfsp),
+ "offset ", (uintmax_t)lfs_sb_getoffset(lfsp),
"serial ", (uintmax_t)lfs_sb_getserial(lfsp));
stamp = lfs_sb_gettstamp(lfsp);
(void)printf(" tstamp %s", ctime(&stamp));
