base commit: 107926c10323f17ec683aee70d05eaf6a080c147
Signed-off-by: Dmitry Monakhov <dmonak...@openvz.org>
---
fs/ext4/extents.c | 18 +++++++++---------
fs/ext4/move_extent.c | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 7e8a3d8..6efb87c 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -296,10 +296,10 @@ ext4_force_split_extent_at(handle_t *handle, struct inode
*inode,
int nofail)
{
struct ext4_ext_path *path = *ppath;
- int unwritten = ext4_ext_is_uninitialized(path[path->p_depth].p_ext);
+ int unwritten = ext4_ext_is_unwritten(path[path->p_depth].p_ext);
return ext4_split_extent_at(handle, inode, path, lblk, unwritten ?
- EXT4_EXT_MARK_UNINIT1|EXT4_EXT_MARK_UNINIT2 : 0,
+ EXT4_EXT_MARK_UNWRIT1|EXT4_EXT_MARK_UNWRIT2 : 0,
EXT4_GET_BLOCKS_PRE_IO |
(nofail ? EXT4_GET_BLOCKS_METADATA_NOFAIL:0));
}
@@ -4738,7 +4738,7 @@ static int ext4_convert_and_extend_locked(struct inode
*inode, loff_t offset,
down_write((&EXT4_I(inode)->i_data_sem));
/* find extent for this block */
- path = ext4_ext_find_extent(inode, iblock, NULL);
+ path = ext4_ext_find_extent(inode, iblock, NULL,
EXT4_EX_NOCACHE);
if (IS_ERR(path)) {
err = PTR_ERR(path);
goto done;
@@ -4761,7 +4761,7 @@ static int ext4_convert_and_extend_locked(struct inode
*inode, loff_t offset,
goto done;
}
- if (ext4_ext_is_uninitialized(ex)) {
+ if (ext4_ext_is_unwritten(ex)) {
struct ext4_map_blocks map = {0};
map.m_lblk = iblock;
@@ -5729,7 +5729,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
int e1_len, e2_len, len;
int split = 0;
- path1 = ext4_ext_find_extent(inode1, lblk1, NULL);
+ path1 = ext4_ext_find_extent(inode1, lblk1, NULL,
EXT4_EX_NOCACHE);
if (unlikely(IS_ERR(path1))) {
*erp = PTR_ERR(path1);
path1 = NULL;
@@ -5737,7 +5737,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
count = 0;
goto repeat;
}
- path2 = ext4_ext_find_extent(inode2, lblk2, NULL);
+ path2 = ext4_ext_find_extent(inode2, lblk2, NULL,
EXT4_EX_NOCACHE);
if (unlikely(IS_ERR(path2))) {
*erp = PTR_ERR(path2);
path2 = NULL;
@@ -5843,9 +5843,9 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
ex1->ee_len = cpu_to_le16(e2_len);
ex2->ee_len = cpu_to_le16(e1_len);
if (unwritten)
- ext4_ext_mark_uninitialized(ex2);
- if (ext4_ext_is_uninitialized(&tmp_ex))
- ext4_ext_mark_uninitialized(ex1);
+ ext4_ext_mark_unwritten(ex2);
+ if (ext4_ext_is_unwritten(&tmp_ex))
+ ext4_ext_mark_unwritten(ex1);
ext4_ext_try_to_merge(handle, inode2, path2, ex2);
ext4_ext_try_to_merge(handle, inode1, path1, ex1);
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 4a28b1a..cdf5017 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -633,7 +633,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 orig_blk,
} else { /* in_range(o_start, o_blk, o_len) */
cur_len += cur_blk - o_start;
}
- unwritten = ext4_ext_is_uninitialized(ex);
+ unwritten = ext4_ext_is_unwritten(ex);
if (o_end - o_start < cur_len)
cur_len = o_end - o_start;
--
1.7.1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
