diff options
author | Joel Becker <joel.becker@oracle.com> | 2009-02-13 06:54:22 -0500 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2009-09-04 19:08:13 -0400 |
commit | 5e404e9ed1b05cafb044bd46792e50197df805ed (patch) | |
tree | e3146e03f8a0fc12307db0cbea900728a36ffaac /fs/ocfs2/file.c | |
parent | a1cf076ba93f9fdf3eb4195f9f43d1e7cb7550f2 (diff) |
ocfs2: Pass ocfs2_caching_info into ocfs_init_*_extent_tree().
With this commit, extent tree operations are divorced from inodes and
rely on ocfs2_caching_info. Phew!
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 891e2c1e625c..4921b4ee9431 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -515,7 +515,7 @@ int ocfs2_add_inode_data(struct ocfs2_super *osb, | |||
515 | int ret; | 515 | int ret; |
516 | struct ocfs2_extent_tree et; | 516 | struct ocfs2_extent_tree et; |
517 | 517 | ||
518 | ocfs2_init_dinode_extent_tree(&et, inode, fe_bh); | 518 | ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), fe_bh); |
519 | ret = ocfs2_add_clusters_in_btree(handle, &et, logical_offset, | 519 | ret = ocfs2_add_clusters_in_btree(handle, &et, logical_offset, |
520 | clusters_to_add, mark_unwritten, | 520 | clusters_to_add, mark_unwritten, |
521 | data_ac, meta_ac, reason_ret); | 521 | data_ac, meta_ac, reason_ret); |
@@ -563,7 +563,7 @@ restart_all: | |||
563 | (unsigned long long)OCFS2_I(inode)->ip_blkno, | 563 | (unsigned long long)OCFS2_I(inode)->ip_blkno, |
564 | (long long)i_size_read(inode), le32_to_cpu(fe->i_clusters), | 564 | (long long)i_size_read(inode), le32_to_cpu(fe->i_clusters), |
565 | clusters_to_add); | 565 | clusters_to_add); |
566 | ocfs2_init_dinode_extent_tree(&et, inode, bh); | 566 | ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), bh); |
567 | status = ocfs2_lock_allocators(inode, &et, clusters_to_add, 0, | 567 | status = ocfs2_lock_allocators(inode, &et, clusters_to_add, 0, |
568 | &data_ac, &meta_ac); | 568 | &data_ac, &meta_ac); |
569 | if (status) { | 569 | if (status) { |
@@ -1394,7 +1394,7 @@ static int ocfs2_remove_inode_range(struct inode *inode, | |||
1394 | struct address_space *mapping = inode->i_mapping; | 1394 | struct address_space *mapping = inode->i_mapping; |
1395 | struct ocfs2_extent_tree et; | 1395 | struct ocfs2_extent_tree et; |
1396 | 1396 | ||
1397 | ocfs2_init_dinode_extent_tree(&et, inode, di_bh); | 1397 | ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh); |
1398 | ocfs2_init_dealloc_ctxt(&dealloc); | 1398 | ocfs2_init_dealloc_ctxt(&dealloc); |
1399 | 1399 | ||
1400 | if (byte_len == 0) | 1400 | if (byte_len == 0) |