From patchwork Tue Apr 9 11:24:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Czerner X-Patchwork-Id: 235048 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 27FBA2C00C2 for ; Tue, 9 Apr 2013 21:24:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932926Ab3DILYv (ORCPT ); Tue, 9 Apr 2013 07:24:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42104 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755153Ab3DILYv (ORCPT ); Tue, 9 Apr 2013 07:24:51 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r39BOoGV007624 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 9 Apr 2013 07:24:50 -0400 Received: from localhost.localdomain.com (vpn1-7-40.ams2.redhat.com [10.36.7.40]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r39BOmQq028053; Tue, 9 Apr 2013 07:24:49 -0400 From: Lukas Czerner To: linux-ext4@vger.kernel.org Cc: gnehzuil.liu@gmail.com, Lukas Czerner Subject: [PATCH 1/2 v2] ext4: move ext4_ind_migrate() into migrate.c Date: Tue, 9 Apr 2013 13:24:46 +0200 Message-Id: <1365506687-9216-1-git-send-email-lczerner@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Move ext4_ind_migrate() into migrate.c file since it makes much more sense and ext4_ext_migrate() is there as well. Also fix tiny style problem - add spaces around "=" in "i=0". Signed-off-by: Lukas Czerner Reviewed-by: Zheng Liu --- v2: added to the series fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 59 ---------------------------------------------------- fs/ext4/migrate.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 61 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a0637e5..bb56920 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -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 */ diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 6c5a70a..3645357 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -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; -} diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c index 480acf4..3464604 100644 --- a/fs/ext4/migrate.c +++ b/fs/ext4/migrate.c @@ -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; +}