aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMark Fasheh <mfasheh@suse.com>2008-10-29 17:45:30 -0400
committerMark Fasheh <mfasheh@suse.com>2008-11-10 12:51:47 -0500
commitde29c08528bae45e3fa1171d190f1340e37e0f70 (patch)
tree984eb170a7e1d15f589eb6684f7522fa10786de5 /fs
parentc435400140d24fbcb3da6b1e006be831f9056cb6 (diff)
ocfs2: fix printk related build warnings in xattr.c
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/xattr.c34
1 files changed, 20 insertions, 14 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index f3ea7efb48c6..70baffeb1812 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -2336,7 +2336,8 @@ static int ocfs2_xattr_index_block_find(struct inode *inode,
2336 BUG_ON(p_blkno == 0 || num_clusters == 0 || first_hash > name_hash); 2336 BUG_ON(p_blkno == 0 || num_clusters == 0 || first_hash > name_hash);
2337 2337
2338 mlog(0, "find xattr extent rec %u clusters from %llu, the first hash " 2338 mlog(0, "find xattr extent rec %u clusters from %llu, the first hash "
2339 "in the rec is %u\n", num_clusters, p_blkno, first_hash); 2339 "in the rec is %u\n", num_clusters, (unsigned long long)p_blkno,
2340 first_hash);
2340 2341
2341 ret = ocfs2_xattr_bucket_find(inode, name_index, name, name_hash, 2342 ret = ocfs2_xattr_bucket_find(inode, name_index, name, name_hash,
2342 p_blkno, first_hash, num_clusters, xs); 2343 p_blkno, first_hash, num_clusters, xs);
@@ -2360,7 +2361,7 @@ static int ocfs2_iterate_xattr_buckets(struct inode *inode,
2360 memset(&bucket, 0, sizeof(bucket)); 2361 memset(&bucket, 0, sizeof(bucket));
2361 2362
2362 mlog(0, "iterating xattr buckets in %u clusters starting from %llu\n", 2363 mlog(0, "iterating xattr buckets in %u clusters starting from %llu\n",
2363 clusters, blkno); 2364 clusters, (unsigned long long)blkno);
2364 2365
2365 for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) { 2366 for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) {
2366 ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, 2367 ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket,
@@ -2378,7 +2379,8 @@ static int ocfs2_iterate_xattr_buckets(struct inode *inode,
2378 if (i == 0) 2379 if (i == 0)
2379 num_buckets = le16_to_cpu(bucket.xh->xh_num_buckets); 2380 num_buckets = le16_to_cpu(bucket.xh->xh_num_buckets);
2380 2381
2381 mlog(0, "iterating xattr bucket %llu, first hash %u\n", blkno, 2382 mlog(0, "iterating xattr bucket %llu, first hash %u\n",
2383 (unsigned long long)blkno,
2382 le32_to_cpu(bucket.xh->xh_entries[0].xe_name_hash)); 2384 le32_to_cpu(bucket.xh->xh_entries[0].xe_name_hash));
2383 if (func) { 2385 if (func) {
2384 ret = func(inode, &bucket, para); 2386 ret = func(inode, &bucket, para);
@@ -2714,7 +2716,8 @@ static int ocfs2_xattr_create_index_block(struct inode *inode,
2714 */ 2716 */
2715 blkno = ocfs2_clusters_to_blocks(inode->i_sb, bit_off); 2717 blkno = ocfs2_clusters_to_blocks(inode->i_sb, bit_off);
2716 2718
2717 mlog(0, "allocate 1 cluster from %llu to xattr block\n", blkno); 2719 mlog(0, "allocate 1 cluster from %llu to xattr block\n",
2720 (unsigned long long)blkno);
2718 2721
2719 xh_bh = sb_getblk(inode->i_sb, blkno); 2722 xh_bh = sb_getblk(inode->i_sb, blkno);
2720 if (!xh_bh) { 2723 if (!xh_bh) {
@@ -2883,8 +2886,8 @@ static int ocfs2_defrag_xattr_bucket(struct inode *inode,
2883 2886
2884 mlog(0, "adjust xattr bucket in %llu, count = %u, " 2887 mlog(0, "adjust xattr bucket in %llu, count = %u, "
2885 "xh_free_start = %u, xh_name_value_len = %u.\n", 2888 "xh_free_start = %u, xh_name_value_len = %u.\n",
2886 blkno, le16_to_cpu(xh->xh_count), xh_free_start, 2889 (unsigned long long)blkno, le16_to_cpu(xh->xh_count),
2887 le16_to_cpu(xh->xh_name_value_len)); 2890 xh_free_start, le16_to_cpu(xh->xh_name_value_len));
2888 2891
2889 /* 2892 /*
2890 * sort all the entries by their offset. 2893 * sort all the entries by their offset.
@@ -3000,7 +3003,7 @@ static int ocfs2_mv_xattr_bucket_cross_cluster(struct inode *inode,
3000 prev_blkno += (num_clusters - 1) * bpc + bpc / 2; 3003 prev_blkno += (num_clusters - 1) * bpc + bpc / 2;
3001 3004
3002 mlog(0, "move half of xattrs in cluster %llu to %llu\n", 3005 mlog(0, "move half of xattrs in cluster %llu to %llu\n",
3003 prev_blkno, new_blkno); 3006 (unsigned long long)prev_blkno, (unsigned long long)new_blkno);
3004 3007
3005 /* 3008 /*
3006 * We need to update the 1st half of the new cluster and 3009 * We need to update the 1st half of the new cluster and
@@ -3177,7 +3180,7 @@ static int ocfs2_divide_xattr_bucket(struct inode *inode,
3177 int blocksize = inode->i_sb->s_blocksize; 3180 int blocksize = inode->i_sb->s_blocksize;
3178 3181
3179 mlog(0, "move some of xattrs from bucket %llu to %llu\n", 3182 mlog(0, "move some of xattrs from bucket %llu to %llu\n",
3180 blk, new_blk); 3183 (unsigned long long)blk, (unsigned long long)new_blk);
3181 3184
3182 s_bhs = kcalloc(blk_per_bucket, sizeof(struct buffer_head *), GFP_NOFS); 3185 s_bhs = kcalloc(blk_per_bucket, sizeof(struct buffer_head *), GFP_NOFS);
3183 if (!s_bhs) 3186 if (!s_bhs)
@@ -3376,7 +3379,8 @@ static int ocfs2_cp_xattr_bucket(struct inode *inode,
3376 BUG_ON(s_blkno == t_blkno); 3379 BUG_ON(s_blkno == t_blkno);
3377 3380
3378 mlog(0, "cp bucket %llu to %llu, target is %d\n", 3381 mlog(0, "cp bucket %llu to %llu, target is %d\n",
3379 s_blkno, t_blkno, t_is_new); 3382 (unsigned long long)s_blkno, (unsigned long long)t_blkno,
3383 t_is_new);
3380 3384
3381 s_bhs = kzalloc(sizeof(struct buffer_head *) * blk_per_bucket, 3385 s_bhs = kzalloc(sizeof(struct buffer_head *) * blk_per_bucket,
3382 GFP_NOFS); 3386 GFP_NOFS);
@@ -3448,7 +3452,8 @@ static int ocfs2_cp_xattr_cluster(struct inode *inode,
3448 struct ocfs2_xattr_header *xh; 3452 struct ocfs2_xattr_header *xh;
3449 u64 to_blk_start = to_blk; 3453 u64 to_blk_start = to_blk;
3450 3454
3451 mlog(0, "cp xattrs from cluster %llu to %llu\n", src_blk, to_blk); 3455 mlog(0, "cp xattrs from cluster %llu to %llu\n",
3456 (unsigned long long)src_blk, (unsigned long long)to_blk);
3452 3457
3453 /* 3458 /*
3454 * We need to update the new cluster and 1 more for the update of 3459 * We need to update the new cluster and 1 more for the update of
@@ -3579,7 +3584,8 @@ static int ocfs2_adjust_xattr_cross_cluster(struct inode *inode,
3579 int bpc = ocfs2_clusters_to_blocks(inode->i_sb, 1); 3584 int bpc = ocfs2_clusters_to_blocks(inode->i_sb, 1);
3580 3585
3581 mlog(0, "adjust xattrs from cluster %llu len %u to %llu\n", 3586 mlog(0, "adjust xattrs from cluster %llu len %u to %llu\n",
3582 prev_blk, prev_clusters, new_blk); 3587 (unsigned long long)prev_blk, prev_clusters,
3588 (unsigned long long)new_blk);
3583 3589
3584 if (ocfs2_xattr_buckets_per_cluster(OCFS2_SB(inode->i_sb)) > 1) 3590 if (ocfs2_xattr_buckets_per_cluster(OCFS2_SB(inode->i_sb)) > 1)
3585 ret = ocfs2_mv_xattr_bucket_cross_cluster(inode, 3591 ret = ocfs2_mv_xattr_bucket_cross_cluster(inode,
@@ -3649,7 +3655,7 @@ static int ocfs2_add_new_xattr_cluster(struct inode *inode,
3649 mlog(0, "Add new xattr cluster for %llu, previous xattr hash = %u, " 3655 mlog(0, "Add new xattr cluster for %llu, previous xattr hash = %u, "
3650 "previous xattr blkno = %llu\n", 3656 "previous xattr blkno = %llu\n",
3651 (unsigned long long)OCFS2_I(inode)->ip_blkno, 3657 (unsigned long long)OCFS2_I(inode)->ip_blkno,
3652 prev_cpos, prev_blkno); 3658 prev_cpos, (unsigned long long)prev_blkno);
3653 3659
3654 ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh); 3660 ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh);
3655 3661
@@ -3736,7 +3742,7 @@ static int ocfs2_add_new_xattr_cluster(struct inode *inode,
3736 } 3742 }
3737 } 3743 }
3738 mlog(0, "Insert %u clusters at block %llu for xattr at %u\n", 3744 mlog(0, "Insert %u clusters at block %llu for xattr at %u\n",
3739 num_bits, block, v_start); 3745 num_bits, (unsigned long long)block, v_start);
3740 ret = ocfs2_insert_extent(osb, handle, inode, &et, v_start, block, 3746 ret = ocfs2_insert_extent(osb, handle, inode, &et, v_start, block,
3741 num_bits, 0, meta_ac); 3747 num_bits, 0, meta_ac);
3742 if (ret < 0) { 3748 if (ret < 0) {
@@ -3781,7 +3787,7 @@ static int ocfs2_extend_xattr_bucket(struct inode *inode,
3781 u16 bucket = le16_to_cpu(first_xh->xh_num_buckets); 3787 u16 bucket = le16_to_cpu(first_xh->xh_num_buckets);
3782 3788
3783 mlog(0, "extend xattr bucket in %llu, xattr extend rec starting " 3789 mlog(0, "extend xattr bucket in %llu, xattr extend rec starting "
3784 "from %llu, len = %u\n", start_blk, 3790 "from %llu, len = %u\n", (unsigned long long)start_blk,
3785 (unsigned long long)first_bh->b_blocknr, num_clusters); 3791 (unsigned long long)first_bh->b_blocknr, num_clusters);
3786 3792
3787 BUG_ON(bucket >= num_buckets); 3793 BUG_ON(bucket >= num_buckets);