ext4: remove EXT4_GET_BLOCKS_KEEP_SIZE flag
The eofblocks code was removed in the 5.7 release by "ext4: remove
EOFBLOCKS_FL and associated code" (4337ecd1fe
). The ext4_map_blocks()
flag used to trigger it can now be removed as well.
Signed-off-by: Eric Whitney <enwlinux@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20200415203140.30349-2-enwlinux@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
parent
6b6aeffc93
commit
9e52484c71
|
@ -609,8 +609,6 @@ enum {
|
||||||
#define EXT4_GET_BLOCKS_METADATA_NOFAIL 0x0020
|
#define EXT4_GET_BLOCKS_METADATA_NOFAIL 0x0020
|
||||||
/* Don't normalize allocation size (used for fallocate) */
|
/* Don't normalize allocation size (used for fallocate) */
|
||||||
#define EXT4_GET_BLOCKS_NO_NORMALIZE 0x0040
|
#define EXT4_GET_BLOCKS_NO_NORMALIZE 0x0040
|
||||||
/* Request will not result in inode size update (user for fallocate) */
|
|
||||||
#define EXT4_GET_BLOCKS_KEEP_SIZE 0x0080
|
|
||||||
/* Convert written extents to unwritten */
|
/* Convert written extents to unwritten */
|
||||||
#define EXT4_GET_BLOCKS_CONVERT_UNWRITTEN 0x0100
|
#define EXT4_GET_BLOCKS_CONVERT_UNWRITTEN 0x0100
|
||||||
/* Write zeros to newly created written extents */
|
/* Write zeros to newly created written extents */
|
||||||
|
|
|
@ -4507,8 +4507,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,
|
||||||
}
|
}
|
||||||
|
|
||||||
flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT;
|
flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT;
|
||||||
if (mode & FALLOC_FL_KEEP_SIZE)
|
|
||||||
flags |= EXT4_GET_BLOCKS_KEEP_SIZE;
|
|
||||||
|
|
||||||
/* Wait all existing dio workers, newcomers will block on i_mutex */
|
/* Wait all existing dio workers, newcomers will block on i_mutex */
|
||||||
inode_dio_wait(inode);
|
inode_dio_wait(inode);
|
||||||
|
@ -4647,8 +4645,6 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
|
||||||
|
|
||||||
max_blocks = EXT4_MAX_BLOCKS(len, offset, blkbits);
|
max_blocks = EXT4_MAX_BLOCKS(len, offset, blkbits);
|
||||||
flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT;
|
flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT;
|
||||||
if (mode & FALLOC_FL_KEEP_SIZE)
|
|
||||||
flags |= EXT4_GET_BLOCKS_KEEP_SIZE;
|
|
||||||
|
|
||||||
inode_lock(inode);
|
inode_lock(inode);
|
||||||
|
|
||||||
|
|
|
@ -432,11 +432,9 @@ static void ext4_map_blocks_es_recheck(handle_t *handle,
|
||||||
*/
|
*/
|
||||||
down_read(&EXT4_I(inode)->i_data_sem);
|
down_read(&EXT4_I(inode)->i_data_sem);
|
||||||
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
||||||
retval = ext4_ext_map_blocks(handle, inode, map, flags &
|
retval = ext4_ext_map_blocks(handle, inode, map, 0);
|
||||||
EXT4_GET_BLOCKS_KEEP_SIZE);
|
|
||||||
} else {
|
} else {
|
||||||
retval = ext4_ind_map_blocks(handle, inode, map, flags &
|
retval = ext4_ind_map_blocks(handle, inode, map, 0);
|
||||||
EXT4_GET_BLOCKS_KEEP_SIZE);
|
|
||||||
}
|
}
|
||||||
up_read((&EXT4_I(inode)->i_data_sem));
|
up_read((&EXT4_I(inode)->i_data_sem));
|
||||||
|
|
||||||
|
@ -541,11 +539,9 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
|
||||||
*/
|
*/
|
||||||
down_read(&EXT4_I(inode)->i_data_sem);
|
down_read(&EXT4_I(inode)->i_data_sem);
|
||||||
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
||||||
retval = ext4_ext_map_blocks(handle, inode, map, flags &
|
retval = ext4_ext_map_blocks(handle, inode, map, 0);
|
||||||
EXT4_GET_BLOCKS_KEEP_SIZE);
|
|
||||||
} else {
|
} else {
|
||||||
retval = ext4_ind_map_blocks(handle, inode, map, flags &
|
retval = ext4_ind_map_blocks(handle, inode, map, 0);
|
||||||
EXT4_GET_BLOCKS_KEEP_SIZE);
|
|
||||||
}
|
}
|
||||||
if (retval > 0) {
|
if (retval > 0) {
|
||||||
unsigned int status;
|
unsigned int status;
|
||||||
|
|
|
@ -45,7 +45,6 @@ struct partial_cluster;
|
||||||
{ EXT4_GET_BLOCKS_CONVERT, "CONVERT" }, \
|
{ EXT4_GET_BLOCKS_CONVERT, "CONVERT" }, \
|
||||||
{ EXT4_GET_BLOCKS_METADATA_NOFAIL, "METADATA_NOFAIL" }, \
|
{ EXT4_GET_BLOCKS_METADATA_NOFAIL, "METADATA_NOFAIL" }, \
|
||||||
{ EXT4_GET_BLOCKS_NO_NORMALIZE, "NO_NORMALIZE" }, \
|
{ EXT4_GET_BLOCKS_NO_NORMALIZE, "NO_NORMALIZE" }, \
|
||||||
{ EXT4_GET_BLOCKS_KEEP_SIZE, "KEEP_SIZE" }, \
|
|
||||||
{ EXT4_GET_BLOCKS_ZERO, "ZERO" })
|
{ EXT4_GET_BLOCKS_ZERO, "ZERO" })
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue