UBIFS: fix compilation warnings

We print 'ino_t' type using '%lu' printk() placeholder, but this results in many warnings when compiling for Alpha platform. Fix this by adding (unsingned long) casts. Fixes these warnings: fs/ubifs/journal.c:693: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/journal.c:1131: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/dir.c:163: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/tnc.c:2680: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/tnc.c:2700: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/replay.c:1066: warning: format '%lu' expects type 'long unsigned int', but argument 7 has type 'ino_t' fs/ubifs/orphan.c:108: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:135: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:142: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:154: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:159: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:451: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:539: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:612: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:843: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:856: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/recovery.c:1438: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/recovery.c:1443: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/recovery.c:1475: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/recovery.c:1495: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:105: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:105: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:110: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:110: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:114: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:114: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:118: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:118: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:1591: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1671: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1674: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1680: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1699: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1788: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1821: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1833: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1924: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1932: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1938: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1945: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1953: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1960: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1967: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1973: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1988: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1991: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:2009: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'ino_t' Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

UBIFS: fix compilation warnings
We print 'ino_t' type using '%lu' printk() placeholder, but this results in many warnings when compiling for Alpha platform. Fix this by adding (unsingned long) casts. Fixes these warnings: fs/ubifs/journal.c:693: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/journal.c:1131: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/dir.c:163: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/tnc.c:2680: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/tnc.c:2700: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/replay.c:1066: warning: format '%lu' expects type 'long unsigned int', but argument 7 has type 'ino_t' fs/ubifs/orphan.c:108: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:135: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:142: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:154: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:159: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:451: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:539: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:612: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:843: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/orphan.c:856: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/recovery.c:1438: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/recovery.c:1443: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/recovery.c:1475: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/recovery.c:1495: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:105: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:105: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:110: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:110: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:114: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:114: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:118: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:118: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t' fs/ubifs/debug.c:1591: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1671: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1674: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1680: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1699: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1788: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1821: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1833: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:1924: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1932: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1938: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1945: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1953: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1960: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1967: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1973: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1988: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t' fs/ubifs/debug.c:1991: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t' fs/ubifs/debug.c:2009: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'ino_t' Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Artem Bityutskiy
1 parent e2966cbe89
Showing 7 changed files with 70 additions and 50 deletions Side-by-side Diff
fs/ubifs/debug.c
fs/ubifs/dir.c
fs/ubifs/journal.c
fs/ubifs/orphan.c
fs/ubifs/recovery.c
fs/ubifs/replay.c
fs/ubifs/tnc.c
@@ -101,21 +101,24 @@
 	if (c->key_fmt == UBIFS_SIMPLE_KEY_FMT) {
 		switch (type) {
 		case UBIFS_INO_KEY:
-			sprintf(p, "(%lu, %s)", key_inum(c, key),
+			sprintf(p, "(%lu, %s)", (unsigned long)key_inum(c, key),
 			       get_key_type(type));
 			break;
 		case UBIFS_DENT_KEY:
 		case UBIFS_XENT_KEY:
-			sprintf(p, "(%lu, %s, %#08x)", key_inum(c, key),
+			sprintf(p, "(%lu, %s, %#08x)",
+				(unsigned long)key_inum(c, key),
 				get_key_type(type), key_hash(c, key));
 			break;
 		case UBIFS_DATA_KEY:
-			sprintf(p, "(%lu, %s, %u)", key_inum(c, key),
+			sprintf(p, "(%lu, %s, %u)",
+				(unsigned long)key_inum(c, key),
 				get_key_type(type), key_block(c, key));
 			break;
 		case UBIFS_TRUN_KEY:
 			sprintf(p, "(%lu, %s)",
-				key_inum(c, key), get_key_type(type));
+				(unsigned long)key_inum(c, key),
+				get_key_type(type));
 			break;
 		default:
 			sprintf(p, "(bad key type: %#08x, %#08x)",
@@ -1589,7 +1592,7 @@
  
 	if (inum > c->highest_inum) {
 		ubifs_err("too high inode number, max. is %lu",
-			  c->highest_inum);
+			  (unsigned long)c->highest_inum);
 		return ERR_PTR(-EINVAL);
 	}
  
  
  
@@ -1668,16 +1671,18 @@
 	ino_key_init(c, &key, inum);
 	err = ubifs_lookup_level0(c, &key, &znode, &n);
 	if (!err) {
-		ubifs_err("inode %lu not found in index", inum);
+		ubifs_err("inode %lu not found in index", (unsigned long)inum);
 		return ERR_PTR(-ENOENT);
 	} else if (err < 0) {
-		ubifs_err("error %d while looking up inode %lu", err, inum);
+		ubifs_err("error %d while looking up inode %lu",
+			  err, (unsigned long)inum);
 		return ERR_PTR(err);
 	}
  
 	zbr = &znode->zbranch[n];
 	if (zbr->len < UBIFS_INO_NODE_SZ) {
-		ubifs_err("bad node %lu node length %d", inum, zbr->len);
+		ubifs_err("bad node %lu node length %d",
+			  (unsigned long)inum, zbr->len);
 		return ERR_PTR(-EINVAL);
 	}
  
@@ -1697,7 +1702,7 @@
 	kfree(ino);
 	if (IS_ERR(fscki)) {
 		ubifs_err("error %ld while adding inode %lu node",
-			  PTR_ERR(fscki), inum);
+			  PTR_ERR(fscki), (unsigned long)inum);
 		return fscki;
 	}
  
@@ -1786,7 +1791,8 @@
 		if (IS_ERR(fscki)) {
 			err = PTR_ERR(fscki);
 			ubifs_err("error %d while processing data node and "
-				  "trying to find inode node %lu", err, inum);
+				  "trying to find inode node %lu",
+				  err, (unsigned long)inum);
 			goto out_dump;
 		}
  
@@ -1819,7 +1825,8 @@
 		if (IS_ERR(fscki)) {
 			err = PTR_ERR(fscki);
 			ubifs_err("error %d while processing entry node and "
-				  "trying to find inode node %lu", err, inum);
+				  "trying to find inode node %lu",
+				  err, (unsigned long)inum);
 			goto out_dump;
 		}
  
@@ -1832,7 +1839,7 @@
 			err = PTR_ERR(fscki);
 			ubifs_err("error %d while processing entry node and "
 				  "trying to find parent inode node %lu",
-				  err, inum);
+				  err, (unsigned long)inum);
 			goto out_dump;
 		}
  
