summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Fasheh <mfasheh@suse.com>2008-10-14 18:31:46 -0700
committerMark Fasheh <mfasheh@suse.com>2008-10-14 18:31:46 -0700
commit1efd47f87317030cb7e37821b8562a8162c1223f (patch)
tree0597427ead70c515b7626b0467200aebe0ab1b43
parent278429cff8809958d25415ba0ed32b59866ab1a8 (diff)
ocfs2: fix build error
I merged the latest ocfs2_read_blocks() changes in xattr.c wrong. This makes Ocfs2 compile again. Signed-off-by: Mark Fasheh <mfasheh@suse.com>
-rw-r--r--fs/ocfs2/xattr.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index c25780a70df..802c4149221 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -2349,7 +2349,7 @@ static int ocfs2_xattr_bucket_find(struct inode *inode,
*/
ret = ocfs2_read_blocks(inode, xs->bucket.bhs[0]->b_blocknr + 1,
blk_per_bucket - 1, &xs->bucket.bhs[1],
- OCFS2_BH_CACHED);
+ 0);
if (ret) {
mlog_errno(ret);
goto out;
@@ -2426,7 +2426,7 @@ static int ocfs2_iterate_xattr_buckets(struct inode *inode,
for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) {
ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket,
- bucket.bhs, OCFS2_BH_CACHED);
+ bucket.bhs, 0);
if (ret) {
mlog_errno(ret);
goto out;
@@ -2694,7 +2694,7 @@ static int ocfs2_xattr_update_xattr_search(struct inode *inode,
ret = ocfs2_read_blocks(inode,
xs->bucket.bhs[0]->b_blocknr + 1,
blk_per_bucket - 1, &xs->bucket.bhs[1],
- OCFS2_BH_CACHED);
+ 0);
if (ret) {
mlog_errno(ret);
return ret;
@@ -2898,8 +2898,7 @@ static int ocfs2_defrag_xattr_bucket(struct inode *inode,
if (!bhs)
return -ENOMEM;
- ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, bhs,
- OCFS2_BH_CACHED);
+ ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, bhs, 0);
if (ret)
goto out;
@@ -3153,8 +3152,7 @@ static int ocfs2_read_xattr_bucket(struct inode *inode,
if (!new)
return ocfs2_read_blocks(inode, blkno,
- blk_per_bucket, bhs,
- OCFS2_BH_CACHED);
+ blk_per_bucket, bhs, 0);
for (i = 0; i < blk_per_bucket; i++) {
bhs[i] = sb_getblk(inode->i_sb, blkno + i);
@@ -4101,7 +4099,7 @@ static int ocfs2_xattr_set_entry_in_bucket(struct inode *inode,
ret = ocfs2_read_blocks(inode,
xs->bucket.bhs[0]->b_blocknr + 1,
blk_per_bucket - 1, &xs->bucket.bhs[1],
- OCFS2_BH_CACHED);
+ 0);
if (ret) {
mlog_errno(ret);
goto out;