mirror of https://gitee.com/openkylin/linux.git
ocfs2: fix printk format warnings
This patch fixes the following build warnings: fs/ocfs2/xattr.c: In function 'ocfs2_half_xattr_bucket': fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 7 has type 'long int' fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 8 has type 'long int' fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 7 has type 'long int' fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 8 has type 'long int' fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 7 has type 'long int' fs/ocfs2/xattr.c:3282: warning: format '%d' expects type 'int', but argument 8 has type 'long int' fs/ocfs2/xattr.c: In function 'ocfs2_xattr_set_entry_in_bucket': fs/ocfs2/xattr.c:4092: warning: format '%d' expects type 'int', but argument 6 has type 'size_t' fs/ocfs2/xattr.c:4092: warning: format '%d' expects type 'int', but argument 6 has type 'size_t' fs/ocfs2/xattr.c:4092: warning: format '%d' expects type 'int', but argument 6 has type 'size_t' Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
8154da3d21
commit
ff1ec20ef6
|
@ -3264,7 +3264,8 @@ static int ocfs2_half_xattr_bucket(struct inode *inode,
|
||||||
xe = &xh->xh_entries[start];
|
xe = &xh->xh_entries[start];
|
||||||
len = sizeof(struct ocfs2_xattr_entry) * (count - start);
|
len = sizeof(struct ocfs2_xattr_entry) * (count - start);
|
||||||
mlog(0, "mv xattr entry len %d from %d to %d\n", len,
|
mlog(0, "mv xattr entry len %d from %d to %d\n", len,
|
||||||
(char *)xe - (char *)xh, (char *)xh->xh_entries - (char *)xh);
|
(int)((char *)xe - (char *)xh),
|
||||||
|
(int)((char *)xh->xh_entries - (char *)xh));
|
||||||
memmove((char *)xh->xh_entries, (char *)xe, len);
|
memmove((char *)xh->xh_entries, (char *)xe, len);
|
||||||
xe = &xh->xh_entries[count - start];
|
xe = &xh->xh_entries[count - start];
|
||||||
len = sizeof(struct ocfs2_xattr_entry) * start;
|
len = sizeof(struct ocfs2_xattr_entry) * start;
|
||||||
|
@ -4073,8 +4074,8 @@ static int ocfs2_xattr_set_entry_in_bucket(struct inode *inode,
|
||||||
u16 blk_per_bucket = ocfs2_blocks_per_xattr_bucket(inode->i_sb);
|
u16 blk_per_bucket = ocfs2_blocks_per_xattr_bucket(inode->i_sb);
|
||||||
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
|
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
|
||||||
|
|
||||||
mlog(0, "Set xattr entry len = %d index = %d in bucket %llu\n",
|
mlog(0, "Set xattr entry len = %lu index = %d in bucket %llu\n",
|
||||||
xi->value_len, xi->name_index,
|
(unsigned long)xi->value_len, xi->name_index,
|
||||||
(unsigned long long)xs->bucket.bhs[0]->b_blocknr);
|
(unsigned long long)xs->bucket.bhs[0]->b_blocknr);
|
||||||
|
|
||||||
if (!xs->bucket.bhs[1]) {
|
if (!xs->bucket.bhs[1]) {
|
||||||
|
|
Loading…
Reference in New Issue