aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/inode.c')
-rw-r--r--fs/ocfs2/inode.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 05ad1186a167..522297033945 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -460,8 +460,11 @@ static int ocfs2_read_locked_inode(struct inode *inode,
460 } 460 }
461 } 461 }
462 462
463 status = ocfs2_read_block(osb, args->fi_blkno, &bh, 0, 463 if (can_lock)
464 can_lock ? inode : NULL); 464 status = ocfs2_read_block(osb, args->fi_blkno, &bh, 0,
465 inode);
466 else
467 status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh);
465 if (status < 0) { 468 if (status < 0) {
466 mlog_errno(status); 469 mlog_errno(status);
467 goto bail; 470 goto bail;