@@ -1923,7 +1930,8 @@
 			    fscki->references != 1) {
 				ubifs_err("directory inode %lu has %d "
 					  "direntries which refer it, but "
-					  "should be 1", fscki->inum,
+					  "should be 1",
+					  (unsigned long)fscki->inum,
 					  fscki->references);
 				goto out_dump;
 			}
  
  
  
@@ -1931,27 +1939,29 @@
 			    fscki->references != 0) {
 				ubifs_err("root inode %lu has non-zero (%d) "
 					  "direntries which refer it",
-					  fscki->inum, fscki->references);
+					  (unsigned long)fscki->inum,
+					  fscki->references);
 				goto out_dump;
 			}
 			if (fscki->calc_sz != fscki->size) {
 				ubifs_err("directory inode %lu size is %lld, "
 					  "but calculated size is %lld",
-					  fscki->inum, fscki->size,
-					  fscki->calc_sz);
+					  (unsigned long)fscki->inum,
+					  fscki->size, fscki->calc_sz);
 				goto out_dump;
 			}
 			if (fscki->calc_cnt != fscki->nlink) {
 				ubifs_err("directory inode %lu nlink is %d, "
 					  "but calculated nlink is %d",
-					  fscki->inum, fscki->nlink,
-					  fscki->calc_cnt);
+					  (unsigned long)fscki->inum,
+					  fscki->nlink, fscki->calc_cnt);
 				goto out_dump;
 			}
 		} else {
 			if (fscki->references != fscki->nlink) {
 				ubifs_err("inode %lu nlink is %d, but "
-					  "calculated nlink is %d", fscki->inum,
+					  "calculated nlink is %d",
+					  (unsigned long)fscki->inum,
 					  fscki->nlink, fscki->references);
 				goto out_dump;
 			}
  
  
@@ -1959,20 +1969,21 @@
 		if (fscki->xattr_sz != fscki->calc_xsz) {
 			ubifs_err("inode %lu has xattr size %u, but "
 				  "calculated size is %lld",
-				  fscki->inum, fscki->xattr_sz,
+				  (unsigned long)fscki->inum, fscki->xattr_sz,
 				  fscki->calc_xsz);
 			goto out_dump;
 		}
 		if (fscki->xattr_cnt != fscki->calc_xcnt) {
 			ubifs_err("inode %lu has %u xattrs, but "
-				  "calculated count is %lld", fscki->inum,
+				  "calculated count is %lld",
+				  (unsigned long)fscki->inum,
 				  fscki->xattr_cnt, fscki->calc_xcnt);
 			goto out_dump;
 		}
 		if (fscki->xattr_nms != fscki->calc_xnms) {
 			ubifs_err("inode %lu has xattr names' size %u, but "
 				  "calculated names' size is %lld",
-				  fscki->inum, fscki->xattr_nms,
+				  (unsigned long)fscki->inum, fscki->xattr_nms,
 				  fscki->calc_xnms);
 			goto out_dump;
 		}
  
@@ -1985,11 +1996,12 @@
 	ino_key_init(c, &key, fscki->inum);
 	err = ubifs_lookup_level0(c, &key, &znode, &n);
 	if (!err) {
-		ubifs_err("inode %lu not found in index", fscki->inum);
+		ubifs_err("inode %lu not found in index",
+			  (unsigned long)fscki->inum);
 		return -ENOENT;
 	} else if (err < 0) {
 		ubifs_err("error %d while looking up inode %lu",
-			  err, fscki->inum);
+			  err, (unsigned long)fscki->inum);
 		return err;
 	}
  
