 @@ -39,27 +39,27 @@ struct clfs {
 /*
  * Fraction of the could-be-clean segments required to be clean.
  */
 #define BUSY_LIM 0.5
 #define IDLE_LIM 0.9
 __BEGIN_DECLS
 /* lfs_cleanerd.c */
 void pwarn(const char *, ...);
 void calc_cb(struct clfs *, int, struct clfs_seguse *);
 int clean_fs(struct clfs *, CLEANERINFO *);
-void dlog(char *, ...);
+void dlog(const char *, ...);
 void handle_error(struct clfs **, int);
 int init_fs(struct clfs *, char *);
 int invalidate_segment(struct clfs *, int);
 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 *);
 /* cleansrv.c */
 void check_control_socket(void);

 @@ -1,14 +1,14 @@
-/*      $NetBSD: coalesce.c,v 1.16 2008/05/16 09:21:59 hannken Exp $  */
+/*      $NetBSD: coalesce.c,v 1.17 2009/03/16 00:08:10 lukem Exp $  */
 /*-
  * Copyright (c) 2002, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -77,27 +77,27 @@ enum coalesce_returncodes {
 	COALESCE_TOOSMALL,
 	COALESCE_BADSIZE,
 	COALESCE_BADBLOCKSIZE,
 	COALESCE_NOMEM,
 	COALESCE_BADBMAPV,
 	COALESCE_BADMARKV,
 	COALESCE_NOTWORTHIT,
 	COALESCE_NOTHINGLEFT,
 	COALESCE_EIO,
 	COALESCE_MAXERROR
 };
-char *coalesce_return[] = {
+const char *coalesce_return[] = {
 	"Successfully coalesced",
 	"File not in use or inode not found",
 	"Not large enough to coalesce",
 	"Negative size",
 	"Not enough blocks to account for size",
 	"Malloc failed",
 	"LFCNBMAPV failed",
 	"Not broken enough to fix",
 	"Too many blocks not found",
 	"Too many blocks found in active segments",
 	"I/O error",
 	"No such error"
 @@ -157,31 +157,33 @@ clean_inode(struct clfs *fs, ino_t ino)
 	if (dip == NULL)
 		return COALESCE_NOINODE;
 	/* Compute file block size, set up for bmapv */
 	onb = nb = lblkno(fs, dip->di_size);
 	/* XXX for now, don't do any file small enough to have fragments */
 	if (nb < NDADDR) {
 		free(dip);
 		return COALESCE_TOOSMALL;
+	}
 	/* Sanity checks */
 #if 0	/* di_size is uint64_t -- this is a noop */
 	if (dip->di_size < 0) {
 		dlog("ino %d, negative size (%" PRId64 ")", ino, dip->di_size);
 		free(dip);
 		return COALESCE_BADSIZE;
+	}
 #endif
 	if (nb > dip->di_blocks) {
 		dlog("ino %d, computed blocks %d > held blocks %d", ino, nb,
 		     dip->di_blocks);
 		free(dip);
 		return COALESCE_BADBLOCKSIZE;
+	}
 	bip = (BLOCK_INFO *)malloc(sizeof(BLOCK_INFO) * nb);
 	if (bip == NULL) {
 		syslog(LOG_WARNING, "ino %llu, %d blocks: %m",
 		    (unsigned long long)ino, nb);
 		free(dip);
 		return COALESCE_NOMEM;

 @@ -1,14 +1,14 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.16 2009/03/15 23:56:24 lukem Exp $	 */
+/* $NetBSD: lfs_cleanerd.c,v 1.17 2009/03/16 00:08:10 lukem Exp $	 */
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -89,27 +89,27 @@ struct cleaner_stats {
 extern u_int32_t cksum(void *, size_t);
 extern u_int32_t lfs_sb_cksum(struct dlfs *);
 extern u_int32_t lfs_cksum_part(void *, size_t, u_int32_t);
 extern int ufs_getlbns(struct lfs *, struct uvnode *, daddr_t, struct indir *, int *);
 /* Compat */
 void pwarn(const char *unused, ...) { /* Does nothing */ };
 /*
  * Log a message if debugging is turned on.
  */
 void
-dlog(char *fmt, ...)
+dlog(const char *fmt, ...)
+{
 	va_list ap;
 	if (debug == 0)
 		return;
 	va_start(ap, fmt);
 	vsyslog(LOG_DEBUG, fmt, ap);
 	va_end(ap);
+}
 /*
  * Remove the specified filesystem from the list, due to its having
 @@ -589,27 +589,27 @@ log_segment_read(struct clfs *fs, int sn
          * the current directory.  We don't need to log the location of
          * the segment, since that can be inferred from the segments up
 	 * to this point (ss_nextseg field of the previously written segment).
+	 *
 	 * We can use this info later to reconstruct the filesystem at any
 	 * given point in time for analysis, by replaying the log forward
 	 * indexed by the segment serial numbers; but it is not suitable
 	 * for everyday use since the copylog will be simply enormous.
          */
 	cp = fd_ptrget(fs->clfs_devvp, sntod(fs, sn));
         fp = fopen(copylog_filename, "ab");
         if (fp != NULL) {
-                if (fwrite(cp, (size_t)fs->lfs_ssize, 1, fp) < 0) {
+                if (fwrite(cp, (size_t)fs->lfs_ssize, 1, fp) != 1) {
                         perror("writing segment to copy log");
+                }
+        }
         fclose(fp);
+}
 /*
  * Read a segment to populate the BLOCK_INFO structures.
  * Return the number of partial segments read and parsed.
  */
 int
 load_segment(struct clfs *fs, int sn, BLOCK_INFO **bipp, int *bic)
+{
 @@ -674,27 +674,27 @@ calc_cb(struct clfs *fs, int sn, struct
 	 */
 	if (t->nbytes == 0) {
 		t->flags &= ~SEGUSE_ERROR; /* Strip error once empty */
 		t->priority = 0;
 		return;
+	}
 	if (t->flags & SEGUSE_ERROR) {	/* No good if not already empty */
 		/* No benefit */
 		t->priority = 0;
 		return;
+	}
-	if (t->nbytes < 0 || t->nbytes > fs->lfs_ssize) {
+	if (t->nbytes > fs->lfs_ssize) {
 		/* Another type of error */
 		syslog(LOG_WARNING, "segment %d: bad seguse count %d",
 		       sn, t->nbytes);
 		t->flags |= SEGUSE_ERROR;
 		t->priority = 0;
 		return;
+	}
 	/*
 	 * The non-degenerate case.  Use Rosenblum's cost-benefit algorithm.
 	 * Calculate the benefit from cleaning this segment (one segment,
 	 * minus fragmentation, dirty blocks and a segment summary block)
 	 * and weigh that against the cost (bytes read plus bytes written).
 @@ -715,30 +715,30 @@ calc_cb(struct clfs *fs, int sn, struct
 	return;
+}
 /*
  * Comparator for BLOCK_INFO structures.  Anything not in one of the segments
  * we're looking at sorts higher; after that we sort first by inode number
  * and then by block number (unsigned, i.e., negative sorts higher) *but*
  * sort inodes before data blocks.
  */
 static int
 bi_comparator(const void *va, const void *vb)
+{
-	BLOCK_INFO *a, *b;
+	const BLOCK_INFO *a, *b;
-	a = (BLOCK_INFO *)va;
+	a = (const BLOCK_INFO *)va;
-	b = (BLOCK_INFO *)vb;
+	b = (const BLOCK_INFO *)vb;
 	/* Check for out-of-place block */
 	if (a->bi_segcreate == a->bi_daddr &&
 	    b->bi_segcreate != b->bi_daddr)
 		return -1;
 	if (a->bi_segcreate != a->bi_daddr &&
 	    b->bi_segcreate == b->bi_daddr)
 		return 1;
 	if (a->bi_size <= 0 && b->bi_size > 0)
 		return 1;
 	if (b->bi_size <= 0 && a->bi_size > 0)
 		return -1;
 @@ -755,30 +755,30 @@ bi_comparator(const void *va, const void
 		return 1;
 	else
 		return -1;
 	return 0;
+}
 /*
  * Comparator for sort_segments: cost-benefit equation.
  */
 static int
 cb_comparator(const void *va, const void *vb)
+{
-	struct clfs_seguse *a, *b;
+	const struct clfs_seguse *a, *b;
-	a = *(struct clfs_seguse **)va;
+	a = *(const struct clfs_seguse * const *)va;
-	b = *(struct clfs_seguse **)vb;
+	b = *(const struct clfs_seguse * const *)vb;
 	return a->priority > b->priority ? -1 : 1;
+}
 void
 toss_old_blocks(struct clfs *fs, BLOCK_INFO **bipp, int *bic, int *sizep)
+{
 	int i, r;
 	BLOCK_INFO *bip = *bipp;
 	struct lfs_fcntl_markv /* {
 		BLOCK_INFO *blkiov;
 		int blkcnt;
 	} */ lim;