]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Mark Fasheh <mfasheh@suse.com> |
2 | Subject: ocfs2: fix printk format warnings | |
3 | Patch-mainline: 2.6.28? | |
4 | References: FATE302067 | |
5 | ||
6 | This patch fixes the following build warnings: | |
7 | ||
8 | fs/ocfs2/xattr.c: In function 'ocfs2_half_xattr_bucket': | |
9 | fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 7 has type 'long int' | |
10 | fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 8 has type 'long int' | |
11 | fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 7 has type 'long int' | |
12 | fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 8 has type 'long int' | |
13 | fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 7 has type 'long int' | |
14 | fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 8 has type 'long int' | |
15 | fs/ocfs2/xattr.c: In function 'ocfs2_xattr_set_entry_in_bucket': | |
16 | fs/ocfs2/xattr.c:4092: warning: format '%d' expects type 'int', but argument 6 has type 'size_t' | |
17 | fs/ocfs2/xattr.c:4092: warning: format '%d' expects type 'int', but argument 6 has type 'size_t' | |
18 | fs/ocfs2/xattr.c:4092: warning: format '%d' expects type 'int', but argument 6 has type 'size_t' | |
19 | ||
20 | Signed-off-by: Mark Fasheh <mfasheh@suse.com> | |
21 | --- | |
22 | fs/ocfs2/xattr.c | 7 ++++--- | |
23 | 1 files changed, 4 insertions(+), 3 deletions(-) | |
24 | ||
25 | diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c | |
26 | index 505fb40..6b7685e 100644 | |
27 | --- a/fs/ocfs2/xattr.c | |
28 | +++ b/fs/ocfs2/xattr.c | |
29 | @@ -3280,7 +3280,8 @@ static int ocfs2_half_xattr_bucket(struct inode *inode, | |
30 | xe = &xh->xh_entries[start]; | |
31 | len = sizeof(struct ocfs2_xattr_entry) * (count - start); | |
32 | mlog(0, "mv xattr entry len %d from %d to %d\n", len, | |
33 | - (char *)xe - (char *)xh, (char *)xh->xh_entries - (char *)xh); | |
34 | + (int)((char *)xe - (char *)xh), | |
35 | + (int)((char *)xh->xh_entries - (char *)xh)); | |
36 | memmove((char *)xh->xh_entries, (char *)xe, len); | |
37 | xe = &xh->xh_entries[count - start]; | |
38 | len = sizeof(struct ocfs2_xattr_entry) * start; | |
39 | @@ -4089,8 +4090,8 @@ static int ocfs2_xattr_set_entry_in_bucket(struct inode *inode, | |
40 | u16 blk_per_bucket = ocfs2_blocks_per_xattr_bucket(inode->i_sb); | |
41 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | |
42 | ||
43 | - mlog(0, "Set xattr entry len = %d index = %d in bucket %llu\n", | |
44 | - xi->value_len, xi->name_index, | |
45 | + mlog(0, "Set xattr entry len = %lu index = %d in bucket %llu\n", | |
46 | + (unsigned long)xi->value_len, xi->name_index, | |
47 | (unsigned long long)xs->bucket.bhs[0]->b_blocknr); | |
48 | ||
49 | if (!xs->bucket.bhs[1]) { | |
50 | -- | |
51 | 1.5.4.5 | |
52 |