@@ -2007,7 +2019,7 @@
 	}
  
 	ubifs_msg("dump of the inode %lu sitting in LEB %d:%d",
-		  fscki->inum, zbr->lnum, zbr->offs);
+		  (unsigned long)fscki->inum, zbr->lnum, zbr->offs);
 	dbg_dump_node(c, ino);
 	kfree(ino);
 	return -EINVAL;
@@ -161,7 +161,7 @@
 			return ERR_PTR(-EINVAL);
 		}
 		ubifs_warn("running out of inode numbers (current %lu, max %d)",
-			   c->highest_inum, INUM_WATERMARK);
+			   (unsigned long)c->highest_inum, INUM_WATERMARK);
 	}
  
 	inode->i_ino = ++c->highest_inum;
@@ -690,8 +690,9 @@
 	int dlen = UBIFS_DATA_NODE_SZ + UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR;
 	struct ubifs_inode *ui = ubifs_inode(inode);
  
-	dbg_jnl("ino %lu, blk %u, len %d, key %s", key_inum(c, key),
-		key_block(c, key), len, DBGKEY(key));
+	dbg_jnl("ino %lu, blk %u, len %d, key %s",
+		(unsigned long)key_inum(c, key), key_block(c, key), len,
+		DBGKEY(key));
 	ubifs_assert(len <= UBIFS_BLOCK_SIZE);
  
 	data = kmalloc(dlen, GFP_NOFS);
@@ -1128,7 +1129,8 @@
 	ino_t inum = inode->i_ino;
 	unsigned int blk;
  
-	dbg_jnl("ino %lu, size %lld -> %lld", inum, old_size, new_size);
+	dbg_jnl("ino %lu, size %lld -> %lld",
+		(unsigned long)inum, old_size, new_size);
 	ubifs_assert(!ui->data_len);
 	ubifs_assert(S_ISREG(inode->i_mode));
 	ubifs_assert(mutex_is_locked(&ui->ui_mutex));
@@ -105,7 +105,7 @@
 	list_add_tail(&orphan->list, &c->orph_list);
 	list_add_tail(&orphan->new_list, &c->orph_new);
 	spin_unlock(&c->orphan_lock);
-	dbg_gen("ino %lu", inum);
+	dbg_gen("ino %lu", (unsigned long)inum);
 	return 0;
 }
  
  
@@ -132,14 +132,16 @@
 		else {
 			if (o->dnext) {
 				spin_unlock(&c->orphan_lock);
-				dbg_gen("deleted twice ino %lu", inum);
+				dbg_gen("deleted twice ino %lu",
+					(unsigned long)inum);
 				return;
 			}
 			if (o->cnext) {
 				o->dnext = c->orph_dnext;
 				c->orph_dnext = o;
 				spin_unlock(&c->orphan_lock);
-				dbg_gen("delete later ino %lu", inum);
+				dbg_gen("delete later ino %lu",
+					(unsigned long)inum);
 				return;
 			}
 			rb_erase(p, &c->orph_tree);
  
@@ -151,12 +153,12 @@
 			}
 			spin_unlock(&c->orphan_lock);
 			kfree(o);
-			dbg_gen("inum %lu", inum);
+			dbg_gen("inum %lu", (unsigned long)inum);
 			return;
 		}
 	}
 	spin_unlock(&c->orphan_lock);
-	dbg_err("missing orphan ino %lu", inum);
+	dbg_err("missing orphan ino %lu", (unsigned long)inum);
 	dbg_dump_stack();
 }
  
@@ -448,7 +450,7 @@
 		rb_erase(&orphan->rb, &c->orph_tree);
 		list_del(&orphan->list);
 		c->tot_orphans -= 1;
-		dbg_gen("deleting orphan ino %lu", orphan->inum);
+		dbg_gen("deleting orphan ino %lu", (unsigned long)orphan->inum);
 		kfree(orphan);
 	}
 	c->orph_dnext = NULL;
@@ -536,8 +538,8 @@
 	list_add_tail(&orphan->list, &c->orph_list);
 	orphan->dnext = c->orph_dnext;
 	c->orph_dnext = orphan;
-	dbg_mnt("ino %lu, new %d, tot %d",
-		inum, c->new_orphans, c->tot_orphans);
+	dbg_mnt("ino %lu, new %d, tot %d", (unsigned long)inum,
+		c->new_orphans, c->tot_orphans);
 	return 0;
 }
  
