leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext4: use ext4_ext_next_allocated_block instead of mext_next_extent

Browse Source 
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>
This commit is contained in:
Dmitry Monakhov
2014-08-30 23:50:56 -04:00
committed by Theodore Ts'o
parent ee124d2746
commit f8fb4f4150
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ext4/ext4.h
View File

@@ -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, extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor, __u64 start_orig, __u64 start_donor,
__u64 len, __u64 *moved_len); __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 */ /* page-io.c */
extern int __init ext4_init_pageio(void); extern int __init ext4_init_pageio(void);

16
fs/ext4/extents.c
View File

@@ -5304,7 +5304,7 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
struct ext4_ext_path *path; struct ext4_ext_path *path;
int ret = 0, depth; int ret = 0, depth;
struct ext4_extent *extent; struct ext4_extent *extent;
ext4_lblk_t stop_block, current_block; ext4_lblk_t stop_block;
ext4_lblk_t ex_start, ex_end; ext4_lblk_t ex_start, ex_end;
/* Let path point to the last extent */ /* Let path point to the last extent */
@@ -5365,17 +5365,15 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
(unsigned long) start); (unsigned long) start);
return -EIO; return -EIO;
} }
if (start > le32_to_cpu(extent->ee_block)) {
current_block = le32_to_cpu(extent->ee_block);
if (start > current_block) {
/* Hole, move to the next extent */ /* Hole, move to the next extent */
ret = mext_next_extent(inode, path, &extent); if (extent < EXT_LAST_EXTENT(path[depth].p_hdr)) {
if (ret != 0) { path[depth].p_ext++;
} else {
start = ext4_ext_next_allocated_block(path);
ext4_ext_drop_refs(path); ext4_ext_drop_refs(path);
kfree(path); kfree(path);
if (ret == 1) continue;
ret = 0;
break;
} }
} }
ret = ext4_ext_shift_path_extents(path, shift, inode, ret = ext4_ext_shift_path_extents(path, shift, inode,

2
fs/ext4/move_extent.c
View File

@@ -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 * ext4_ext_path structure refers to the last extent, or a negative error
* value on failure. * value on failure.
*/ */
int static int
mext_next_extent(struct inode *inode, struct ext4_ext_path *path, mext_next_extent(struct inode *inode, struct ext4_ext_path *path,
struct ext4_extent **extent) struct ext4_extent **extent)
{ {