--- /dev/null
+From: Mark Fasheh <mfasheh@suse.com>
+Date: Wed, 29 Oct 2008 14:45:30 -0700
+Subject: ocfs2: fix printk related build warnings in xattr.c
+
+Signed-off-by: Mark Fasheh <mfasheh@suse.com>
+---
+ fs/ocfs2/xattr.c | 34 ++++++++++++++++++++--------------
+ 1 files changed, 20 insertions(+), 14 deletions(-)
+
+Index: linux-2.6.27-ocfs2/fs/ocfs2/xattr.c
+===================================================================
+--- linux-2.6.27-ocfs2.orig/fs/ocfs2/xattr.c
++++ linux-2.6.27-ocfs2/fs/ocfs2/xattr.c
+@@ -2336,7 +2336,8 @@ static int ocfs2_xattr_index_block_find(
+ BUG_ON(p_blkno == 0 || num_clusters == 0 || first_hash > name_hash);
+
+ mlog(0, "find xattr extent rec %u clusters from %llu, the first hash "
+- "in the rec is %u\n", num_clusters, p_blkno, first_hash);
++ "in the rec is %u\n", num_clusters, (unsigned long long)p_blkno,
++ first_hash);
+
+ ret = ocfs2_xattr_bucket_find(inode, name_index, name, name_hash,
+ p_blkno, first_hash, num_clusters, xs);
+@@ -2360,7 +2361,7 @@ static int ocfs2_iterate_xattr_buckets(s
+ memset(&bucket, 0, sizeof(bucket));
+
+ mlog(0, "iterating xattr buckets in %u clusters starting from %llu\n",
+- clusters, blkno);
++ clusters, (unsigned long long)blkno);
+
+ for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) {
+ ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket,
+@@ -2378,7 +2379,8 @@ static int ocfs2_iterate_xattr_buckets(s
+ if (i == 0)
+ num_buckets = le16_to_cpu(bucket.xh->xh_num_buckets);
+
+- mlog(0, "iterating xattr bucket %llu, first hash %u\n", blkno,
++ mlog(0, "iterating xattr bucket %llu, first hash %u\n",
++ (unsigned long long)blkno,
+ le32_to_cpu(bucket.xh->xh_entries[0].xe_name_hash));
+ if (func) {
+ ret = func(inode, &bucket, para);
+@@ -2714,7 +2716,8 @@ static int ocfs2_xattr_create_index_bloc
+ */
+ blkno = ocfs2_clusters_to_blocks(inode->i_sb, bit_off);
+
+- mlog(0, "allocate 1 cluster from %llu to xattr block\n", blkno);
++ mlog(0, "allocate 1 cluster from %llu to xattr block\n",
++ (unsigned long long)blkno);
+
+ xh_bh = sb_getblk(inode->i_sb, blkno);
+ if (!xh_bh) {
+@@ -2883,8 +2886,8 @@ static int ocfs2_defrag_xattr_bucket(str
+
+ mlog(0, "adjust xattr bucket in %llu, count = %u, "
+ "xh_free_start = %u, xh_name_value_len = %u.\n",
+- blkno, le16_to_cpu(xh->xh_count), xh_free_start,
+- le16_to_cpu(xh->xh_name_value_len));
++ (unsigned long long)blkno, le16_to_cpu(xh->xh_count),
++ xh_free_start, le16_to_cpu(xh->xh_name_value_len));
+
+ /*
+ * sort all the entries by their offset.
+@@ -3000,7 +3003,7 @@ static int ocfs2_mv_xattr_bucket_cross_c
+ prev_blkno += (num_clusters - 1) * bpc + bpc / 2;
+
+ mlog(0, "move half of xattrs in cluster %llu to %llu\n",
+- prev_blkno, new_blkno);
++ (unsigned long long)prev_blkno, (unsigned long long)new_blkno);
+
+ /*
+ * We need to update the 1st half of the new cluster and
+@@ -3177,7 +3180,7 @@ static int ocfs2_divide_xattr_bucket(str
+ int blocksize = inode->i_sb->s_blocksize;
+
+ mlog(0, "move some of xattrs from bucket %llu to %llu\n",
+- blk, new_blk);
++ (unsigned long long)blk, (unsigned long long)new_blk);
+
+ s_bhs = kcalloc(blk_per_bucket, sizeof(struct buffer_head *), GFP_NOFS);
+ if (!s_bhs)
+@@ -3376,7 +3379,8 @@ static int ocfs2_cp_xattr_bucket(struct
+ BUG_ON(s_blkno == t_blkno);
+
+ mlog(0, "cp bucket %llu to %llu, target is %d\n",
+- s_blkno, t_blkno, t_is_new);
++ (unsigned long long)s_blkno, (unsigned long long)t_blkno,
++ t_is_new);
+
+ s_bhs = kzalloc(sizeof(struct buffer_head *) * blk_per_bucket,
+ GFP_NOFS);
+@@ -3448,7 +3452,8 @@ static int ocfs2_cp_xattr_cluster(struct
+ struct ocfs2_xattr_header *xh;
+ u64 to_blk_start = to_blk;
+
+- mlog(0, "cp xattrs from cluster %llu to %llu\n", src_blk, to_blk);
++ mlog(0, "cp xattrs from cluster %llu to %llu\n",
++ (unsigned long long)src_blk, (unsigned long long)to_blk);
+
+ /*
+ * We need to update the new cluster and 1 more for the update of
+@@ -3579,7 +3584,8 @@ static int ocfs2_adjust_xattr_cross_clus
+ int bpc = ocfs2_clusters_to_blocks(inode->i_sb, 1);
+
+ mlog(0, "adjust xattrs from cluster %llu len %u to %llu\n",
+- prev_blk, prev_clusters, new_blk);
++ (unsigned long long)prev_blk, prev_clusters,
++ (unsigned long long)new_blk);
+
+ if (ocfs2_xattr_buckets_per_cluster(OCFS2_SB(inode->i_sb)) > 1)
+ ret = ocfs2_mv_xattr_bucket_cross_cluster(inode,
+@@ -3649,7 +3655,7 @@ static int ocfs2_add_new_xattr_cluster(s
+ mlog(0, "Add new xattr cluster for %llu, previous xattr hash = %u, "
+ "previous xattr blkno = %llu\n",
+ (unsigned long long)OCFS2_I(inode)->ip_blkno,
+- prev_cpos, prev_blkno);
++ prev_cpos, (unsigned long long)prev_blkno);
+
+ ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh);
+
+@@ -3736,7 +3742,7 @@ static int ocfs2_add_new_xattr_cluster(s
+ }
+ }
+ mlog(0, "Insert %u clusters at block %llu for xattr at %u\n",
+- num_bits, block, v_start);
++ num_bits, (unsigned long long)block, v_start);
+ ret = ocfs2_insert_extent(osb, handle, inode, &et, v_start, block,
+ num_bits, 0, meta_ac);
+ if (ret < 0) {
+@@ -3781,7 +3787,7 @@ static int ocfs2_extend_xattr_bucket(str
+ u16 bucket = le16_to_cpu(first_xh->xh_num_buckets);
+
+ mlog(0, "extend xattr bucket in %llu, xattr extend rec starting "
+- "from %llu, len = %u\n", start_blk,
++ "from %llu, len = %u\n", (unsigned long long)start_blk,
+ (unsigned long long)first_bh->b_blocknr, num_clusters);
+
+ BUG_ON(bucket >= num_buckets);
projects / people / teissler / ipfire-2.x.git / blobdiff