aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 c25780a70dfd..802c41492214 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -2349,7 +2349,7 @@ static int ocfs2_xattr_bucket_find(struct inode *inode,
2349 */ 2349 */
2350 ret = ocfs2_read_blocks(inode, xs->bucket.bhs[0]->b_blocknr + 1, 2350 ret = ocfs2_read_blocks(inode, xs->bucket.bhs[0]->b_blocknr + 1,
2351 blk_per_bucket - 1, &xs->bucket.bhs[1], 2351 blk_per_bucket - 1, &xs->bucket.bhs[1],
2352 OCFS2_BH_CACHED); 2352 0);
2353 if (ret) { 2353 if (ret) {
2354 mlog_errno(ret); 2354 mlog_errno(ret);
2355 goto out; 2355 goto out;
@@ -2426,7 +2426,7 @@ static int ocfs2_iterate_xattr_buckets(struct inode *inode,
2426 2426
2427 for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) { 2427 for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) {
2428 ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, 2428 ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket,
2429 bucket.bhs, OCFS2_BH_CACHED); 2429 bucket.bhs, 0);
2430 if (ret) { 2430 if (ret) {
2431 mlog_errno(ret); 2431 mlog_errno(ret);
2432 goto out; 2432 goto out;
@@ -2694,7 +2694,7 @@ static int ocfs2_xattr_update_xattr_search(struct inode *inode,
2694 ret = ocfs2_read_blocks(inode, 2694 ret = ocfs2_read_blocks(inode,
2695 xs->bucket.bhs[0]->b_blocknr + 1, 2695 xs->bucket.bhs[0]->b_blocknr + 1,
2696 blk_per_bucket - 1, &xs->bucket.bhs[1], 2696 blk_per_bucket - 1, &xs->bucket.bhs[1],
2697 OCFS2_BH_CACHED); 2697 0);
2698 if (ret) { 2698 if (ret) {
2699 mlog_errno(ret); 2699 mlog_errno(ret);
2700 return ret; 2700 return ret;
@@ -2898,8 +2898,7 @@ static int ocfs2_defrag_xattr_bucket(struct inode *inode,
2898 if (!bhs) 2898 if (!bhs)
2899 return -ENOMEM; 2899 return -ENOMEM;
2900 2900
2901 ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, bhs, 2901 ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, bhs, 0);
2902 OCFS2_BH_CACHED);
2903 if (ret) 2902 if (ret)
2904 goto out; 2903 goto out;
2905 2904
@@ -3153,8 +3152,7 @@ static int ocfs2_read_xattr_bucket(struct inode *inode,
3153 3152
3154 if (!new) 3153 if (!new)
3155 return ocfs2_read_blocks(inode, blkno, 3154 return ocfs2_read_blocks(inode, blkno,
3156 blk_per_bucket, bhs, 3155 blk_per_bucket, bhs, 0);
3157 OCFS2_BH_CACHED);
3158 3156
3159 for (i = 0; i < blk_per_bucket; i++) { 3157 for (i = 0; i < blk_per_bucket; i++) {
3160 bhs[i] = sb_getblk(inode->i_sb, blkno + i); 3158 bhs[i] = sb_getblk(inode->i_sb, blkno + i);
@@ -4101,7 +4099,7 @@ static int ocfs2_xattr_set_entry_in_bucket(struct inode *inode,
4101 ret = ocfs2_read_blocks(inode, 4099 ret = ocfs2_read_blocks(inode,
4102 xs->bucket.bhs[0]->b_blocknr + 1, 4100 xs->bucket.bhs[0]->b_blocknr + 1,
4103 blk_per_bucket - 1, &xs->bucket.bhs[1], 4101 blk_per_bucket - 1, &xs->bucket.bhs[1],
4104 OCFS2_BH_CACHED); 4102 0);
4105 if (ret) { 4103 if (ret) {
4106 mlog_errno(ret); 4104 mlog_errno(ret);
4107 goto out; 4105 goto out;