Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1296cc85 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext4: Drop EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE flag 



We should update reserve space if it is delalloc buffer
and that is indicated by EXT4_GET_BLOCKS_DELALLOC_RESERVE flag.
So use EXT4_GET_BLOCKS_DELALLOC_RESERVE in place of
EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent 5f634d06

fs/ext4/ext4.h

+2 −5
Original line number Diff line number Diff line
@@ -361,14 +361,11 @@ struct ext4_new_group_data { 
	   so set the magic i_delalloc_reserve_flag after taking the 

	   inode allocation semaphore for */

#define EXT4_GET_BLOCKS_DELALLOC_RESERVE	0x0004

	/* Call ext4_da_update_reserve_space() after successfully 

	   allocating the blocks */

#define EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE	0x0008

	/* caller is from the direct IO path, request to creation of an

	unitialized extents if not allocated, split the uninitialized

	extent if blocks has been preallocated already*/

#define EXT4_GET_BLOCKS_DIO			0x0010

#define EXT4_GET_BLOCKS_CONVERT			0x0020

#define EXT4_GET_BLOCKS_DIO			0x0008

#define EXT4_GET_BLOCKS_CONVERT			0x0010

#define EXT4_GET_BLOCKS_DIO_CREATE_EXT		(EXT4_GET_BLOCKS_DIO|\

					 EXT4_GET_BLOCKS_CREATE_UNINIT_EXT)

	/* Convert extent to initialized after direct IO complete */

fs/ext4/extents.c

+2 −2
Original line number Diff line number Diff line
@@ -3142,7 +3142,7 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode, 
	 * But fallocate would have already updated quota and block

	 * count for this offset. So cancel these reservation

	 */

	if (flags & EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE)

	if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)

		ext4_da_update_reserve_space(inode, allocated, 0);



map_out:
@@ -3388,7 +3388,7 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, 
	 * Update reserved blocks/metadata blocks after successful

	 * block allocation which had been deferred till now.

	 */

	if (flags & EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE)

	if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)

		ext4_da_update_reserve_space(inode, allocated, 1);



	/*

fs/ext4/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ int ext4_get_blocks(handle_t *handle, struct inode *inode, sector_t block, 
		 * reserve space here.

		 */

		if ((retval > 0) &&

			(flags & EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE))

			(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE))

			ext4_da_update_reserve_space(inode, retval, 1);

	}

	if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)
@@ -2219,10 +2219,10 @@ static int mpage_da_map_blocks(struct mpage_da_data *mpd) 
	 * variables are updated after the blocks have been allocated.

	 */

	new.b_state = 0;

	get_blocks_flags = (EXT4_GET_BLOCKS_CREATE |

			    EXT4_GET_BLOCKS_DELALLOC_RESERVE);

	get_blocks_flags = EXT4_GET_BLOCKS_CREATE;

	if (mpd->b_state & (1 << BH_Delay))

		get_blocks_flags |= EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE;

		get_blocks_flags |= EXT4_GET_BLOCKS_DELALLOC_RESERVE;



	blks = ext4_get_blocks(handle, mpd->inode, next, max_blocks,

			       &new, get_blocks_flags);

	if (blks < 0) {