ext4: use ext4_ext_next_allocated_block instead of mext_next_extent

This allows us to make mext_next_extent static and potentially get rid
of it.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

3 files changed, 8 insertions, 12 deletions

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index ca53bcece838..420c9be9f7ae 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2753,8 +2753,6 @@ extern void ext4_double_up_write_data_sem(struct inode *orig_inode,
 extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
                              __u64 start_orig, __u64 start_donor,
                              __u64 len, __u64 *moved_len);
-extern int mext_next_extent(struct inode *inode, struct ext4_ext_path *path,
-                            struct ext4_extent **extent);
 
 /* page-io.c */
 extern int __init ext4_init_pageio(void);
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 74292a71b384..1b768343ddf1 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -5304,7 +5304,7 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
         struct ext4_ext_path *path;
         int ret = 0, depth;
         struct ext4_extent *extent;
-        ext4_lblk_t stop_block, current_block;
+        ext4_lblk_t stop_block;
         ext4_lblk_t ex_start, ex_end;
 
         /* Let path point to the last extent */
@@ -5365,17 +5365,15 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
                                          (unsigned long) start);
                         return -EIO;
                 }
-
-                current_block = le32_to_cpu(extent->ee_block);
-                if (start > current_block) {
+                if (start > le32_to_cpu(extent->ee_block)) {
                         /* Hole, move to the next extent */
-                        ret = mext_next_extent(inode, path, &extent);
-                        if (ret != 0) {
+                        if (extent < EXT_LAST_EXTENT(path[depth].p_hdr)) {
+                                path[depth].p_ext++;
+                        } else {
+                                start = ext4_ext_next_allocated_block(path);
                                 ext4_ext_drop_refs(path);
                                 kfree(path);
-                                if (ret == 1)
-                                        ret = 0;
-                                break;
+                                continue;
                         }
                 }
                 ret = ext4_ext_shift_path_extents(path, shift, inode,
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 671a74b14fd7..123a51b05965 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -76,7 +76,7 @@ copy_extent_status(struct ext4_extent *src, struct ext4_extent *dest)
  * ext4_ext_path structure refers to the last extent, or a negative error
  * value on failure.
  */
-int
+static int
 mext_next_extent(struct inode *inode, struct ext4_ext_path *path,
                       struct ext4_extent **extent)
 {