diff options
author | Joel Becker <joel.becker@oracle.com> | 2008-10-09 20:20:30 -0400 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2008-10-14 14:43:29 -0400 |
commit | 31d33073ca38603dea705dae45e094a64ca062d6 (patch) | |
tree | cf02beb489456ebc9e07bace80e96ad1150f2cbf /fs/ocfs2/alloc.c | |
parent | da1e90985a0e767e44397c9db0937e236033fa58 (diff) |
ocfs2: Require an inode for ocfs2_read_block(s)().
Now that synchronous readers are using ocfs2_read_blocks_sync(), all
callers of ocfs2_read_blocks() are passing an inode. Use it
unconditionally. Since it's there, we don't need to pass the
ocfs2_super either.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/alloc.c')
-rw-r--r-- | fs/ocfs2/alloc.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 052c4cf7db95..a164e09491f8 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
@@ -705,8 +705,8 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb, | |||
705 | last_eb_blk = ocfs2_et_get_last_eb_blk(et); | 705 | last_eb_blk = ocfs2_et_get_last_eb_blk(et); |
706 | 706 | ||
707 | if (last_eb_blk) { | 707 | if (last_eb_blk) { |
708 | retval = ocfs2_read_block(osb, last_eb_blk, | 708 | retval = ocfs2_read_block(inode, last_eb_blk, |
709 | &eb_bh, OCFS2_BH_CACHED, inode); | 709 | &eb_bh, OCFS2_BH_CACHED); |
710 | if (retval < 0) { | 710 | if (retval < 0) { |
711 | mlog_errno(retval); | 711 | mlog_errno(retval); |
712 | goto bail; | 712 | goto bail; |
@@ -1176,8 +1176,7 @@ static int ocfs2_find_branch_target(struct ocfs2_super *osb, | |||
1176 | brelse(bh); | 1176 | brelse(bh); |
1177 | bh = NULL; | 1177 | bh = NULL; |
1178 | 1178 | ||
1179 | status = ocfs2_read_block(osb, blkno, &bh, OCFS2_BH_CACHED, | 1179 | status = ocfs2_read_block(inode, blkno, &bh, OCFS2_BH_CACHED); |
1180 | inode); | ||
1181 | if (status < 0) { | 1180 | if (status < 0) { |
1182 | mlog_errno(status); | 1181 | mlog_errno(status); |
1183 | goto bail; | 1182 | goto bail; |
@@ -1541,8 +1540,7 @@ static int __ocfs2_find_path(struct inode *inode, | |||
1541 | 1540 | ||
1542 | brelse(bh); | 1541 | brelse(bh); |
1543 | bh = NULL; | 1542 | bh = NULL; |
1544 | ret = ocfs2_read_block(OCFS2_SB(inode->i_sb), blkno, | 1543 | ret = ocfs2_read_block(inode, blkno, &bh, OCFS2_BH_CACHED); |
1545 | &bh, OCFS2_BH_CACHED, inode); | ||
1546 | if (ret) { | 1544 | if (ret) { |
1547 | mlog_errno(ret); | 1545 | mlog_errno(ret); |
1548 | goto out; | 1546 | goto out; |
@@ -4296,9 +4294,9 @@ static int ocfs2_figure_insert_type(struct inode *inode, | |||
4296 | * ocfs2_figure_insert_type() and ocfs2_add_branch() | 4294 | * ocfs2_figure_insert_type() and ocfs2_add_branch() |
4297 | * may want it later. | 4295 | * may want it later. |
4298 | */ | 4296 | */ |
4299 | ret = ocfs2_read_block(OCFS2_SB(inode->i_sb), | 4297 | ret = ocfs2_read_block(inode, |
4300 | ocfs2_et_get_last_eb_blk(et), &bh, | 4298 | ocfs2_et_get_last_eb_blk(et), &bh, |
4301 | OCFS2_BH_CACHED, inode); | 4299 | OCFS2_BH_CACHED); |
4302 | if (ret) { | 4300 | if (ret) { |
4303 | mlog_exit(ret); | 4301 | mlog_exit(ret); |
4304 | goto out; | 4302 | goto out; |
@@ -4764,9 +4762,9 @@ static int __ocfs2_mark_extent_written(struct inode *inode, | |||
4764 | if (path->p_tree_depth) { | 4762 | if (path->p_tree_depth) { |
4765 | struct ocfs2_extent_block *eb; | 4763 | struct ocfs2_extent_block *eb; |
4766 | 4764 | ||
4767 | ret = ocfs2_read_block(OCFS2_SB(inode->i_sb), | 4765 | ret = ocfs2_read_block(inode, |
4768 | ocfs2_et_get_last_eb_blk(et), | 4766 | ocfs2_et_get_last_eb_blk(et), |
4769 | &last_eb_bh, OCFS2_BH_CACHED, inode); | 4767 | &last_eb_bh, OCFS2_BH_CACHED); |
4770 | if (ret) { | 4768 | if (ret) { |
4771 | mlog_exit(ret); | 4769 | mlog_exit(ret); |
4772 | goto out; | 4770 | goto out; |
@@ -4923,9 +4921,9 @@ static int ocfs2_split_tree(struct inode *inode, struct ocfs2_extent_tree *et, | |||
4923 | 4921 | ||
4924 | depth = path->p_tree_depth; | 4922 | depth = path->p_tree_depth; |
4925 | if (depth > 0) { | 4923 | if (depth > 0) { |
4926 | ret = ocfs2_read_block(OCFS2_SB(inode->i_sb), | 4924 | ret = ocfs2_read_block(inode, |
4927 | ocfs2_et_get_last_eb_blk(et), | 4925 | ocfs2_et_get_last_eb_blk(et), |
4928 | &last_eb_bh, OCFS2_BH_CACHED, inode); | 4926 | &last_eb_bh, OCFS2_BH_CACHED); |
4929 | if (ret < 0) { | 4927 | if (ret < 0) { |
4930 | mlog_errno(ret); | 4928 | mlog_errno(ret); |
4931 | goto out; | 4929 | goto out; |
@@ -5592,8 +5590,8 @@ static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb, | |||
5592 | goto bail; | 5590 | goto bail; |
5593 | } | 5591 | } |
5594 | 5592 | ||
5595 | status = ocfs2_read_block(osb, OCFS2_I(inode)->ip_blkno, &bh, | 5593 | status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh, |
5596 | OCFS2_BH_CACHED, inode); | 5594 | OCFS2_BH_CACHED); |
5597 | if (status < 0) { | 5595 | if (status < 0) { |
5598 | iput(inode); | 5596 | iput(inode); |
5599 | mlog_errno(status); | 5597 | mlog_errno(status); |
@@ -6991,8 +6989,8 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb, | |||
6991 | ocfs2_init_dealloc_ctxt(&(*tc)->tc_dealloc); | 6989 | ocfs2_init_dealloc_ctxt(&(*tc)->tc_dealloc); |
6992 | 6990 | ||
6993 | if (fe->id2.i_list.l_tree_depth) { | 6991 | if (fe->id2.i_list.l_tree_depth) { |
6994 | status = ocfs2_read_block(osb, le64_to_cpu(fe->i_last_eb_blk), | 6992 | status = ocfs2_read_block(inode, le64_to_cpu(fe->i_last_eb_blk), |
6995 | &last_eb_bh, OCFS2_BH_CACHED, inode); | 6993 | &last_eb_bh, OCFS2_BH_CACHED); |
6996 | if (status < 0) { | 6994 | if (status < 0) { |
6997 | mlog_errno(status); | 6995 | mlog_errno(status); |
6998 | goto bail; | 6996 | goto bail; |