@@ -609,7 +611,8 @@
 		n = (le32_to_cpu(orph->ch.len) - UBIFS_ORPH_NODE_SZ) >> 3;
 		for (i = 0; i < n; i++) {
 			inum = le64_to_cpu(orph->inos[i]);
-			dbg_rcvry("deleting orphaned inode %lu", inum);
+			dbg_rcvry("deleting orphaned inode %lu",
+				  (unsigned long)inum);
 			err = ubifs_tnc_remove_ino(c, inum);
 			if (err)
 				return err;
@@ -840,8 +843,8 @@
 	if (inum != ci->last_ino) {
 		/* Lowest node type is the inode node, so it comes first */
 		if (key_type(c, &zbr->key) != UBIFS_INO_KEY)
-			ubifs_err("found orphan node ino %lu, type %d", inum,
-				  key_type(c, &zbr->key));
+			ubifs_err("found orphan node ino %lu, type %d",
+				  (unsigned long)inum, key_type(c, &zbr->key));
 		ci->last_ino = inum;
 		ci->tot_inos += 1;
 		err = ubifs_tnc_read_node(c, zbr, ci->node);
@@ -853,7 +856,8 @@
 			/* Must be recorded as an orphan */
 			if (!dbg_find_check_orphan(&ci->root, inum) &&
 			    !dbg_find_orphan(c, inum)) {
-				ubifs_err("missing orphan, ino %lu", inum);
+				ubifs_err("missing orphan, ino %lu",
+					  (unsigned long)inum);
 				ci->missing += 1;
 			}
 	}
@@ -1435,13 +1435,13 @@
 	err = ubi_leb_change(c->ubi, lnum, c->sbuf, len, UBI_UNKNOWN);
 	if (err)
 		goto out;
-	dbg_rcvry("inode %lu at %d:%d size %lld -> %lld ", e->inum, lnum, offs,
-		  i_size, e->d_size);
+	dbg_rcvry("inode %lu at %d:%d size %lld -> %lld ",
+		  (unsigned long)e->inum, lnum, offs, i_size, e->d_size);
 	return 0;
  
 out:
 	ubifs_warn("inode %lu failed to fix size %lld -> %lld error %d",
-		   e->inum, e->i_size, e->d_size, err);
+		   (unsigned long)e->inum, e->i_size, e->d_size, err);
 	return err;
 }
  
@@ -1472,7 +1472,8 @@
 				return err;
 			if (err == -ENOENT) {
 				/* Remove data nodes that have no inode */
-				dbg_rcvry("removing ino %lu", e->inum);
+				dbg_rcvry("removing ino %lu",
+					  (unsigned long)e->inum);
 				err = ubifs_tnc_remove_ino(c, e->inum);
 				if (err)
 					return err;
@@ -1493,8 +1494,8 @@
 					return PTR_ERR(inode);
 				if (inode->i_size < e->d_size) {
 					dbg_rcvry("ino %lu size %lld -> %lld",
-						  e->inum, e->d_size,
-						  inode->i_size);
+						  (unsigned long)e->inum,
+						  e->d_size, inode->i_size);
 					inode->i_size = e->d_size;
 					ubifs_inode(inode)->ui_size = e->d_size;
 					e->inode = inode;
@@ -1065,7 +1065,7 @@
 	ubifs_assert(c->bud_bytes <= c->max_bud_bytes || c->need_recovery);
 	dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, "
 		"highest_inum %lu", c->lhead_lnum, c->lhead_offs, c->max_sqnum,
-		c->highest_inum);
+		(unsigned long)c->highest_inum);
 out:
 	destroy_replay_tree(c);
 	destroy_bud_list(c);
@@ -2677,7 +2677,7 @@
 	struct ubifs_dent_node *xent, *pxent = NULL;
 	struct qstr nm = { .name = NULL };
  
