aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/localalloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/localalloc.c')
-rw-r--r--fs/ocfs2/localalloc.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index 149b35181666..0d1973ea32b0 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -143,8 +143,8 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb)
143 143
144 if (!(le32_to_cpu(alloc->i_flags) & 144 if (!(le32_to_cpu(alloc->i_flags) &
145 (OCFS2_LOCAL_ALLOC_FL|OCFS2_BITMAP_FL))) { 145 (OCFS2_LOCAL_ALLOC_FL|OCFS2_BITMAP_FL))) {
146 mlog(ML_ERROR, "Invalid local alloc inode, %"MLFu64"\n", 146 mlog(ML_ERROR, "Invalid local alloc inode, %llu\n",
147 OCFS2_I(inode)->ip_blkno); 147 (unsigned long long)OCFS2_I(inode)->ip_blkno);
148 status = -EINVAL; 148 status = -EINVAL;
149 goto bail; 149 goto bail;
150 } 150 }
@@ -493,9 +493,9 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
493 493
494 if (le32_to_cpu(alloc->id1.bitmap1.i_used) != 494 if (le32_to_cpu(alloc->id1.bitmap1.i_used) !=
495 ocfs2_local_alloc_count_bits(alloc)) { 495 ocfs2_local_alloc_count_bits(alloc)) {
496 ocfs2_error(osb->sb, "local alloc inode %"MLFu64" says it has " 496 ocfs2_error(osb->sb, "local alloc inode %llu says it has "
497 "%u free bits, but a count shows %u", 497 "%u free bits, but a count shows %u",
498 le64_to_cpu(alloc->i_blkno), 498 (unsigned long long)le64_to_cpu(alloc->i_blkno),
499 le32_to_cpu(alloc->id1.bitmap1.i_used), 499 le32_to_cpu(alloc->id1.bitmap1.i_used),
500 ocfs2_local_alloc_count_bits(alloc)); 500 ocfs2_local_alloc_count_bits(alloc));
501 status = -EIO; 501 status = -EIO;
@@ -753,10 +753,11 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
753 ocfs2_clusters_to_blocks(osb->sb, 753 ocfs2_clusters_to_blocks(osb->sb,
754 start - count); 754 start - count);
755 755
756 mlog(0, "freeing %u bits starting at local " 756 mlog(0, "freeing %u bits starting at local alloc bit "
757 "alloc bit %u (la_start_blk = %"MLFu64", " 757 "%u (la_start_blk = %llu, blkno = %llu)\n",
758 "blkno = %"MLFu64")\n", count, start - count, 758 count, start - count,
759 la_start_blk, blkno); 759 (unsigned long long)la_start_blk,
760 (unsigned long long)blkno);
760 761
761 status = ocfs2_free_clusters(handle, main_bm_inode, 762 status = ocfs2_free_clusters(handle, main_bm_inode,
762 main_bm_bh, blkno, count); 763 main_bm_bh, blkno, count);