1 From: Mark Fasheh <mfasheh@suse.com>
2 Subject: ocfs2: fix build error
5 I merged the latest ocfs2_read_blocks() changes in xattr.c wrong. This makes
8 Signed-off-by: Mark Fasheh <mfasheh@suse.com>
10 fs/ocfs2/xattr.c | 14 ++++++--------
11 1 files changed, 6 insertions(+), 8 deletions(-)
13 Index: linux-2.6.27/fs/ocfs2/xattr.c
14 ===================================================================
15 --- linux-2.6.27.orig/fs/ocfs2/xattr.c
16 +++ linux-2.6.27/fs/ocfs2/xattr.c
17 @@ -2365,7 +2365,7 @@ static int ocfs2_xattr_bucket_find(struc
19 ret = ocfs2_read_blocks(inode, xs->bucket.bhs[0]->b_blocknr + 1,
20 blk_per_bucket - 1, &xs->bucket.bhs[1],
26 @@ -2442,7 +2442,7 @@ static int ocfs2_iterate_xattr_buckets(s
28 for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) {
29 ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket,
30 - bucket.bhs, OCFS2_BH_CACHED);
35 @@ -2710,7 +2710,7 @@ static int ocfs2_xattr_update_xattr_sear
36 ret = ocfs2_read_blocks(inode,
37 xs->bucket.bhs[0]->b_blocknr + 1,
38 blk_per_bucket - 1, &xs->bucket.bhs[1],
44 @@ -2914,8 +2914,7 @@ static int ocfs2_defrag_xattr_bucket(str
48 - ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, bhs,
50 + ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, bhs, 0);
54 @@ -3169,8 +3168,7 @@ static int ocfs2_read_xattr_bucket(struc
57 return ocfs2_read_blocks(inode, blkno,
58 - blk_per_bucket, bhs,
60 + blk_per_bucket, bhs, 0);
62 for (i = 0; i < blk_per_bucket; i++) {
63 bhs[i] = sb_getblk(inode->i_sb, blkno + i);
64 @@ -4117,7 +4115,7 @@ static int ocfs2_xattr_set_entry_in_buck
65 ret = ocfs2_read_blocks(inode,
66 xs->bucket.bhs[0]->b_blocknr + 1,
67 blk_per_bucket - 1, &xs->bucket.bhs[1],