-	dbg_tnc("ino %lu", inum);
+	dbg_tnc("ino %lu", (unsigned long)inum);
  
 	/*
 	 * Walk all extended attribute entries and remove them together with
@@ -2697,7 +2697,8 @@
 		}
  
 		xattr_inum = le64_to_cpu(xent->inum);
-		dbg_tnc("xent '%s', ino %lu", xent->name, xattr_inum);
+		dbg_tnc("xent '%s', ino %lu", xent->name,
+			(unsigned long)xattr_inum);
  
 		nm.name = xent->name;
 		nm.len = le16_to_cpu(xent->nlen);
...	...	@@ -101,21 +101,24 @@
101	101	if (c->key_fmt == UBIFS_SIMPLE_KEY_FMT) {
102	102	switch (type) {
103	103	case UBIFS_INO_KEY:
104		- sprintf(p, "(%lu, %s)", key_inum(c, key),
	104	+ sprintf(p, "(%lu, %s)", (unsigned long)key_inum(c, key),
105	105	get_key_type(type));
106	106	break;
107	107	case UBIFS_DENT_KEY:
108	108	case UBIFS_XENT_KEY:
109		- sprintf(p, "(%lu, %s, %#08x)", key_inum(c, key),
	109	+ sprintf(p, "(%lu, %s, %#08x)",
	110	+ (unsigned long)key_inum(c, key),
110	111	get_key_type(type), key_hash(c, key));
111	112	break;
112	113	case UBIFS_DATA_KEY:
113		- sprintf(p, "(%lu, %s, %u)", key_inum(c, key),
	114	+ sprintf(p, "(%lu, %s, %u)",
	115	+ (unsigned long)key_inum(c, key),
114	116	get_key_type(type), key_block(c, key));
115	117	break;
116	118	case UBIFS_TRUN_KEY:
117	119	sprintf(p, "(%lu, %s)",
118		- key_inum(c, key), get_key_type(type));
	120	+ (unsigned long)key_inum(c, key),
	121	+ get_key_type(type));
119	122	break;
120	123	default:
121	124	sprintf(p, "(bad key type: %#08x, %#08x)",
...	...	@@ -1589,7 +1592,7 @@
1589	1592
1590	1593	if (inum > c->highest_inum) {
1591	1594	ubifs_err("too high inode number, max. is %lu",
1592		- c->highest_inum);
	1595	+ (unsigned long)c->highest_inum);
1593	1596	return ERR_PTR(-EINVAL);
1594	1597	}
1595	1598
1596	1599
1597	1600
...	...	@@ -1668,16 +1671,18 @@
1668	1671	ino_key_init(c, &key, inum);
1669	1672	err = ubifs_lookup_level0(c, &key, &znode, &n);
1670	1673	if (!err) {
1671		- ubifs_err("inode %lu not found in index", inum);
	1674	+ ubifs_err("inode %lu not found in index", (unsigned long)inum);
1672	1675	return ERR_PTR(-ENOENT);
1673	1676	} else if (err < 0) {
1674		- ubifs_err("error %d while looking up inode %lu", err, inum);
	1677	+ ubifs_err("error %d while looking up inode %lu",
	1678	+ err, (unsigned long)inum);
1675	1679	return ERR_PTR(err);
1676	1680	}
1677	1681
1678	1682	zbr = &znode->zbranch[n];
1679	1683	if (zbr->len < UBIFS_INO_NODE_SZ) {
1680		- ubifs_err("bad node %lu node length %d", inum, zbr->len);
	1684	+ ubifs_err("bad node %lu node length %d",
	1685	+ (unsigned long)inum, zbr->len);
1681	1686	return ERR_PTR(-EINVAL);
1682	1687	}
1683	1688
...	...	@@ -1697,7 +1702,7 @@
1697	1702	kfree(ino);
1698	1703	if (IS_ERR(fscki)) {
1699	1704	ubifs_err("error %ld while adding inode %lu node",
1700		- PTR_ERR(fscki), inum);
	1705	+ PTR_ERR(fscki), (unsigned long)inum);
1701	1706	return fscki;
1702	1707	}
1703	1708
...	...	@@ -1786,7 +1791,8 @@
1786	1791	if (IS_ERR(fscki)) {
1787	1792	err = PTR_ERR(fscki);
1788	1793	ubifs_err("error %d while processing data node and "
1789		- "trying to find inode node %lu", err, inum);
	1794	+ "trying to find inode node %lu",
	1795	+ err, (unsigned long)inum);
1790	1796	goto out_dump;
1791	1797	}
1792	1798
...	...	@@ -1819,7 +1825,8 @@
1819	1825	if (IS_ERR(fscki)) {
1820	1826	err = PTR_ERR(fscki);
1821	1827	ubifs_err("error %d while processing entry node and "
1822		- "trying to find inode node %lu", err, inum);
	1828	+ "trying to find inode node %lu",
	1829	+ err, (unsigned long)inum);
1823	1830	goto out_dump;
1824	1831	}
1825	1832
...	...	@@ -1832,7 +1839,7 @@
1832	1839	err = PTR_ERR(fscki);
1833	1840	ubifs_err("error %d while processing entry node and "
1834	1841	"trying to find parent inode node %lu",
1835		- err, inum);
	1842	+ err, (unsigned long)inum);
1836	1843	goto out_dump;
1837	1844	}
1838	1845
...	...	@@ -1923,7 +1930,8 @@
1923	1930	fscki->references != 1) {
1924	1931	ubifs_err("directory inode %lu has %d "
1925	1932	"direntries which refer it, but "
1926		- "should be 1", fscki->inum,
	1933	+ "should be 1",
	1934	+ (unsigned long)fscki->inum,
1927	1935	fscki->references);
1928	1936	goto out_dump;
1929	1937	}
1930	1938
1931	1939
1932	1940
...	...	@@ -1931,27 +1939,29 @@
1931	1939	fscki->references != 0) {
1932	1940	ubifs_err("root inode %lu has non-zero (%d) "
1933	1941	"direntries which refer it",
1934		- fscki->inum, fscki->references);
	1942	+ (unsigned long)fscki->inum,
	1943	+ fscki->references);
1935	1944	goto out_dump;
1936	1945	}
1937	1946	if (fscki->calc_sz != fscki->size) {
1938	1947	ubifs_err("directory inode %lu size is %lld, "
1939	1948	"but calculated size is %lld",
1940		- fscki->inum, fscki->size,
1941		- fscki->calc_sz);
	1949	+ (unsigned long)fscki->inum,
	1950	+ fscki->size, fscki->calc_sz);
1942	1951	goto out_dump;
1943	1952	}
1944	1953	if (fscki->calc_cnt != fscki->nlink) {
1945	1954	ubifs_err("directory inode %lu nlink is %d, "
1946	1955	"but calculated nlink is %d",
1947		- fscki->inum, fscki->nlink,
1948		- fscki->calc_cnt);
	1956	+ (unsigned long)fscki->inum,
	1957	+ fscki->nlink, fscki->calc_cnt);
1949	1958	goto out_dump;
1950	1959	}
1951	1960	} else {
1952	1961	if (fscki->references != fscki->nlink) {
1953	1962	ubifs_err("inode %lu nlink is %d, but "
1954		- "calculated nlink is %d", fscki->inum,
	1963	+ "calculated nlink is %d",
	1964	+ (unsigned long)fscki->inum,
1955	1965	fscki->nlink, fscki->references);
1956	1966	goto out_dump;
1957	1967	}
1958	1968
1959	1969
...	...	@@ -1959,20 +1969,21 @@
1959	1969	if (fscki->xattr_sz != fscki->calc_xsz) {
1960	1970	ubifs_err("inode %lu has xattr size %u, but "
1961	1971	"calculated size is %lld",
1962		- fscki->inum, fscki->xattr_sz,
	1972	+ (unsigned long)fscki->inum, fscki->xattr_sz,
1963	1973	fscki->calc_xsz);
1964	1974	goto out_dump;
1965	1975	}
1966	1976	if (fscki->xattr_cnt != fscki->calc_xcnt) {
1967	1977	ubifs_err("inode %lu has %u xattrs, but "
1968		- "calculated count is %lld", fscki->inum,
	1978	+ "calculated count is %lld",
	1979	+ (unsigned long)fscki->inum,
1969	1980	fscki->xattr_cnt, fscki->calc_xcnt);
1970	1981	goto out_dump;
1971	1982	}
1972	1983	if (fscki->xattr_nms != fscki->calc_xnms) {
1973	1984	ubifs_err("inode %lu has xattr names' size %u, but "
1974	1985	"calculated names' size is %lld",
1975		- fscki->inum, fscki->xattr_nms,
	1986	+ (unsigned long)fscki->inum, fscki->xattr_nms,
1976	1987	fscki->calc_xnms);
1977	1988	goto out_dump;
1978	1989	}
1979	1990
...	...	@@ -1985,11 +1996,12 @@
1985	1996	ino_key_init(c, &key, fscki->inum);
1986	1997	err = ubifs_lookup_level0(c, &key, &znode, &n);
1987	1998	if (!err) {
1988		- ubifs_err("inode %lu not found in index", fscki->inum);
	1999	+ ubifs_err("inode %lu not found in index",
	2000	+ (unsigned long)fscki->inum);
1989	2001	return -ENOENT;
1990	2002	} else if (err < 0) {
1991	2003	ubifs_err("error %d while looking up inode %lu",
1992		- err, fscki->inum);
	2004	+ err, (unsigned long)fscki->inum);
1993	2005	return err;
1994	2006	}
1995	2007
...	...	@@ -2007,7 +2019,7 @@
2007	2019	}
2008	2020
2009	2021	ubifs_msg("dump of the inode %lu sitting in LEB %d:%d",
2010		- fscki->inum, zbr->lnum, zbr->offs);
	2022	+ (unsigned long)fscki->inum, zbr->lnum, zbr->offs);
2011	2023	dbg_dump_node(c, ino);
2012	2024	kfree(ino);
2013	2025	return -EINVAL;
...	...	@@ -161,7 +161,7 @@
161	161	return ERR_PTR(-EINVAL);
162	162	}
163	163	ubifs_warn("running out of inode numbers (current %lu, max %d)",
164		- c->highest_inum, INUM_WATERMARK);
	164	+ (unsigned long)c->highest_inum, INUM_WATERMARK);
165	165	}
166	166
167	167	inode->i_ino = ++c->highest_inum;
...	...	@@ -690,8 +690,9 @@
690	690	int dlen = UBIFS_DATA_NODE_SZ + UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR;
691	691	struct ubifs_inode *ui = ubifs_inode(inode);
692	692
693		- dbg_jnl("ino %lu, blk %u, len %d, key %s", key_inum(c, key),
694		- key_block(c, key), len, DBGKEY(key));
	693	+ dbg_jnl("ino %lu, blk %u, len %d, key %s",
	694	+ (unsigned long)key_inum(c, key), key_block(c, key), len,
	695	+ DBGKEY(key));
695	696	ubifs_assert(len <= UBIFS_BLOCK_SIZE);
696	697
697	698	data = kmalloc(dlen, GFP_NOFS);
...	...	@@ -1128,7 +1129,8 @@
1128	1129	ino_t inum = inode->i_ino;
1129	1130	unsigned int blk;
1130	1131
1131		- dbg_jnl("ino %lu, size %lld -> %lld", inum, old_size, new_size);
	1132	+ dbg_jnl("ino %lu, size %lld -> %lld",
	1133	+ (unsigned long)inum, old_size, new_size);
1132	1134	ubifs_assert(!ui->data_len);
1133	1135	ubifs_assert(S_ISREG(inode->i_mode));
1134	1136	ubifs_assert(mutex_is_locked(&ui->ui_mutex));
...	...	@@ -105,7 +105,7 @@
105	105	list_add_tail(&orphan->list, &c->orph_list);
106	106	list_add_tail(&orphan->new_list, &c->orph_new);
107	107	spin_unlock(&c->orphan_lock);
108		- dbg_gen("ino %lu", inum);
	108	+ dbg_gen("ino %lu", (unsigned long)inum);
109	109	return 0;
110	110	}
111	111
112	112
...	...	@@ -132,14 +132,16 @@
132	132	else {
133	133	if (o->dnext) {
134	134	spin_unlock(&c->orphan_lock);
135		- dbg_gen("deleted twice ino %lu", inum);
	135	+ dbg_gen("deleted twice ino %lu",
	136	+ (unsigned long)inum);
136	137	return;
137	138	}
138	139	if (o->cnext) {
139	140	o->dnext = c->orph_dnext;
140	141	c->orph_dnext = o;
141	142	spin_unlock(&c->orphan_lock);
142		- dbg_gen("delete later ino %lu", inum);
	143	+ dbg_gen("delete later ino %lu",
	144	+ (unsigned long)inum);
143	145	return;
144	146	}
145	147	rb_erase(p, &c->orph_tree);
146	148
...	...	@@ -151,12 +153,12 @@
151	153	}
152	154	spin_unlock(&c->orphan_lock);
153	155	kfree(o);
154		- dbg_gen("inum %lu", inum);
	156	+ dbg_gen("inum %lu", (unsigned long)inum);
155	157	return;
156	158	}
157	159	}
158	160	spin_unlock(&c->orphan_lock);
159		- dbg_err("missing orphan ino %lu", inum);
	161	+ dbg_err("missing orphan ino %lu", (unsigned long)inum);
160	162	dbg_dump_stack();
161	163	}
162	164
...	...	@@ -448,7 +450,7 @@
448	450	rb_erase(&orphan->rb, &c->orph_tree);
449	451	list_del(&orphan->list);
450	452	c->tot_orphans -= 1;
451		- dbg_gen("deleting orphan ino %lu", orphan->inum);
	453	+ dbg_gen("deleting orphan ino %lu", (unsigned long)orphan->inum);
452	454	kfree(orphan);
453	455	}
454	456	c->orph_dnext = NULL;
...	...	@@ -536,8 +538,8 @@
536	538	list_add_tail(&orphan->list, &c->orph_list);
537	539	orphan->dnext = c->orph_dnext;
538	540	c->orph_dnext = orphan;
539		- dbg_mnt("ino %lu, new %d, tot %d",
540		- inum, c->new_orphans, c->tot_orphans);
	541	+ dbg_mnt("ino %lu, new %d, tot %d", (unsigned long)inum,
	542	+ c->new_orphans, c->tot_orphans);
541	543	return 0;
542	544	}
543	545
...	...	@@ -609,7 +611,8 @@
609	611	n = (le32_to_cpu(orph->ch.len) - UBIFS_ORPH_NODE_SZ) >> 3;
610	612	for (i = 0; i < n; i++) {
611	613	inum = le64_to_cpu(orph->inos[i]);
612		- dbg_rcvry("deleting orphaned inode %lu", inum);
	614	+ dbg_rcvry("deleting orphaned inode %lu",
	615	+ (unsigned long)inum);
613	616	err = ubifs_tnc_remove_ino(c, inum);
614	617	if (err)
615	618	return err;
...	...	@@ -840,8 +843,8 @@
840	843	if (inum != ci->last_ino) {
841	844	/* Lowest node type is the inode node, so it comes first */
842	845	if (key_type(c, &zbr->key) != UBIFS_INO_KEY)
843		- ubifs_err("found orphan node ino %lu, type %d", inum,
844		- key_type(c, &zbr->key));
	846	+ ubifs_err("found orphan node ino %lu, type %d",
	847	+ (unsigned long)inum, key_type(c, &zbr->key));
