ext4: Add the EXT4_IOC_RESERVE_BLOCK ioctl
Subsystems (2)
RFC PATCH 9/12 ext4: Add the EXT4_IOC_RESERVE_BLOCK ioctl
ext4: online defrag -- Add the EXT4_IOC_RESERVE_BLOCK ioctl.
From: Akira Fujita <[email protected]>
The EXT4_IOC_RESERVE_BLOCK ioctl reserves the specified contiguous free space with ext4 block reservation function. This ioctl is used only in the force defrag (-f).
The block reservation and the multi-block allocation are mutually exclusive, so this ioctl will go away in the next version.
Signed-off-by Akira Fujita <[email protected]>
Signed-off-by Takashi Sato <[email protected]>
--- fs/ext4/balloc.c | 10 ++-- fs/ext4/defrag.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ext4/ext4.h | 10 +++ fs/ext4/ioctl.c | 3 +- 4 files changed, 213 insertions(+), 6 deletions(-)
fs/ext4/balloc.c +5 -5
@@ -433,7 +433,7 @@ restart:* If the goal block is within the reservation window, return 1; * otherwise, return 0; */ -static int +int goal_in_my_reservation (struct ext4_reserve_window *rsv,ext4_grpblk_t grp_goal,ext4_group_t group,struct super_block *sb) {
@@ -538,7 +538,7 @@ void ext4_rsv_window_add(struct super_block *sb,* from the filesystem reservation window rb tree. Must be called with * rsv_lock hold. */ -static void rsv_window_remove (struct super_block *sb, +void rsv_window_remove (struct super_block *sb,struct ext4_reserve_window_node *rsv) { rsv->rsv_start =EXT4_RESERVE_WINDOW_NOT_ALLOCATED ;
@@ -553,7 +553,7 @@ static void rsv_window_remove(struct super_block *sb,* * returns 1 if the end block is EXT4_RESERVE_WINDOW_NOT_ALLOCATED. */ -static inline int rsv_is_empty (struct ext4_reserve_window *rsv) +inline int rsv_is_empty (struct ext4_reserve_window *rsv) {/* a valid reservation end block could not be 0 */ return rsv->_rsv_end ==EXT4_RESERVE_WINDOW_NOT_ALLOCATED ;
@@ -1289,7 +1289,7 @@ static int find_next_reservable_window(* @bitmap_bh: the block group block bitmap * */ -static int alloc_new_reservation (struct ext4_reserve_window_node *my_rsv, +int alloc_new_reservation (struct ext4_reserve_window_node *my_rsv,ext4_grpblk_t grp_goal,struct super_block *sb,ext4_group_t group,struct buffer_head *bitmap_bh) {
@@ -1433,7 +1433,7 @@ retry:* expand the reservation window size if necessary on a best-effort * basis before ext4_new_blocks() tries to allocate blocks, */ -static void try_to_extend_reservation (struct ext4_reserve_window_node *my_rsv, +void try_to_extend_reservation (struct ext4_reserve_window_node *my_rsv,struct super_block *sb,int size) {struct ext4_reserve_window_node *next_rsv;
fs/ext4/defrag.c +196 -0
208 lines not on this page · raw message
fs/ext4/ext4.h +10 -0
@@ -307,6 +307,7 @@ struct ext4_new_group_data {#define EXT4_IOC_GROUP_INFO _IOW('f', 17, struct ext4_group_data_info)#define EXT4_IOC_FREE_BLOCKS_INFO _IOW('f', 18, struct ext4_extents_info)#define EXT4_IOC_FIEMAP_INO _IOW('f', 19, struct fiemap_ino) +#define EXT4_IOC_RESERVE_BLOCK _IOW('f', 20, struct ext4_extents_info)/* * ioctl commands in 32 bit emulation
@@ -1046,8 +1047,17 @@ extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,extern int ext4_should_retry_alloc (struct super_block *sb,int *retries);extern void ext4_init_block_alloc_info (struct inode *);extern void ext4_rsv_window_add (struct super_block *sb,struct ext4_reserve_window_node *rsv); +extern void try_to_extend_reservation (struct ext4_reserve_window_node *, +struct super_block *,int ); +extern int alloc_new_reservation (struct ext4_reserve_window_node *, +ext4_grpblk_t ,struct super_block *, +ext4_group_t ,struct buffer_head *);extern ext4_grpblk_t bitmap_search_next_usable_block (ext4_grpblk_t ,struct buffer_head *,ext4_grpblk_t ); +extern int rsv_is_empty (struct ext4_reserve_window *rsv); +extern int goal_in_my_reservation (struct ext4_reserve_window *rsv, +ext4_grpblk_t grp_goal,ext4_group_t group, +struct super_block *sb);/* dir.c */ extern int ext4_check_dir_entry(const char *, struct inode *,
fs/ext4/ioctl.c +2 -1
@@ -260,7 +260,8 @@ setversion_out:case EXT4_IOC_DEFRAG :case EXT4_IOC_GROUP_INFO :case EXT4_IOC_FREE_BLOCKS_INFO : -case EXT4_IOC_FIEMAP_INO : { +case EXT4_IOC_FIEMAP_INO : +case EXT4_IOC_RESERVE_BLOCK : {return ext4_defrag_ioctl (inode, filp, cmd, arg); }case EXT4_IOC_GROUP_ADD : {