From: NeilBrown <neilb@suse.de>
Date: Fri, 15 Oct 2010 02:46:57 +0000 (+1100)
Subject: Fix compilation on 32bit arch.
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=75e5cd9bce96ab527c09fe4a1c94529f246ec7ff;p=lafs-utils.git

Fix compilation on 32bit arch.

Some printf warnings.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/include/lafs/lafs.h b/include/lafs/lafs.h
index 3518523..fed212d 100644
--- a/include/lafs/lafs.h
+++ b/include/lafs/lafs.h
@@ -141,7 +141,8 @@ de_sched(struct lafs_blk *b)
 
 	if (b->parent) {
 		struct lafs_iblk *p = b->parent;
-		printf("ds %d/%ld %d\n", p->b.ino->inum, p->b.fileaddr, p->sched_cnt);
+		printf("ds %d/%lld %d\n", p->b.ino->inum, (long long)p->b.fileaddr,
+		       p->sched_cnt);
 		p->sched_cnt--;
 		if (p->sched_cnt == 0)
 			lafs_sched_blk(&p->b);
diff --git a/lib/lafs_allocated_block.c b/lib/lafs_allocated_block.c
index 6dfcb30..8280ae9 100644
--- a/lib/lafs_allocated_block.c
+++ b/lib/lafs_allocated_block.c
@@ -14,8 +14,8 @@ void lafs_allocated_block(struct lafs_blk *b, loff_t addr)
 	struct lafs *fs = b->ino->fs;
 	struct lafs_iblk *p;
 
-	printf("allocate %d/%ld %s to %ld\n", b->ino->inum, b->fileaddr, 
-	       (b->flags & B_Index) ? "index":"data", addr);
+	printf("allocate %d/%lld %s to %lld\n", b->ino->inum, (long long)b->fileaddr, 
+	       (b->flags & B_Index) ? "index":"data", (long long)addr);
 	if (b->parent == NULL) {
 		/* This is the root inode.  Its address goes
 		 * directly in the 'state' block.
@@ -23,7 +23,7 @@ void lafs_allocated_block(struct lafs_blk *b, loff_t addr)
 		if (b->flags & B_Index) abort();
 
 		/* FIXME this might be a different snapshot */
-		printf("Root inode at %ld\n", addr);
+		printf("Root inode at %lld\n", (long long)addr);
 		b->physaddr = addr;
 		fs->ss.root_addr = addr;
 		return;
diff --git a/lib/lafs_checkpoint.c b/lib/lafs_checkpoint.c
index 92d60c7..2e28525 100644
--- a/lib/lafs_checkpoint.c
+++ b/lib/lafs_checkpoint.c
@@ -20,7 +20,8 @@ int lafs_checkpoint(struct lafs *fs)
 			b = list_first_entry(&fs->leafs,
 					     struct lafs_blk,
 					     leafs);
-			printf("checkpoint %p %d/%ld %s %p\n", b, b->ino->inum, b->fileaddr,
+			printf("checkpoint %p %d/%lld %s %p\n", b, b->ino->inum,
+			       (long long)b->fileaddr,
 			       (b->flags & B_Index) ? "index":"data", b->parent);
 			list_del_init(&b->leafs);
 			if (!(b->flags & B_Index)) {
@@ -68,7 +69,7 @@ int lafs_checkpoint(struct lafs *fs)
 		b = list_first_entry(&fs->account_leafs,
 				     struct lafs_blk, leafs);
 		b->flags &= ~B_Sched;
-		printf("Account %d/%ld\n", b->ino->inum, b->fileaddr);
+		printf("Account %d/%lld\n", b->ino->inum, (long long)b->fileaddr);
 		list_del_init(&b->leafs);
 
 		lafs_sched_blk(b);
diff --git a/lib/lafs_incorporate.c b/lib/lafs_incorporate.c
index c780cf7..4dde047 100644
--- a/lib/lafs_incorporate.c
+++ b/lib/lafs_incorporate.c
@@ -52,7 +52,8 @@ void lafs_incorporate(struct lafs_iblk *ib)
 		ip2 += addr * 6;
 		encode48(ip2, b->physaddr);
 	}
-	printf("incorp %d/%ld\n", ib->b.ino->dblock->b.ino->inum, ib->b.ino->dblock->b.fileaddr);
+	printf("incorp %d/%lld\n", ib->b.ino->dblock->b.ino->inum,
+	       (long long)ib->b.ino->dblock->b.fileaddr);
 	lafs_dirty_blk(&ib->b);
 }