845	848	ci->last_ino = inum;
846	849	ci->tot_inos += 1;
847	850	err = ubifs_tnc_read_node(c, zbr, ci->node);
...	...	@@ -853,7 +856,8 @@
853	856	/* Must be recorded as an orphan */
854	857	if (!dbg_find_check_orphan(&ci->root, inum) &&
855	858	!dbg_find_orphan(c, inum)) {
856		- ubifs_err("missing orphan, ino %lu", inum);
	859	+ ubifs_err("missing orphan, ino %lu",
	860	+ (unsigned long)inum);
857	861	ci->missing += 1;
858	862	}
859	863	}
...	...	@@ -1435,13 +1435,13 @@
1435	1435	err = ubi_leb_change(c->ubi, lnum, c->sbuf, len, UBI_UNKNOWN);
1436	1436	if (err)
1437	1437	goto out;
1438		- dbg_rcvry("inode %lu at %d:%d size %lld -> %lld ", e->inum, lnum, offs,
1439		- i_size, e->d_size);
	1438	+ dbg_rcvry("inode %lu at %d:%d size %lld -> %lld ",
	1439	+ (unsigned long)e->inum, lnum, offs, i_size, e->d_size);
1440	1440	return 0;
1441	1441
1442	1442	out:
1443	1443	ubifs_warn("inode %lu failed to fix size %lld -> %lld error %d",
1444		- e->inum, e->i_size, e->d_size, err);
	1444	+ (unsigned long)e->inum, e->i_size, e->d_size, err);
