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/aops.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/aops.c')
-rw-r--r-- | fs/ocfs2/aops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 49eef2c6f4aa..15c594dfd951 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
@@ -1259,7 +1259,8 @@ static int ocfs2_write_cluster(struct address_space *mapping, | |||
1259 | goto out; | 1259 | goto out; |
1260 | } | 1260 | } |
1261 | } else if (unwritten) { | 1261 | } else if (unwritten) { |
1262 | ocfs2_init_dinode_extent_tree(&et, inode, wc->w_di_bh); | 1262 | ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), |
1263 | wc->w_di_bh); | ||
1263 | ret = ocfs2_mark_extent_written(inode, &et, | 1264 | ret = ocfs2_mark_extent_written(inode, &et, |
1264 | wc->w_handle, cpos, 1, phys, | 1265 | wc->w_handle, cpos, 1, phys, |
1265 | meta_ac, &wc->w_dealloc); | 1266 | meta_ac, &wc->w_dealloc); |
@@ -1726,7 +1727,8 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, | |||
1726 | (long long)i_size_read(inode), le32_to_cpu(di->i_clusters), | 1727 | (long long)i_size_read(inode), le32_to_cpu(di->i_clusters), |
1727 | clusters_to_alloc, extents_to_split); | 1728 | clusters_to_alloc, extents_to_split); |
1728 | 1729 | ||
1729 | ocfs2_init_dinode_extent_tree(&et, inode, wc->w_di_bh); | 1730 | ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), |
1731 | wc->w_di_bh); | ||
1730 | ret = ocfs2_lock_allocators(inode, &et, | 1732 | ret = ocfs2_lock_allocators(inode, &et, |
1731 | clusters_to_alloc, extents_to_split, | 1733 | clusters_to_alloc, extents_to_split, |
1732 | &data_ac, &meta_ac); | 1734 | &data_ac, &meta_ac); |