Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2ae0210760aed9d626eaede5b63db95e198f7c8e

Authored by Mingming Cao
Committed by Linus Torvalds
1 parent bd81d8eec0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] ext4: blk_type from sector_t to unsigned long long 

Change ext4 in-kernel block type (ext4_fsblk_t) from sector_t to unsigned
long long.  Remove ext4 block type string micro E3FSBLK, replaced with "%llu"

[akpm@osdl.org: build fix]
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 7 changed files with 55 additions and 61 deletions Side-by-side Diff

... ... @@ -103,7 +103,7 @@
103 103 if (!bh)
104 104 ext4_error (sb, "read_block_bitmap",
105 105 "Cannot read block bitmap - "
106   - "block_group = %d, block_bitmap = "E3FSBLK,
  106 + "block_group = %d, block_bitmap = %llu",
107 107 block_group,
108 108 ext4_block_bitmap(desc));
109 109 error_out:
... ... @@ -148,7 +148,7 @@
148 148 rsv = list_entry(n, struct ext4_reserve_window_node, rsv_node);
149 149 if (verbose)
150 150 printk("reservation window 0x%p "
151   - "start: "E3FSBLK", end: "E3FSBLK"\n",
  151 + "start: %llu, end: %llu\n",
152 152 rsv, rsv->rsv_start, rsv->rsv_end);
153 153 if (rsv->rsv_start && rsv->rsv_start >= rsv->rsv_end) {
154 154 printk("Bad reservation %p (start >= end)\n",
... ... @@ -436,7 +436,7 @@
436 436 block + count > ext4_blocks_count(es)) {
437 437 ext4_error (sb, "ext4_free_blocks",
438 438 "Freeing blocks not in datazone - "
439   - "block = "E3FSBLK", count = %lu", block, count);
  439 + "block = %llu, count = %lu", block, count);
440 440 goto error_return;
441 441 }
442 442  
... ... @@ -468,7 +468,7 @@
468 468 sbi->s_itb_per_group))
469 469 ext4_error (sb, "ext4_free_blocks",
470 470 "Freeing blocks in system zones - "
471   - "Block = "E3FSBLK", count = %lu",
  471 + "Block = %llu, count = %lu",
472 472 block, count);
473 473  
474 474 /*
... ... @@ -552,7 +552,7 @@
552 552 bit + i, bitmap_bh->b_data)) {
553 553 jbd_unlock_bh_state(bitmap_bh);
554 554 ext4_error(sb, __FUNCTION__,
555   - "bit already cleared for block "E3FSBLK,
  555 + "bit already cleared for block %llu",
556 556 (ext4_fsblk_t)(block + i));
557 557 jbd_lock_bh_state(bitmap_bh);
558 558 BUFFER_TRACE(bitmap_bh, "bit already cleared");
... ... @@ -1569,7 +1569,7 @@
1569 1569 EXT4_SB(sb)->s_itb_per_group))
1570 1570 ext4_error(sb, "ext4_new_block",
1571 1571 "Allocating block in system zone - "
1572   - "blocks from "E3FSBLK", length %lu",
  1572 + "blocks from %llu, length %lu",
1573 1573 ret_block, num);
1574 1574  
1575 1575 performed_allocation = 1;
... ... @@ -1606,7 +1606,7 @@
1606 1606  
1607 1607 if (ret_block + num - 1 >= ext4_blocks_count(es)) {
1608 1608 ext4_error(sb, "ext4_new_block",
1609   - "block("E3FSBLK") >= blocks count("E3FSBLK") - "
  1609 + "block(%llu) >= blocks count(%llu) - "
1610 1610 "block_group = %lu, es == %p ", ret_block,
1611 1611 ext4_blocks_count(es), group_no, es);
1612 1612 goto out;
... ... @@ -1705,8 +1705,8 @@
1705 1705 bitmap_count += x;
1706 1706 }
1707 1707 brelse(bitmap_bh);
1708   - printk("ext4_count_free_blocks: stored = "E3FSBLK
1709   - ", computed = "E3FSBLK", "E3FSBLK"\n",
  1708 + printk("ext4_count_free_blocks: stored = %llu"
  1709 + ", computed = %llu, %llu\n",
1710 1710 EXT4_FREE_BLOCKS_COUNT(es),
1711 1711 desc_count, bitmap_count);
1712 1712 return bitmap_count;
... ... @@ -281,10 +281,10 @@
281 281 ext_debug("path:");
282 282 for (k = 0; k <= l; k++, path++) {
283 283 if (path->p_idx) {
284   - ext_debug(" %d->"E3FSBLK, le32_to_cpu(path->p_idx->ei_block),
  284 + ext_debug(" %d->%llu", le32_to_cpu(path->p_idx->ei_block),
285 285 idx_pblock(path->p_idx));
286 286 } else if (path->p_ext) {
287   - ext_debug(" %d:%d:"E3FSBLK" ",
  287 + ext_debug(" %d:%d:%llu ",
288 288 le32_to_cpu(path->p_ext->ee_block),
289 289 le16_to_cpu(path->p_ext->ee_len),
290 290 ext_pblock(path->p_ext));
... ... @@ -308,7 +308,7 @@
308 308 ex = EXT_FIRST_EXTENT(eh);
309 309  
310 310 for (i = 0; i < le16_to_cpu(eh->eh_entries); i++, ex++) {
311   - ext_debug("%d:%d:"E3FSBLK" ", le32_to_cpu(ex->ee_block),
  311 + ext_debug("%d:%d:%llu ", le32_to_cpu(ex->ee_block),
312 312 le16_to_cpu(ex->ee_len), ext_pblock(ex));
313 313 }
314 314 ext_debug("\n");
... ... @@ -426,7 +426,7 @@
426 426 }
427 427  
428 428 path->p_ext = l - 1;
429   - ext_debug(" -> %d:"E3FSBLK":%d ",
  429 + ext_debug(" -> %d:%llu:%d ",
430 430 le32_to_cpu(path->p_ext->ee_block),
431 431 ext_pblock(path->p_ext),
432 432 le16_to_cpu(path->p_ext->ee_len));
... ... @@ -687,7 +687,7 @@
687 687 path[depth].p_ext++;
688 688 while (path[depth].p_ext <=
689 689 EXT_MAX_EXTENT(path[depth].p_hdr)) {
690   - ext_debug("move %d:"E3FSBLK":%d in new leaf "E3FSBLK"\n",
  690 + ext_debug("move %d:%llu:%d in new leaf %llu\n",
691 691 le32_to_cpu(path[depth].p_ext->ee_block),
692 692 ext_pblock(path[depth].p_ext),
693 693 le16_to_cpu(path[depth].p_ext->ee_len),
... ... @@ -752,7 +752,7 @@
752 752 fidx->ei_block = border;
753 753 ext4_idx_store_pblock(fidx, oldblock);
754 754  
755   - ext_debug("int.index at %d (block "E3FSBLK"): %lu -> "E3FSBLK"\n", i,
  755 + ext_debug("int.index at %d (block %llu): %lu -> %llu\n", i,
756 756 newblock, (unsigned long) le32_to_cpu(border),
757 757 oldblock);
758 758 /* copy indexes */
... ... @@ -764,7 +764,7 @@
764 764 BUG_ON(EXT_MAX_INDEX(path[i].p_hdr) !=
765 765 EXT_LAST_INDEX(path[i].p_hdr));
766 766 while (path[i].p_idx <= EXT_MAX_INDEX(path[i].p_hdr)) {
767   - ext_debug("%d: move %d:%d in new index "E3FSBLK"\n", i,
  767 + ext_debug("%d: move %d:%d in new index %llu\n", i,
768 768 le32_to_cpu(path[i].p_idx->ei_block),
769 769 idx_pblock(path[i].p_idx),
770 770 newblock);
... ... @@ -898,7 +898,7 @@
898 898  
899 899 neh = ext_inode_hdr(inode);
900 900 fidx = EXT_FIRST_INDEX(neh);
901   - ext_debug("new root: num %d(%d), lblock %d, ptr "E3FSBLK"\n",
  901 + ext_debug("new root: num %d(%d), lblock %d, ptr %llu\n",
902 902 le16_to_cpu(neh->eh_entries), le16_to_cpu(neh->eh_max),
903 903 le32_to_cpu(fidx->ei_block), idx_pblock(fidx));
904 904  
... ... @@ -1145,7 +1145,7 @@
1145 1145  
1146 1146 /* try to insert block into found extent and return */
1147 1147 if (ex && ext4_can_extents_be_merged(inode, ex, newext)) {
1148   - ext_debug("append %d block to %d:%d (from "E3FSBLK")\n",
  1148 + ext_debug("append %d block to %d:%d (from %llu)\n",
1149 1149 le16_to_cpu(newext->ee_len),
1150 1150 le32_to_cpu(ex->ee_block),
1151 1151 le16_to_cpu(ex->ee_len), ext_pblock(ex));
... ... @@ -1204,7 +1204,7 @@
1204 1204  
1205 1205 if (!nearex) {
1206 1206 /* there is no extent in this leaf, create first one */
1207   - ext_debug("first extent in the leaf: %d:"E3FSBLK":%d\n",
  1207 + ext_debug("first extent in the leaf: %d:%llu:%d\n",
1208 1208 le32_to_cpu(newext->ee_block),
1209 1209 ext_pblock(newext),
1210 1210 le16_to_cpu(newext->ee_len));
... ... @@ -1216,7 +1216,7 @@
1216 1216 len = EXT_MAX_EXTENT(eh) - nearex;
1217 1217 len = (len - 1) * sizeof(struct ext4_extent);
1218 1218 len = len < 0 ? 0 : len;
1219   - ext_debug("insert %d:"E3FSBLK":%d after: nearest 0x%p, "
  1219 + ext_debug("insert %d:%llu:%d after: nearest 0x%p, "
1220 1220 "move %d from 0x%p to 0x%p\n",
1221 1221 le32_to_cpu(newext->ee_block),
1222 1222 ext_pblock(newext),
... ... @@ -1229,7 +1229,7 @@
1229 1229 BUG_ON(newext->ee_block == nearex->ee_block);
1230 1230 len = (EXT_MAX_EXTENT(eh) - nearex) * sizeof(struct ext4_extent);
1231 1231 len = len < 0 ? 0 : len;
1232   - ext_debug("insert %d:"E3FSBLK":%d before: nearest 0x%p, "
  1232 + ext_debug("insert %d:%llu:%d before: nearest 0x%p, "
1233 1233 "move %d from 0x%p to 0x%p\n",
1234 1234 le32_to_cpu(newext->ee_block),
1235 1235 ext_pblock(newext),
... ... @@ -1464,7 +1464,7 @@
1464 1464 ex->ee_block = cpu_to_le32(cex->ec_block);
1465 1465 ext4_ext_store_pblock(ex, cex->ec_start);
1466 1466 ex->ee_len = cpu_to_le16(cex->ec_len);
1467   - ext_debug("%lu cached by %lu:%lu:"E3FSBLK"\n",
  1467 + ext_debug("%lu cached by %lu:%lu:%llu\n",
1468 1468 (unsigned long) block,
1469 1469 (unsigned long) cex->ec_block,
1470 1470 (unsigned long) cex->ec_len,
... ... @@ -1498,7 +1498,7 @@
1498 1498 path->p_hdr->eh_entries = cpu_to_le16(le16_to_cpu(path->p_hdr->eh_entries)-1);
1499 1499 if ((err = ext4_ext_dirty(handle, inode, path)))
1500 1500 return err;
1501   - ext_debug("index is empty, remove it, free block "E3FSBLK"\n", leaf);
  1501 + ext_debug("index is empty, remove it, free block %llu\n", leaf);
1502 1502 bh = sb_find_get_block(inode->i_sb, leaf);
1503 1503 ext4_forget(handle, 1, inode, bh, leaf);
1504 1504 ext4_free_blocks(handle, inode, leaf, 1);
... ... @@ -1585,7 +1585,7 @@
1585 1585 ext4_fsblk_t start;
1586 1586 num = le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len) - from;
1587 1587 start = ext_pblock(ex) + le16_to_cpu(ex->ee_len) - num;
1588   - ext_debug("free last %lu blocks starting "E3FSBLK"\n", num, start);
  1588 + ext_debug("free last %lu blocks starting %llu\n", num, start);
1589 1589 for (i = 0; i < num; i++) {
1590 1590 bh = sb_find_get_block(inode->i_sb, start + i);
1591 1591 ext4_forget(handle, 0, inode, bh, start + i);
... ... @@ -1699,7 +1699,7 @@
1699 1699 if (err)
1700 1700 goto out;
1701 1701  
1702   - ext_debug("new extent: %u:%u:"E3FSBLK"\n", block, num,
  1702 + ext_debug("new extent: %u:%u:%llu\n", block, num,
1703 1703 ext_pblock(ex));
1704 1704 ex--;
1705 1705 ex_ee_block = le32_to_cpu(ex->ee_block);
... ... @@ -1816,7 +1816,7 @@
1816 1816 path[i].p_idx);
1817 1817 if (ext4_ext_more_to_rm(path + i)) {
1818 1818 /* go to the next level */
1819   - ext_debug("move to level %d (block "E3FSBLK")\n",
  1819 + ext_debug("move to level %d (block %llu)\n",
1820 1820 i + 1, idx_pblock(path[i].p_idx));
1821 1821 memset(path + i + 1, 0, sizeof(*path));
1822 1822 path[i+1].p_bh =
... ... @@ -1993,7 +1993,7 @@
1993 1993 newblock = iblock - ee_block + ee_start;
1994 1994 /* number of remaining blocks in the extent */
1995 1995 allocated = ee_len - (iblock - ee_block);
1996   - ext_debug("%d fit into %lu:%d -> "E3FSBLK"\n", (int) iblock,
  1996 + ext_debug("%d fit into %lu:%d -> %llu\n", (int) iblock,
1997 1997 ee_block, ee_len, newblock);
1998 1998 ext4_ext_put_in_cache(inode, ee_block, ee_len,
1999 1999 ee_start, EXT4_EXT_CACHE_EXTENT);
... ... @@ -2024,7 +2024,7 @@
2024 2024 newblock = ext4_new_blocks(handle, inode, goal, &allocated, &err);
2025 2025 if (!newblock)
2026 2026 goto out2;
2027   - ext_debug("allocate new block: goal "E3FSBLK", found "E3FSBLK"/%lu\n",
  2027 + ext_debug("allocate new block: goal %llu, found %llu/%lu\n",
2028 2028 goal, newblock, allocated);
2029 2029  
2030 2030 /* try to insert new extent into found leaf and return */
... ... @@ -2115,7 +2115,7 @@
2115 2115 */
2116 2116 if (!bh) {
2117 2117 ext4_error(inode->i_sb, "ext4_free_branches",
2118   - "Read failure, inode=%lu, block="E3FSBLK,
  2118 + "Read failure, inode=%lu, block=%llu",
2119 2119 inode->i_ino, nr);
2120 2120 continue;
2121 2121 }
... ... @@ -2466,7 +2466,7 @@
2466 2466 if (!bh) {
2467 2467 ext4_error (inode->i_sb, "ext4_get_inode_loc",
2468 2468 "unable to read inode block - "
2469   - "inode=%lu, block="E3FSBLK,
  2469 + "inode=%lu, block=%llu",
2470 2470 inode->i_ino, block);
2471 2471 return -EIO;
2472 2472 }
... ... @@ -2548,7 +2548,7 @@
2548 2548 if (!buffer_uptodate(bh)) {
2549 2549 ext4_error(inode->i_sb, "ext4_get_inode_loc",
2550 2550 "unable to read inode block - "
2551   - "inode=%lu, block="E3FSBLK,
  2551 + "inode=%lu, block=%llu",
2552 2552 inode->i_ino, block);
2553 2553 brelse(bh);
2554 2554 return -EIO;
... ... @@ -64,7 +64,7 @@
64 64 input->blocks_count);
65 65 else if (!(bh = sb_bread(sb, end - 1)))
66 66 ext4_warning(sb, __FUNCTION__,
67   - "Cannot read last block ("E3FSBLK")",
  67 + "Cannot read last block (%llu)",
68 68 end - 1);
69 69 else if (outside(input->block_bitmap, start, end))
70 70 ext4_warning(sb, __FUNCTION__,
71 71  
72 72  
... ... @@ -94,18 +94,18 @@
94 94 else if (inside(input->block_bitmap, start, metaend))
95 95 ext4_warning(sb, __FUNCTION__,
96 96 "Block bitmap (%llu) in GDT table"
97   - " ("E3FSBLK"-"E3FSBLK")",
  97 + " (%llu-%llu)",
98 98 input->block_bitmap, start, metaend - 1);
99 99 else if (inside(input->inode_bitmap, start, metaend))
100 100 ext4_warning(sb, __FUNCTION__,
101 101 "Inode bitmap (%llu) in GDT table"
102   - " ("E3FSBLK"-"E3FSBLK")",
  102 + " (%llu-%llu)",
103 103 input->inode_bitmap, start, metaend - 1);
104 104 else if (inside(input->inode_table, start, metaend) ||
105 105 inside(itend - 1, start, metaend))
106 106 ext4_warning(sb, __FUNCTION__,
107   - "Inode table ("E3FSBLK"-"E3FSBLK") overlaps"
108   - "GDT table ("E3FSBLK"-"E3FSBLK")",
  107 + "Inode table (%llu-%llu) overlaps"
  108 + "GDT table (%llu-%llu)",
109 109 input->inode_table, itend - 1, start, metaend - 1);
110 110 else
111 111 err = 0;
... ... @@ -344,8 +344,8 @@
344 344 if (le32_to_cpu(*p++) !=
345 345 grp * EXT4_BLOCKS_PER_GROUP(sb) + blk){
346 346 ext4_warning(sb, __FUNCTION__,
347   - "reserved GDT "E3FSBLK
348   - " missing grp %d ("E3FSBLK")",
  347 + "reserved GDT %llu"
  348 + " missing grp %d (%llu)",
349 349 blk, grp,
350 350 grp *
351 351 (ext4_fsblk_t)EXT4_BLOCKS_PER_GROUP(sb) +
... ... @@ -424,7 +424,7 @@
424 424 data = (__le32 *)dind->b_data;
425 425 if (le32_to_cpu(data[gdb_num % EXT4_ADDR_PER_BLOCK(sb)]) != gdblock) {
426 426 ext4_warning(sb, __FUNCTION__,
427   - "new group %u GDT block "E3FSBLK" not reserved",
  427 + "new group %u GDT block %llu not reserved",
428 428 input->group, gdblock);
429 429 err = -EINVAL;
430 430 goto exit_dind;
... ... @@ -547,7 +547,7 @@
547 547 for (res = 0; res < reserved_gdb; res++, blk++) {
548 548 if (le32_to_cpu(*data) != blk) {
549 549 ext4_warning(sb, __FUNCTION__,
550   - "reserved block "E3FSBLK
  550 + "reserved block %llu"
551 551 " not at offset %ld",
552 552 blk,
553 553 (long)(data - (__le32 *)dind->b_data));
... ... @@ -941,7 +941,7 @@
941 941 o_groups_count = EXT4_SB(sb)->s_groups_count;
942 942  
943 943 if (test_opt(sb, DEBUG))
944   - printk(KERN_DEBUG "EXT4-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",
  944 + printk(KERN_DEBUG "EXT4-fs: extending last group from %llu uto %llu blocks\n",
945 945 o_blocks_count, n_blocks_count);
946 946  
947 947 if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
... ... @@ -949,7 +949,7 @@
949 949  
950 950 if (n_blocks_count > (sector_t)(~0ULL) >> (sb->s_blocksize_bits - 9)) {
951 951 printk(KERN_ERR "EXT4-fs: filesystem on %s:"
952   - " too large to resize to "E3FSBLK" blocks safely\n",
  952 + " too large to resize to %llu blocks safely\n",
953 953 sb->s_id, n_blocks_count);
954 954 if (sizeof(sector_t) < 8)
955 955 ext4_warning(sb, __FUNCTION__,
... ... @@ -984,7 +984,7 @@
984 984  
985 985 if (o_blocks_count + add < n_blocks_count)
986 986 ext4_warning(sb, __FUNCTION__,
987   - "will only finish group ("E3FSBLK
  987 + "will only finish group (%llu"
988 988 " blocks, %u new)",
989 989 o_blocks_count + add, add);
990 990  
991 991  
... ... @@ -1028,10 +1028,10 @@
1028 1028 ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh);
1029 1029 sb->s_dirt = 1;
1030 1030 unlock_super(sb);
1031   - ext4_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count,
  1031 + ext4_debug("freeing blocks %lu through %llu\n", o_blocks_count,
1032 1032 o_blocks_count + add);
1033 1033 ext4_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);
1034   - ext4_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count,
  1034 + ext4_debug("freed blocks %llu through %llu\n", o_blocks_count,
1035 1035 o_blocks_count + add);
1036 1036 if ((err = ext4_journal_stop(handle)))
1037 1037 goto exit_put;
... ... @@ -1244,7 +1244,7 @@
1244 1244 {
1245 1245 ext4_error (sb, "ext4_check_descriptors",
1246 1246 "Block bitmap for group %d"
1247   - " not in group (block "E3FSBLK")!",
  1247 + " not in group (block %llu)!",
1248 1248 i, block_bitmap);
1249 1249 return 0;
1250 1250 }
... ... @@ -1253,7 +1253,7 @@
1253 1253 {
1254 1254 ext4_error (sb, "ext4_check_descriptors",
1255 1255 "Inode bitmap for group %d"
1256   - " not in group (block "E3FSBLK")!",
  1256 + " not in group (block %llu)!",
1257 1257 i, inode_bitmap);
1258 1258 return 0;
1259 1259 }
... ... @@ -1263,7 +1263,7 @@
1263 1263 {
1264 1264 ext4_error (sb, "ext4_check_descriptors",
1265 1265 "Inode table for group %d"
1266   - " not in group (block "E3FSBLK")!",
  1266 + " not in group (block %llu)!",
1267 1267 i, inode_table);
1268 1268 return 0;
1269 1269 }
... ... @@ -233,7 +233,7 @@
233 233 atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount));
234 234 if (ext4_xattr_check_block(bh)) {
235 235 bad_block: ext4_error(inode->i_sb, __FUNCTION__,
236   - "inode %lu: bad block "E3FSBLK, inode->i_ino,
  236 + "inode %lu: bad block %llu", inode->i_ino,
237 237 EXT4_I(inode)->i_file_acl);
238 238 error = -EIO;
239 239 goto cleanup;
... ... @@ -375,7 +375,7 @@
375 375 atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount));
376 376 if (ext4_xattr_check_block(bh)) {
377 377 ext4_error(inode->i_sb, __FUNCTION__,
378   - "inode %lu: bad block "E3FSBLK, inode->i_ino,
  378 + "inode %lu: bad block %llu", inode->i_ino,
379 379 EXT4_I(inode)->i_file_acl);
380 380 error = -EIO;
381 381 goto cleanup;
... ... @@ -647,7 +647,7 @@
647 647 le32_to_cpu(BHDR(bs->bh)->h_refcount));
648 648 if (ext4_xattr_check_block(bs->bh)) {
649 649 ext4_error(sb, __FUNCTION__,
650   - "inode %lu: bad block "E3FSBLK, inode->i_ino,
  650 + "inode %lu: bad block %llu", inode->i_ino,
651 651 EXT4_I(inode)->i_file_acl);
652 652 error = -EIO;
653 653 goto cleanup;
... ... @@ -848,7 +848,7 @@
848 848  
849 849 bad_block:
850 850 ext4_error(inode->i_sb, __FUNCTION__,
851   - "inode %lu: bad block "E3FSBLK, inode->i_ino,
  851 + "inode %lu: bad block %llu", inode->i_ino,
852 852 EXT4_I(inode)->i_file_acl);
853 853 goto cleanup;
854 854  
855 855  
... ... @@ -1077,14 +1077,14 @@
1077 1077 bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
1078 1078 if (!bh) {
1079 1079 ext4_error(inode->i_sb, __FUNCTION__,
1080   - "inode %lu: block "E3FSBLK" read error", inode->i_ino,
  1080 + "inode %lu: block %llu read error", inode->i_ino,
1081 1081 EXT4_I(inode)->i_file_acl);
1082 1082 goto cleanup;
1083 1083 }
1084 1084 if (BHDR(bh)->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC) ||
1085 1085 BHDR(bh)->h_blocks != cpu_to_le32(1)) {
1086 1086 ext4_error(inode->i_sb, __FUNCTION__,
1087   - "inode %lu: bad block "E3FSBLK, inode->i_ino,
  1087 + "inode %lu: bad block %llu", inode->i_ino,
1088 1088 EXT4_I(inode)->i_file_acl);
1089 1089 goto cleanup;
1090 1090 }
include/linux/ext4_fs_i.h
Diff comments   View file @ 2ae0210
... ... @@ -25,13 +25,7 @@
25 25 typedef int ext4_grpblk_t;
26 26  
27 27 /* data type for filesystem-wide blocks number */
28   -typedef sector_t ext4_fsblk_t;
29   -
30   -#if BITS_PER_LONG == 64
31   -#define E3FSBLK "%lu"
32   -#else
33   -#define E3FSBLK "%llu"
34   -#endif
  28 +typedef unsigned long long ext4_fsblk_t;
35 29  
36 30 struct ext4_reserve_window {
37 31 ext4_fsblk_t _rsv_start; /* First byte reserved */