ext4: move ext4_ind_migrate() into migrate.c
PATCH v3 1/1 ext4: move ext4_ind_migrate() into migrate.c
Move ext4_ind_migrate() into migrate.c file since it makes much more sense and ext4_ext_migrate() is there as well.
--- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 59 ---------------------------------------------------- fs/ext4/migrate.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 61 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -2131,6 +2131,7 @@ extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);/* migrate.c */ extern int ext4_ext_migrate (struct inode *); +extern int ext4_ind_migrate (struct inode *inode);/* namei.c */ extern int ext4_dirent_csum_verify(struct inode *inode,
@@ -2620,7 +2621,6 @@ extern int ext4_find_delalloc_range(struct inode *inode,extern int ext4_find_delalloc_cluster (struct inode *inode,ext4_lblk_t lblk);extern int ext4_fiemap (struct inode *inode,struct fiemap_extent_info *fieinfo,__u64 start,__u64 len); -extern int ext4_ind_migrate (struct inode *inode);/* move_extent.c */
fs/ext4/extents.c +0 -59
62 lines not on this page · raw message
fs/ext4/migrate.c +59 -1
69 lines not on this page · raw message
Signature · 1 line
1.7.7.6
Quoted 4 lines · Lukas Czerner
Move
ext4_ind_migrate()intomigrate.cfile since it makes much more sense andext4_ext_migrate()is there as well.Signed-off-by Lukas Czerner <[email protected]>
The patch looks good to me. But it seems that you forgot to add bigalloc check. IIRC, that patch hasn't be applied.
Regards,
- Zheng
Quoted 171 lines
--- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 59 ---------------------------------------------------- fs/ext4/migrate.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 61 deletions(-)fs/ext4/ext4.h +1
-1@@ -2131,6 +2131,7 @@ extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);/* migrate.c */ extern int ext4_ext_migrate (struct inode *); +extern int ext4_ind_migrate (struct inode *inode);/* namei.c */ extern int ext4_dirent_csum_verify(struct inode *inode,@@ -2620,7 +2621,6 @@ extern int ext4_find_delalloc_range(struct inode *inode,extern int ext4_find_delalloc_cluster (struct inode *inode,ext4_lblk_t lblk);extern int ext4_fiemap (struct inode *inode,struct fiemap_extent_info *fieinfo,__u64 start,__u64 len); -extern int ext4_ind_migrate (struct inode *inode);/* move_extent.c */ fs/ext4/extents.c +0
-59@@ -4715,62 +4715,3 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,return error; } - -/* -* Migrate a simple extent-based inode to use the i_blocks[] array -*/ -int ext4_ind_migrate (struct inode *inode) -{ -struct ext4_extent_header *eh; -struct ext4_super_block *es =EXT4_SB (inode->i_sb)->s_es; -struct ext4_inode_info *ei =EXT4_I (inode); -struct ext4_extent *ex; -unsigned int i, len; -ext4_fsblk_t blk; -handle_t *handle; -int ret; - -if (!EXT4_HAS_INCOMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_INCOMPAT_EXTENTS ) || - (!ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS ))) -return -EINVAL ; - -down_write (&EXT4_I (inode)->i_data_sem); - ret =ext4_ext_check_inode (inode); -if (ret) - goto errout; - - eh =ext_inode_hdr (inode); - ex =EXT_FIRST_EXTENT (eh); -if (ext4_blocks_count (es) >EXT4_MAX_BLOCK_FILE_PHYS || - eh->eh_depth !=0 || eh->eh_entries >1 ) { - ret = -EOPNOTSUPP ; - goto errout; - } -if (eh->eh_entries ==0 ) - blk = len =0 ; -else { - len =le16_to_cpu (ex->ee_len); - blk =ext4_ext_pblock (ex); -if (len >EXT4_NDIR_BLOCKS ) { - ret = -EOPNOTSUPP ; - goto errout; - } - } - - handle =ext4_journal_start (inode,EXT4_HT_MIGRATE ,1 ); -if (IS_ERR (handle)) { - ret =PTR_ERR (handle); - goto errout; - } - -ext4_clear_inode_flag (inode,EXT4_INODE_EXTENTS ); -memset (ei->i_data,0 ,sizeof (ei->i_data)); -for (i=0 ; i < len; i++) - ei->i_data[i] =cpu_to_le32 (blk++); -ext4_mark_inode_dirty (handle, inode); -ext4_journal_stop (handle); -errout: -up_write (&EXT4_I (inode)->i_data_sem); -return ret; -}fs/ext4/migrate.c +59
-1@@ -426,7 +426,6 @@ static int free_ext_block(handle_t *handle, struct inode *inode)return retval; }return retval; - }int ext4_ext_migrate (struct inode *inode)@@ -606,3 +605,62 @@ out:return retval; } + +/* +* Migrate a simple extent-based inode to use the i_blocks[] array +*/ +int ext4_ind_migrate (struct inode *inode) +{ +struct ext4_extent_header *eh; +struct ext4_super_block *es =EXT4_SB (inode->i_sb)->s_es; +struct ext4_inode_info *ei =EXT4_I (inode); +struct ext4_extent *ex; +unsigned int i, len; +ext4_fsblk_t blk; +handle_t *handle; +int ret; + +if (!EXT4_HAS_INCOMPAT_FEATURE (inode->i_sb, +EXT4_FEATURE_INCOMPAT_EXTENTS ) || + (!ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS ))) +return -EINVAL ; + +down_write (&EXT4_I (inode)->i_data_sem); + ret =ext4_ext_check_inode (inode); +if (ret) + goto errout; + + eh =ext_inode_hdr (inode); + ex =EXT_FIRST_EXTENT (eh); +if (ext4_blocks_count (es) >EXT4_MAX_BLOCK_FILE_PHYS || + eh->eh_depth !=0 || eh->eh_entries >1 ) { + ret = -EOPNOTSUPP ; + goto errout; + } +if (eh->eh_entries ==0 ) + blk = len =0 ; +else { + len =le16_to_cpu (ex->ee_len); + blk =ext4_ext_pblock (ex); +if (len >EXT4_NDIR_BLOCKS ) { + ret = -EOPNOTSUPP ; + goto errout; + } + } + + handle =ext4_journal_start (inode,EXT4_HT_MIGRATE ,1 ); +if (IS_ERR (handle)) { + ret =PTR_ERR (handle); + goto errout; + } + +ext4_clear_inode_flag (inode,EXT4_INODE_EXTENTS ); +memset (ei->i_data,0 ,sizeof (ei->i_data)); +for (i =0 ; i < len; i++) + ei->i_data[i] =cpu_to_le32 (blk++); +ext4_mark_inode_dirty (handle, inode); +ext4_journal_stop (handle); +errout: +up_write (&EXT4_I (inode)->i_data_sem); +return ret; +}Signature · 1 line
1.7.7.6
Quoted 6 lines · Zheng Liu
Date: Tue, 9 Apr 2013 19:03:55 +0800
From: Zheng Liu <[email protected]>
To: Lukas Czerner <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH v3] ext4: moveext4_ind_migrate()intomigrate.c
Quoted 8 lines
Quoted 4 lines · Lukas Czerner
Move
ext4_ind_migrate()intomigrate.cfile since it makes much more sense andext4_ext_migrate()is there as well.Signed-off-by Lukas Czerner <[email protected]>The patch looks good to me. But it seems that you forgot to add bigalloc check. IIRC, that patch hasn't be applied.
right :), I need to resend those as a series.
Thanks!
-Lukas
Quoted 180 lines
Regards,
- ZhengQuoted 171 lines
--- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 59 ---------------------------------------------------- fs/ext4/migrate.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 61 deletions(-)fs/ext4/ext4.h +1
-1@@ -2131,6 +2131,7 @@ extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);/* migrate.c */ extern int ext4_ext_migrate (struct inode *); +extern int ext4_ind_migrate (struct inode *inode);/* namei.c */ extern int ext4_dirent_csum_verify(struct inode *inode,@@ -2620,7 +2621,6 @@ extern int ext4_find_delalloc_range(struct inode *inode,extern int ext4_find_delalloc_cluster (struct inode *inode,ext4_lblk_t lblk);extern int ext4_fiemap (struct inode *inode,struct fiemap_extent_info *fieinfo,__u64 start,__u64 len); -extern int ext4_ind_migrate (struct inode *inode);/* move_extent.c */ fs/ext4/extents.c +0
-59@@ -4715,62 +4715,3 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,return error; } - -/* -* Migrate a simple extent-based inode to use the i_blocks[] array -*/ -int ext4_ind_migrate (struct inode *inode) -{ -struct ext4_extent_header *eh; -struct ext4_super_block *es =EXT4_SB (inode->i_sb)->s_es; -struct ext4_inode_info *ei =EXT4_I (inode); -struct ext4_extent *ex; -unsigned int i, len; -ext4_fsblk_t blk; -handle_t *handle; -int ret; - -if (!EXT4_HAS_INCOMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_INCOMPAT_EXTENTS ) || - (!ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS ))) -return -EINVAL ; - -down_write (&EXT4_I (inode)->i_data_sem); - ret =ext4_ext_check_inode (inode); -if (ret) - goto errout; - - eh =ext_inode_hdr (inode); - ex =EXT_FIRST_EXTENT (eh); -if (ext4_blocks_count (es) >EXT4_MAX_BLOCK_FILE_PHYS || - eh->eh_depth !=0 || eh->eh_entries >1 ) { - ret = -EOPNOTSUPP ; - goto errout; - } -if (eh->eh_entries ==0 ) - blk = len =0 ; -else { - len =le16_to_cpu (ex->ee_len); - blk =ext4_ext_pblock (ex); -if (len >EXT4_NDIR_BLOCKS ) { - ret = -EOPNOTSUPP ; - goto errout; - } - } - - handle =ext4_journal_start (inode,EXT4_HT_MIGRATE ,1 ); -if (IS_ERR (handle)) { - ret =PTR_ERR (handle); - goto errout; - } - -ext4_clear_inode_flag (inode,EXT4_INODE_EXTENTS ); -memset (ei->i_data,0 ,sizeof (ei->i_data)); -for (i=0 ; i < len; i++) - ei->i_data[i] =cpu_to_le32 (blk++); -ext4_mark_inode_dirty (handle, inode); -ext4_journal_stop (handle); -errout: -up_write (&EXT4_I (inode)->i_data_sem); -return ret; -}fs/ext4/migrate.c +59
-1@@ -426,7 +426,6 @@ static int free_ext_block(handle_t *handle, struct inode *inode)return retval; }return retval; - }int ext4_ext_migrate (struct inode *inode)@@ -606,3 +605,62 @@ out:return retval; } + +/* +* Migrate a simple extent-based inode to use the i_blocks[] array +*/ +int ext4_ind_migrate (struct inode *inode) +{ +struct ext4_extent_header *eh; +struct ext4_super_block *es =EXT4_SB (inode->i_sb)->s_es; +struct ext4_inode_info *ei =EXT4_I (inode); +struct ext4_extent *ex; +unsigned int i, len; +ext4_fsblk_t blk; +handle_t *handle; +int ret; + +if (!EXT4_HAS_INCOMPAT_FEATURE (inode->i_sb, +EXT4_FEATURE_INCOMPAT_EXTENTS ) || + (!ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS ))) +return -EINVAL ; + +down_write (&EXT4_I (inode)->i_data_sem); + ret =ext4_ext_check_inode (inode); +if (ret) + goto errout; + + eh =ext_inode_hdr (inode); + ex =EXT_FIRST_EXTENT (eh); +if (ext4_blocks_count (es) >EXT4_MAX_BLOCK_FILE_PHYS || + eh->eh_depth !=0 || eh->eh_entries >1 ) { + ret = -EOPNOTSUPP ; + goto errout; + } +if (eh->eh_entries ==0 ) + blk = len =0 ; +else { + len =le16_to_cpu (ex->ee_len); + blk =ext4_ext_pblock (ex); +if (len >EXT4_NDIR_BLOCKS ) { + ret = -EOPNOTSUPP ; + goto errout; + } + } + + handle =ext4_journal_start (inode,EXT4_HT_MIGRATE ,1 ); +if (IS_ERR (handle)) { + ret =PTR_ERR (handle); + goto errout; + } + +ext4_clear_inode_flag (inode,EXT4_INODE_EXTENTS ); +memset (ei->i_data,0 ,sizeof (ei->i_data)); +for (i =0 ; i < len; i++) + ei->i_data[i] =cpu_to_le32 (blk++); +ext4_mark_inode_dirty (handle, inode); +ext4_journal_stop (handle); +errout: +up_write (&EXT4_I (inode)->i_data_sem); +return ret; +}Signature · 1 line
1.7.7.6--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 20 lines · Lukáš Czerner
Date: Tue, 9 Apr 2013 13:17:09 +0200 (CEST)
From: Lukáš Czerner <[email protected]>
To: Zheng Liu <[email protected]>
Cc: Lukas Czerner <[email protected]>, [email protected]
Subject: Re: [PATCH v3] ext4: moveext4_ind_migrate()intomigrate.cQuoted 12 lines · Zheng Liu
Date: Tue, 9 Apr 2013 19:03:55 +0800
From: Zheng Liu <[email protected]>
To: Lukas Czerner <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH v3] ext4: moveext4_ind_migrate()intomigrate.cQuoted 4 lines · Lukas Czerner
Move
ext4_ind_migrate()intomigrate.cfile since it makes much more sense andext4_ext_migrate()is there as well.Signed-off-by Lukas Czerner <[email protected]>
Quoted 7 lines
Quoted 2 lines
The patch looks good to me. But it seems that you forgot to add bigalloc check. IIRC, that patch hasn't be applied.
right :), I need to resend those as a series.
Thanks!
-Lukas
Also, it's not really v3, sorry for the noise.
-Lukas
Quoted 182 lines
Quoted 181 lines
Regards,
- ZhengQuoted 171 lines
--- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 59 ---------------------------------------------------- fs/ext4/migrate.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 61 deletions(-)fs/ext4/ext4.h +1
-1@@ -2131,6 +2131,7 @@ extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);/* migrate.c */ extern int ext4_ext_migrate (struct inode *); +extern int ext4_ind_migrate (struct inode *inode);/* namei.c */ extern int ext4_dirent_csum_verify(struct inode *inode,@@ -2620,7 +2621,6 @@ extern int ext4_find_delalloc_range(struct inode *inode,extern int ext4_find_delalloc_cluster (struct inode *inode,ext4_lblk_t lblk);extern int ext4_fiemap (struct inode *inode,struct fiemap_extent_info *fieinfo,__u64 start,__u64 len); -extern int ext4_ind_migrate (struct inode *inode);/* move_extent.c */ fs/ext4/extents.c +0
-59@@ -4715,62 +4715,3 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,return error; } - -/* -* Migrate a simple extent-based inode to use the i_blocks[] array -*/ -int ext4_ind_migrate (struct inode *inode) -{ -struct ext4_extent_header *eh; -struct ext4_super_block *es =EXT4_SB (inode->i_sb)->s_es; -struct ext4_inode_info *ei =EXT4_I (inode); -struct ext4_extent *ex; -unsigned int i, len; -ext4_fsblk_t blk; -handle_t *handle; -int ret; - -if (!EXT4_HAS_INCOMPAT_FEATURE (inode->i_sb, -EXT4_FEATURE_INCOMPAT_EXTENTS ) || - (!ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS ))) -return -EINVAL ; - -down_write (&EXT4_I (inode)->i_data_sem); - ret =ext4_ext_check_inode (inode); -if (ret) - goto errout; - - eh =ext_inode_hdr (inode); - ex =EXT_FIRST_EXTENT (eh); -if (ext4_blocks_count (es) >EXT4_MAX_BLOCK_FILE_PHYS || - eh->eh_depth !=0 || eh->eh_entries >1 ) { - ret = -EOPNOTSUPP ; - goto errout; - } -if (eh->eh_entries ==0 ) - blk = len =0 ; -else { - len =le16_to_cpu (ex->ee_len); - blk =ext4_ext_pblock (ex); -if (len >EXT4_NDIR_BLOCKS ) { - ret = -EOPNOTSUPP ; - goto errout; - } - } - - handle =ext4_journal_start (inode,EXT4_HT_MIGRATE ,1 ); -if (IS_ERR (handle)) { - ret =PTR_ERR (handle); - goto errout; - } - -ext4_clear_inode_flag (inode,EXT4_INODE_EXTENTS ); -memset (ei->i_data,0 ,sizeof (ei->i_data)); -for (i=0 ; i < len; i++) - ei->i_data[i] =cpu_to_le32 (blk++); -ext4_mark_inode_dirty (handle, inode); -ext4_journal_stop (handle); -errout: -up_write (&EXT4_I (inode)->i_data_sem); -return ret; -}fs/ext4/migrate.c +59
-1@@ -426,7 +426,6 @@ static int free_ext_block(handle_t *handle, struct inode *inode)return retval; }return retval; - }int ext4_ext_migrate (struct inode *inode)@@ -606,3 +605,62 @@ out:return retval; } + +/* +* Migrate a simple extent-based inode to use the i_blocks[] array +*/ +int ext4_ind_migrate (struct inode *inode) +{ +struct ext4_extent_header *eh; +struct ext4_super_block *es =EXT4_SB (inode->i_sb)->s_es; +struct ext4_inode_info *ei =EXT4_I (inode); +struct ext4_extent *ex; +unsigned int i, len; +ext4_fsblk_t blk; +handle_t *handle; +int ret; + +if (!EXT4_HAS_INCOMPAT_FEATURE (inode->i_sb, +EXT4_FEATURE_INCOMPAT_EXTENTS ) || + (!ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS ))) +return -EINVAL ; + +down_write (&EXT4_I (inode)->i_data_sem); + ret =ext4_ext_check_inode (inode); +if (ret) + goto errout; + + eh =ext_inode_hdr (inode); + ex =EXT_FIRST_EXTENT (eh); +if (ext4_blocks_count (es) >EXT4_MAX_BLOCK_FILE_PHYS || + eh->eh_depth !=0 || eh->eh_entries >1 ) { + ret = -EOPNOTSUPP ; + goto errout; + } +if (eh->eh_entries ==0 ) + blk = len =0 ; +else { + len =le16_to_cpu (ex->ee_len); + blk =ext4_ext_pblock (ex); +if (len >EXT4_NDIR_BLOCKS ) { + ret = -EOPNOTSUPP ; + goto errout; + } + } + + handle =ext4_journal_start (inode,EXT4_HT_MIGRATE ,1 ); +if (IS_ERR (handle)) { + ret =PTR_ERR (handle); + goto errout; + } + +ext4_clear_inode_flag (inode,EXT4_INODE_EXTENTS ); +memset (ei->i_data,0 ,sizeof (ei->i_data)); +for (i =0 ; i < len; i++) + ei->i_data[i] =cpu_to_le32 (blk++); +ext4_mark_inode_dirty (handle, inode); +ext4_journal_stop (handle); +errout: +up_write (&EXT4_I (inode)->i_data_sem); +return ret; +}Signature · 1 line
1.7.7.6--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html