From c8767a733b852afa2f5d48a662485c8994b5656f Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Tue, 19 Aug 2008 10:54:29 -0700 Subject: [PATCH] --- yaml --- r: 114383 b: refs/heads/master c: ff1ec20ef65d51cc3466e86912cdeaac16f3aaa0 h: refs/heads/master i: 114381: 8e6d9478bc53d4258f2f8cdea4f99b7d22d7afbe 114379: 5b1950389f13a932cacf6c735f9902ea2d50a809 114375: 1da1e189d8292923e1596df16d756ce6c1804a80 114367: 92a28dee7c8a57d5659903850f44f34c5a0e8c2c v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/xattr.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a70f0be4f50e..877e0e4d2713 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8154da3d2114241cf3edb108b43e2172be86d483 +refs/heads/master: ff1ec20ef65d51cc3466e86912cdeaac16f3aaa0 diff --git a/trunk/fs/ocfs2/xattr.c b/trunk/fs/ocfs2/xattr.c index 090449f9263e..1b349c7367a9 100644 --- a/trunk/fs/ocfs2/xattr.c +++ b/trunk/fs/ocfs2/xattr.c @@ -3264,7 +3264,8 @@ static int ocfs2_half_xattr_bucket(struct inode *inode, xe = &xh->xh_entries[start]; len = sizeof(struct ocfs2_xattr_entry) * (count - start); 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); xe = &xh->xh_entries[count - 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); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - mlog(0, "Set xattr entry len = %d index = %d in bucket %llu\n", - xi->value_len, xi->name_index, + mlog(0, "Set xattr entry len = %lu index = %d in bucket %llu\n", + (unsigned long)xi->value_len, xi->name_index, (unsigned long long)xs->bucket.bhs[0]->b_blocknr); if (!xs->bucket.bhs[1]) {