]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: Mark Fasheh <mfasheh@suse.com> |
2 | Date: Wed, 29 Oct 2008 14:45:30 -0700 | |
3 | Subject: ocfs2: fix printk related build warnings in xattr.c | |
4 | ||
5 | Signed-off-by: Mark Fasheh <mfasheh@suse.com> | |
6 | --- | |
7 | fs/ocfs2/xattr.c | 34 ++++++++++++++++++++-------------- | |
8 | 1 files changed, 20 insertions(+), 14 deletions(-) | |
9 | ||
10 | Index: linux-2.6.27-ocfs2/fs/ocfs2/xattr.c | |
11 | =================================================================== | |
12 | --- linux-2.6.27-ocfs2.orig/fs/ocfs2/xattr.c | |
13 | +++ linux-2.6.27-ocfs2/fs/ocfs2/xattr.c | |
14 | @@ -2336,7 +2336,8 @@ static int ocfs2_xattr_index_block_find( | |
15 | BUG_ON(p_blkno == 0 || num_clusters == 0 || first_hash > name_hash); | |
16 | ||
17 | mlog(0, "find xattr extent rec %u clusters from %llu, the first hash " | |
18 | - "in the rec is %u\n", num_clusters, p_blkno, first_hash); | |
19 | + "in the rec is %u\n", num_clusters, (unsigned long long)p_blkno, | |
20 | + first_hash); | |
21 | ||
22 | ret = ocfs2_xattr_bucket_find(inode, name_index, name, name_hash, | |
23 | p_blkno, first_hash, num_clusters, xs); | |
24 | @@ -2360,7 +2361,7 @@ static int ocfs2_iterate_xattr_buckets(s | |
25 | memset(&bucket, 0, sizeof(bucket)); | |
26 | ||
27 | mlog(0, "iterating xattr buckets in %u clusters starting from %llu\n", | |
28 | - clusters, blkno); | |
29 | + clusters, (unsigned long long)blkno); | |
30 | ||
31 | for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) { | |
32 | ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, | |
33 | @@ -2378,7 +2379,8 @@ static int ocfs2_iterate_xattr_buckets(s | |
34 | if (i == 0) | |
35 | num_buckets = le16_to_cpu(bucket.xh->xh_num_buckets); | |
36 | ||
37 | - mlog(0, "iterating xattr bucket %llu, first hash %u\n", blkno, | |
38 | + mlog(0, "iterating xattr bucket %llu, first hash %u\n", | |
39 | + (unsigned long long)blkno, | |
40 | le32_to_cpu(bucket.xh->xh_entries[0].xe_name_hash)); | |
41 | if (func) { | |
42 | ret = func(inode, &bucket, para); | |
43 | @@ -2714,7 +2716,8 @@ static int ocfs2_xattr_create_index_bloc | |
44 | */ | |
45 | blkno = ocfs2_clusters_to_blocks(inode->i_sb, bit_off); | |
46 | ||
47 | - mlog(0, "allocate 1 cluster from %llu to xattr block\n", blkno); | |
48 | + mlog(0, "allocate 1 cluster from %llu to xattr block\n", | |
49 | + (unsigned long long)blkno); | |
50 | ||
51 | xh_bh = sb_getblk(inode->i_sb, blkno); | |
52 | if (!xh_bh) { | |
53 | @@ -2883,8 +2886,8 @@ static int ocfs2_defrag_xattr_bucket(str | |
54 | ||
55 | mlog(0, "adjust xattr bucket in %llu, count = %u, " | |
56 | "xh_free_start = %u, xh_name_value_len = %u.\n", | |
57 | - blkno, le16_to_cpu(xh->xh_count), xh_free_start, | |
58 | - le16_to_cpu(xh->xh_name_value_len)); | |
59 | + (unsigned long long)blkno, le16_to_cpu(xh->xh_count), | |
60 | + xh_free_start, le16_to_cpu(xh->xh_name_value_len)); | |
61 | ||
62 | /* | |
63 | * sort all the entries by their offset. | |
64 | @@ -3000,7 +3003,7 @@ static int ocfs2_mv_xattr_bucket_cross_c | |
65 | prev_blkno += (num_clusters - 1) * bpc + bpc / 2; | |
66 | ||
67 | mlog(0, "move half of xattrs in cluster %llu to %llu\n", | |
68 | - prev_blkno, new_blkno); | |
69 | + (unsigned long long)prev_blkno, (unsigned long long)new_blkno); | |
70 | ||
71 | /* | |
72 | * We need to update the 1st half of the new cluster and | |
73 | @@ -3177,7 +3180,7 @@ static int ocfs2_divide_xattr_bucket(str | |
74 | int blocksize = inode->i_sb->s_blocksize; | |
75 | ||
76 | mlog(0, "move some of xattrs from bucket %llu to %llu\n", | |
77 | - blk, new_blk); | |
78 | + (unsigned long long)blk, (unsigned long long)new_blk); | |
79 | ||
80 | s_bhs = kcalloc(blk_per_bucket, sizeof(struct buffer_head *), GFP_NOFS); | |
81 | if (!s_bhs) | |
82 | @@ -3376,7 +3379,8 @@ static int ocfs2_cp_xattr_bucket(struct | |
83 | BUG_ON(s_blkno == t_blkno); | |
84 | ||
85 | mlog(0, "cp bucket %llu to %llu, target is %d\n", | |
86 | - s_blkno, t_blkno, t_is_new); | |
87 | + (unsigned long long)s_blkno, (unsigned long long)t_blkno, | |
88 | + t_is_new); | |
89 | ||
90 | s_bhs = kzalloc(sizeof(struct buffer_head *) * blk_per_bucket, | |
91 | GFP_NOFS); | |
92 | @@ -3448,7 +3452,8 @@ static int ocfs2_cp_xattr_cluster(struct | |
93 | struct ocfs2_xattr_header *xh; | |
94 | u64 to_blk_start = to_blk; | |
95 | ||
96 | - mlog(0, "cp xattrs from cluster %llu to %llu\n", src_blk, to_blk); | |
97 | + mlog(0, "cp xattrs from cluster %llu to %llu\n", | |
98 | + (unsigned long long)src_blk, (unsigned long long)to_blk); | |
99 | ||
100 | /* | |
101 | * We need to update the new cluster and 1 more for the update of | |
102 | @@ -3579,7 +3584,8 @@ static int ocfs2_adjust_xattr_cross_clus | |
103 | int bpc = ocfs2_clusters_to_blocks(inode->i_sb, 1); | |
104 | ||
105 | mlog(0, "adjust xattrs from cluster %llu len %u to %llu\n", | |
106 | - prev_blk, prev_clusters, new_blk); | |
107 | + (unsigned long long)prev_blk, prev_clusters, | |
108 | + (unsigned long long)new_blk); | |
109 | ||
110 | if (ocfs2_xattr_buckets_per_cluster(OCFS2_SB(inode->i_sb)) > 1) | |
111 | ret = ocfs2_mv_xattr_bucket_cross_cluster(inode, | |
112 | @@ -3649,7 +3655,7 @@ static int ocfs2_add_new_xattr_cluster(s | |
113 | mlog(0, "Add new xattr cluster for %llu, previous xattr hash = %u, " | |
114 | "previous xattr blkno = %llu\n", | |
115 | (unsigned long long)OCFS2_I(inode)->ip_blkno, | |
116 | - prev_cpos, prev_blkno); | |
117 | + prev_cpos, (unsigned long long)prev_blkno); | |
118 | ||
119 | ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh); | |
120 | ||
121 | @@ -3736,7 +3742,7 @@ static int ocfs2_add_new_xattr_cluster(s | |
122 | } | |
123 | } | |
124 | mlog(0, "Insert %u clusters at block %llu for xattr at %u\n", | |
125 | - num_bits, block, v_start); | |
126 | + num_bits, (unsigned long long)block, v_start); | |
127 | ret = ocfs2_insert_extent(osb, handle, inode, &et, v_start, block, | |
128 | num_bits, 0, meta_ac); | |
129 | if (ret < 0) { | |
130 | @@ -3781,7 +3787,7 @@ static int ocfs2_extend_xattr_bucket(str | |
131 | u16 bucket = le16_to_cpu(first_xh->xh_num_buckets); | |
132 | ||
133 | mlog(0, "extend xattr bucket in %llu, xattr extend rec starting " | |
134 | - "from %llu, len = %u\n", start_blk, | |
135 | + "from %llu, len = %u\n", (unsigned long long)start_blk, | |
136 | (unsigned long long)first_bh->b_blocknr, num_clusters); | |
137 | ||
138 | BUG_ON(bucket >= num_buckets); |