diff mbox series

ext4: remove map_from_cluster from ext4_ext_map_blocks

Message ID 20200311205125.25061-1-enwlinux@gmail.com
State Awaiting Upstream
Headers show
Series ext4: remove map_from_cluster from ext4_ext_map_blocks | expand

Commit Message

Eric Whitney March 11, 2020, 8:51 p.m. UTC
We can use the variable allocated_clusters rather than map_from_clusters
to control reserved block/cluster accounting in ext4_ext_map_blocks.
This eliminates a variable and associated code and improves readability
a little.

Signed-off-by: Eric Whitney <enwlinux@gmail.com>
---
 fs/ext4/extents.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Ritesh Harjani March 12, 2020, 9:56 a.m. UTC | #1
On 3/12/20 2:21 AM, Eric Whitney wrote:
> We can use the variable allocated_clusters rather than map_from_clusters
> to control reserved block/cluster accounting in ext4_ext_map_blocks.
> This eliminates a variable and associated code and improves readability
> a little.
> 
> Signed-off-by: Eric Whitney <enwlinux@gmail.com>

No objections there.

Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>


> ---
>   fs/ext4/extents.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index bc96529d1509..b12c9e52746c 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -4181,7 +4181,6 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
>   	unsigned int allocated_clusters = 0;
>   	struct ext4_allocation_request ar;
>   	ext4_lblk_t cluster_offset;
> -	bool map_from_cluster = false;
> 
>   	ext_debug("blocks %u/%u requested for inode %lu\n",
>   		  map->m_lblk, map->m_len, inode->i_ino);
> @@ -4296,7 +4295,6 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
>   	    get_implied_cluster_alloc(inode->i_sb, map, ex, path)) {
>   		ar.len = allocated = map->m_len;
>   		newblock = map->m_pblk;
> -		map_from_cluster = true;
>   		goto got_allocated_blocks;
>   	}
> 
> @@ -4317,7 +4315,6 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
>   	    get_implied_cluster_alloc(inode->i_sb, map, ex2, path)) {
>   		ar.len = allocated = map->m_len;
>   		newblock = map->m_pblk;
> -		map_from_cluster = true;
>   		goto got_allocated_blocks;
>   	}
> 
> @@ -4418,7 +4415,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
>   	 * clusters discovered to be delayed allocated.  Once allocated, a
>   	 * cluster is not included in the reserved count.
>   	 */
> -	if (test_opt(inode->i_sb, DELALLOC) && !map_from_cluster) {
> +	if (test_opt(inode->i_sb, DELALLOC) && allocated_clusters) {
>   		if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) {
>   			/*
>   			 * When allocating delayed allocated clusters, simply
>
Theodore Y. Ts'o March 12, 2020, 3 p.m. UTC | #2
On Wed, Mar 11, 2020 at 04:51:25PM -0400, Eric Whitney wrote:
> We can use the variable allocated_clusters rather than map_from_clusters
> to control reserved block/cluster accounting in ext4_ext_map_blocks.
> This eliminates a variable and associated code and improves readability
> a little.
> 
> Signed-off-by: Eric Whitney <enwlinux@gmail.com>

Applied, thanks.

							- Ted
diff mbox series

Patch

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index bc96529d1509..b12c9e52746c 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4181,7 +4181,6 @@  int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
 	unsigned int allocated_clusters = 0;
 	struct ext4_allocation_request ar;
 	ext4_lblk_t cluster_offset;
-	bool map_from_cluster = false;
 
 	ext_debug("blocks %u/%u requested for inode %lu\n",
 		  map->m_lblk, map->m_len, inode->i_ino);
@@ -4296,7 +4295,6 @@  int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
 	    get_implied_cluster_alloc(inode->i_sb, map, ex, path)) {
 		ar.len = allocated = map->m_len;
 		newblock = map->m_pblk;
-		map_from_cluster = true;
 		goto got_allocated_blocks;
 	}
 
@@ -4317,7 +4315,6 @@  int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
 	    get_implied_cluster_alloc(inode->i_sb, map, ex2, path)) {
 		ar.len = allocated = map->m_len;
 		newblock = map->m_pblk;
-		map_from_cluster = true;
 		goto got_allocated_blocks;
 	}
 
@@ -4418,7 +4415,7 @@  int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
 	 * clusters discovered to be delayed allocated.  Once allocated, a
 	 * cluster is not included in the reserved count.
 	 */
-	if (test_opt(inode->i_sb, DELALLOC) && !map_from_cluster) {
+	if (test_opt(inode->i_sb, DELALLOC) && allocated_clusters) {
 		if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) {
 			/*
 			 * When allocating delayed allocated clusters, simply