summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-08-19 02:06:29 +0000
committerchristos <christos@NetBSD.org>2005-08-19 02:06:29 +0000
commitd05efd58f34fae16cf2fb54756f08ba2ab419140 (patch)
tree081ab0662c803b5d68dd448509404f7ca232a984 /libexec
parent33037645335d210b2411baeb1c9d4482d7d3d455 (diff)
64 bit inode changes.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/lfs_cleanerd/clean.h15
-rw-r--r--libexec/lfs_cleanerd/cleanerd.c32
-rw-r--r--libexec/lfs_cleanerd/coalesce.c23
-rw-r--r--libexec/lfs_cleanerd/library.c11
4 files changed, 45 insertions, 36 deletions
diff --git a/libexec/lfs_cleanerd/clean.h b/libexec/lfs_cleanerd/clean.h
index 1f9ee8bf76c..78d29f0f9ef 100644
--- a/libexec/lfs_cleanerd/clean.h
+++ b/libexec/lfs_cleanerd/clean.h
@@ -1,4 +1,4 @@
-/* $NetBSD: clean.h,v 1.20 2005/02/26 05:43:04 perseant Exp $ */
+/* $NetBSD: clean.h,v 1.21 2005/08/19 02:06:29 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -114,21 +114,22 @@ typedef struct fs_info {
* USEFUL DEBUGGING FUNCTIONS:
*/
#define PRINT_FINFO(fp, ip) if(debug > 1) { \
- syslog(LOG_DEBUG," %s %s%d version %d nblocks %d\n", \
+ syslog(LOG_DEBUG," %s %s%u version %d nblocks %d\n", \
(ip)->if_version > (fp)->fi_version ? "TOSSING" : "KEEPING", \
"FINFO for inode: ", (fp)->fi_ino, \
(fp)->fi_version, (fp)->fi_nblocks); \
}
#define PRINT_INODE(b, bip) if(debug > 1) { \
- syslog(LOG_DEBUG,"\t%s inode: %d daddr: 0x%lx create: %s\n", \
- b ? "KEEPING" : "TOSSING", (bip)->bi_inode, (long)(bip)->bi_daddr, \
- ctime((time_t *)&(bip)->bi_segcreate)); \
+ syslog(LOG_DEBUG,"\t%s inode: %llu daddr: 0x%lx create: %s\n", \
+ b ? "KEEPING" : "TOSSING", (unsigned long long)(bip)->bi_inode, \
+ (long)(bip)->bi_daddr, ctime((time_t *)&(bip)->bi_segcreate)); \
}
#define PRINT_BINFO(bip) if(debug > 1 ) { \
- syslog(LOG_DEBUG,"\tinode: %d lbn: %d daddr: 0x%lx create: %s\n", \
- (bip)->bi_inode, (bip)->bi_lbn, (unsigned long)(bip)->bi_daddr, \
+ syslog(LOG_DEBUG,"\tinode: %llu lbn: %d daddr: 0x%lx create: %s\n", \
+ (unsigned long long)(bip)->bi_inode, (bip)->bi_lbn, \
+ (unsigned long)(bip)->bi_daddr, \
ctime((time_t *)&(bip)->bi_segcreate)); \
}
diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c
index bedfa52c0cf..9a5d7e332ea 100644
--- a/libexec/lfs_cleanerd/cleanerd.c
+++ b/libexec/lfs_cleanerd/cleanerd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cleanerd.c,v 1.54 2005/04/23 19:47:51 perseant Exp $ */
+/* $NetBSD: cleanerd.c,v 1.55 2005/08/19 02:06:29 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)cleanerd.c 8.5 (Berkeley) 6/10/95";
#else
-__RCSID("$NetBSD: cleanerd.c,v 1.54 2005/04/23 19:47:51 perseant Exp $");
+__RCSID("$NetBSD: cleanerd.c,v 1.55 2005/08/19 02:06:29 christos Exp $");
#endif
#endif /* not lint */
@@ -838,13 +838,14 @@ add_segment(FS_INFO *fsp, struct seglist *slp, SEGS_AND_BLOCKS *sbp)
(long long)fsbtob(lfsp, tba[i].bi_daddr - seg_addr),
tba[i].bi_bp, seg_buf,
(long)(((char *)(tba[i].bi_bp) - seg_buf)));
- syslog(LOG_ERR, "seg %d (0x%llx), ino %d lbn %d, 0x%x != 0x%llx",
- id, (long long)seg_addr,
- tba[i].bi_inode,
- tba[i].bi_lbn,
- tba[i].bi_daddr,
- (long long)(seg_addr +
- btofsb(lfsp, (char *)(tba[i].bi_bp) - seg_buf)));
+ syslog(LOG_ERR, "seg %d (0x%llx), ino %llu lbn %d, "
+ "0x%x != 0x%llx",
+ id, (long long)seg_addr,
+ (unsigned long long)tba[i].bi_inode,
+ tba[i].bi_lbn,
+ tba[i].bi_daddr,
+ (long long)(seg_addr +
+ btofsb(lfsp, (char *)(tba[i].bi_bp) - seg_buf)));
error = EFAULT;
goto out;
@@ -864,8 +865,10 @@ add_segment(FS_INFO *fsp, struct seglist *slp, SEGS_AND_BLOCKS *sbp)
}
}
if(j<0) {
- syslog(LOG_ERR, "lost inode %d in the shuffle! (blk %d)",
- tba[i].bi_inode, tba[i].bi_daddr);
+ syslog(LOG_ERR, "lost inode %llu in "
+ "the shuffle! (blk %d)",
+ (unsigned long long)tba[i].bi_inode,
+ tba[i].bi_daddr);
if (debug) {
syslog(LOG_DEBUG,
"inode numbers found were:");
@@ -876,9 +879,10 @@ add_segment(FS_INFO *fsp, struct seglist *slp, SEGS_AND_BLOCKS *sbp)
}
errx(1, "lost inode");
} else if (debug > 1) {
- syslog(LOG_DEBUG,"Ino %d corrected to 0x%x",
- tba[i].bi_inode,
- tba[i].bi_daddr);
+ syslog(LOG_DEBUG,"Ino %llu corrected "
+ "to 0x%x",
+ (unsigned long long)tba[i].bi_inode,
+ tba[i].bi_daddr);
}
} else {
tba[i].bi_bp = seg_buf + fsbtob(lfsp, tba[i].bi_daddr - seg_addr);
diff --git a/libexec/lfs_cleanerd/coalesce.c b/libexec/lfs_cleanerd/coalesce.c
index f686a76f832..64532f62e04 100644
--- a/libexec/lfs_cleanerd/coalesce.c
+++ b/libexec/lfs_cleanerd/coalesce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: coalesce.c,v 1.9 2003/04/02 10:39:22 fvdl Exp $ */
+/* $NetBSD: coalesce.c,v 1.10 2005/08/19 02:06:29 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -147,20 +147,22 @@ int clean_inode(struct fs_info *fsp, ino_t ino)
/* Sanity checks */
if (dip->di_size < 0) {
if (debug)
- syslog(LOG_DEBUG, "ino %d, negative size (%lld)",
- ino, (long long)dip->di_size);
+ syslog(LOG_DEBUG, "ino %llu, negative size (%lld)",
+ (unsigned long long)ino, (long long)dip->di_size);
return COALESCE_BADSIZE;
}
if (nb > dip->di_blocks) {
if (debug)
- syslog(LOG_DEBUG, "ino %d, computed blocks %d > held blocks %d",
- ino, nb, dip->di_blocks);
+ syslog(LOG_DEBUG, "ino %llu, computed blocks %d "
+ "> held blocks %d",
+ (unsigned long long)ino, nb, dip->di_blocks);
return COALESCE_BADBLOCKSIZE;
}
bip = (BLOCK_INFO *)malloc(sizeof(BLOCK_INFO) * nb);
if (bip == NULL) {
- syslog(LOG_WARNING, "ino %d, %d blocks: %m", ino, nb);
+ syslog(LOG_WARNING, "ino %llu, %d blocks: %m",
+ (unsigned long long)ino, nb);
return COALESCE_NOMEM;
}
for (i = 0; i < nb; i++) {
@@ -203,9 +205,9 @@ int clean_inode(struct fs_info *fsp, ino_t ino)
retval = COALESCE_NOTWORTHIT;
goto out;
} else if (debug)
- syslog(LOG_DEBUG, "ino %d total discontinuity "
- "%d (%lld) for %d blocks", ino, noff,
- (long long)toff, nb);
+ syslog(LOG_DEBUG, "ino %llu total discontinuity "
+ "%d (%lld) for %d blocks", (unsigned long long)ino,
+ noff, (long long)toff, nb);
/* Search for blocks in active segments; don't move them. */
for (i = 0; i < nb; i++) {
@@ -258,7 +260,8 @@ int clean_inode(struct fs_info *fsp, ino_t ino)
}
}
if (debug)
- syslog(LOG_DEBUG, "ino %d markv %d blocks", ino, nb);
+ syslog(LOG_DEBUG, "ino %llu markv %d blocks",
+ (unsigned long long)ino, nb);
/*
* Write in segment-sized chunks. If at any point we'd write more
diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c
index 9a4d574d29b..745d7104c6b 100644
--- a/libexec/lfs_cleanerd/library.c
+++ b/libexec/lfs_cleanerd/library.c
@@ -1,4 +1,4 @@
-/* $NetBSD: library.c,v 1.43 2005/05/03 00:20:17 christos Exp $ */
+/* $NetBSD: library.c,v 1.44 2005/08/19 02:06:29 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)library.c 8.3 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: library.c,v 1.43 2005/05/03 00:20:17 christos Exp $");
+__RCSID("$NetBSD: library.c,v 1.44 2005/08/19 02:06:29 christos Exp $");
#endif
#endif /* not lint */
@@ -215,8 +215,8 @@ get_dinode(FS_INFO *fsp, ino_t ino)
break;
if (dip == dib + lfsp->lfs_inopb) {
free(dib);
- syslog(LOG_WARNING, "dinode %d not found at fsb 0x%x",
- ino, bi.bi_daddr);
+ syslog(LOG_WARNING, "dinode %llu not found at fsb 0x%x",
+ (unsigned long long)ino, bi.bi_daddr);
return NULL;
}
dino = *dip; /* structure copy */
@@ -798,7 +798,8 @@ bi_compare(const void *a, const void *b)
if ((diff = (int)(ba->bi_daddr - bb->bi_daddr)))
return (diff);
if(ba->bi_inode != LFS_IFILE_INUM && debug)
- syslog(LOG_DEBUG,"bi_compare: using kludge on ino %d!", ba->bi_inode);
+ syslog(LOG_DEBUG,"bi_compare: using kludge on ino %llu!",
+ ba->bi_inode);
diff = ba->bi_size - bb->bi_size;
return diff;
}