1445	1445	return err;
1446	1446	}
1447	1447
...	...	@@ -1472,7 +1472,8 @@
1472	1472	return err;
1473	1473	if (err == -ENOENT) {
1474	1474	/* Remove data nodes that have no inode */
1475		- dbg_rcvry("removing ino %lu", e->inum);
	1475	+ dbg_rcvry("removing ino %lu",
	1476	+ (unsigned long)e->inum);
1476	1477	err = ubifs_tnc_remove_ino(c, e->inum);
1477	1478	if (err)
1478	1479	return err;
...	...	@@ -1493,8 +1494,8 @@
1493	1494	return PTR_ERR(inode);
1494	1495	if (inode->i_size < e->d_size) {
1495	1496	dbg_rcvry("ino %lu size %lld -> %lld",
1496		- e->inum, e->d_size,
1497		- inode->i_size);
	1497	+ (unsigned long)e->inum,
	1498	+ e->d_size, inode->i_size);
1498	1499	inode->i_size = e->d_size;
1499	1500	ubifs_inode(inode)->ui_size = e->d_size;
1500	1501	e->inode = inode;
...	...	@@ -1065,7 +1065,7 @@
1065	1065	ubifs_assert(c->bud_bytes <= c->max_bud_bytes \|\| c->need_recovery);
1066	1066	dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, "
1067	1067	"highest_inum %lu", c->lhead_lnum, c->lhead_offs, c->max_sqnum,
1068		- c->highest_inum);
	1068	+ (unsigned long)c->highest_inum);
1069	1069	out:
1070	1070	destroy_replay_tree(c);
1071	1071	destroy_bud_list(c);
...	...	@@ -2677,7 +2677,7 @@
2677	2677	struct ubifs_dent_node xent, pxent = NULL;
2678	2678	struct qstr nm = { .name = NULL };
2679	2679
2680		- dbg_tnc("ino %lu", inum);
	2680	+ dbg_tnc("ino %lu", (unsigned long)inum);
2681	2681
2682	2682	/*
2683	2683	* Walk all extended attribute entries and remove them together with
...	...	@@ -2697,7 +2697,8 @@
2697	2697	}
2698	2698
2699	2699	xattr_inum = le64_to_cpu(xent->inum);
2700		- dbg_tnc("xent '%s', ino %lu", xent->name, xattr_inum);
	2700	+ dbg_tnc("xent '%s', ino %lu", xent->name,
	2701	+ (unsigned long)xattr_inum);
2701	2702
2702	2703	nm.name = xent->name;
2703	2704	nm.len = le16_to_cpu(xent->nlen);