ext4: support simple conversion of extent-mapped inodes to use i_blocks
Theodore Ts'o
maintainerPATCH 1/1 ext4: support simple conversion of extent-mapped inodes to use i_blocks
In order to make it simpler to test the code which support i_blocks/indirect-mapped inodes, support the conversion of inodes which are less than 12 blocks and which are contained in no more than a single extent.
The primary intended use of this code is to converting freshly created zero-length files and empty directories.
Note that the version of chattr in e2fsprogs 1.42.7 and earlier has a check that prevents the clearing of the extent flag. A simple patch which allows "chattr -e <file>" to work will be checked into the e2fsprogs git repository.
Signed-off-by "Theodore Ts'o" <[email protected]>
--- fs/ext4/ext4.h | 3 ++- fs/ext4/extents.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ext4/ioctl.c | 20 ++++++++------------ 3 files changed, 60 insertions(+), 13 deletions(-)
fs/ext4/ext4.h +2 -1
@@ -403,7 +403,7 @@ struct flex_groups {#define EXT4_RESERVED_FL 0x80000000/* reserved for ext4 lib */ #define EXT4_FL_USER_VISIBLE 0x004BDFFF/* User visible flags */ -#define EXT4_FL_USER_MODIFIABLE 0x004B80FF/* User modifiable flags */ +#define EXT4_FL_USER_MODIFIABLE 0x004380FF/* User modifiable flags */ /* Flags that should be inherited by new inodes from their parent. */ #define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\
@@ -2602,6 +2602,7 @@ extern int ext4_ext_check_inode(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 +50 -0
53 lines not on this page · raw message
fs/ext4/ioctl.c +8 -12
@@ -83,17 +83,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)if (!capable (CAP_SYS_RESOURCE )) goto flags_out; } -if (oldflags &EXT4_EXTENTS_FL ) { -/* We don't support clearning extent flags */ -if (!(flags &EXT4_EXTENTS_FL )) { - err = -EOPNOTSUPP ; - goto flags_out; - } - }else if (flags &EXT4_EXTENTS_FL ) { -/* migrate the file */ +if ((flags ^ oldflags) &EXT4_EXTENTS_FL ) migrate =1 ; - flags &= ~EXT4_EXTENTS_FL ; - }if (flags &EXT4_EOFBLOCKS_FL ) {/* we don't support adding EOFBLOCKS flag */
@@ -137,8 +128,13 @@ flags_err: err =ext4_change_inode_journal_flag (inode, jflag);if (err) goto flags_out; -if (migrate) - err =ext4_ext_migrate (inode); +if (migrate) { +if (flags &EXT4_EXTENTS_FL ) + err =ext4_ext_migrate (inode); +else + err =ext4_ind_migrate (inode); + } + flags_out:mutex_unlock (&inode->i_mutex);mnt_drop_write_file (filp);
Signature · 1 line
1.7.12.rc0.22.gcdd159b