diff mbox series

[v3,04/12] ext4: let __revise_pending() return newly inserted pendings

Message ID 20240813123452.2824659-5-yi.zhang@huaweicloud.com (mailing list archive)
State New
Headers show
Series ext4: simplify the counting and management of delalloc reserved blocks | expand

Commit Message

Zhang Yi Aug. 13, 2024, 12:34 p.m. UTC 
From: Zhang Yi <yi.zhang@huawei.com>

Let __insert_pending() return 1 after successfully inserting a new
pending cluster, and also let __revise_pending() to return the number of
of newly inserted pendings.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
---
 fs/ext4/extents_status.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

Comments

Jan Kara Sept. 4, 2024, 10:15 a.m. UTC | #1 
On Tue 13-08-24 20:34:44, Zhang Yi wrote:
> From: Zhang Yi <yi.zhang@huawei.com>
> 
> Let __insert_pending() return 1 after successfully inserting a new
> pending cluster, and also let __revise_pending() to return the number of
> of newly inserted pendings.
> 
> Signed-off-by: Zhang Yi <yi.zhang@huawei.com>

AFAICS nothing really uses this functionality in this version of the
patchset so we can drop this patch?

								Honza

> ---
>  fs/ext4/extents_status.c | 28 ++++++++++++++++++----------
>  1 file changed, 18 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
> index 024cd37d53b3..4d24b56cfaf0 100644
> --- a/fs/ext4/extents_status.c
> +++ b/fs/ext4/extents_status.c
> @@ -887,7 +887,7 @@ void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
>  		es1 = __es_alloc_extent(true);
>  	if ((err1 || err2) && !es2)
>  		es2 = __es_alloc_extent(true);
> -	if ((err1 || err2 || err3) && revise_pending && !pr)
> +	if ((err1 || err2 || err3 < 0) && revise_pending && !pr)
>  		pr = __alloc_pending(true);
>  	write_lock(&EXT4_I(inode)->i_es_lock);
>  
> @@ -915,7 +915,7 @@ void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
>  
>  	if (revise_pending) {
>  		err3 = __revise_pending(inode, lblk, len, &pr);
> -		if (err3 != 0)
> +		if (err3 < 0)
>  			goto error;
>  		if (pr) {
>  			__free_pending(pr);
> @@ -924,7 +924,7 @@ void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
>  	}
>  error:
>  	write_unlock(&EXT4_I(inode)->i_es_lock);
> -	if (err1 || err2 || err3)
> +	if (err1 || err2 || err3 < 0)
>  		goto retry;
>  
>  	ext4_es_print_tree(inode);
> @@ -1933,7 +1933,7 @@ static struct pending_reservation *__get_pending(struct inode *inode,
>   * @lblk - logical block in the cluster to be added
>   * @prealloc - preallocated pending entry
>   *
> - * Returns 0 on successful insertion and -ENOMEM on failure.  If the
> + * Returns 1 on successful insertion and -ENOMEM on failure.  If the
>   * pending reservation is already in the set, returns successfully.
>   */
>  static int __insert_pending(struct inode *inode, ext4_lblk_t lblk,
> @@ -1977,6 +1977,7 @@ static int __insert_pending(struct inode *inode, ext4_lblk_t lblk,
>  
>  	rb_link_node(&pr->rb_node, parent, p);
>  	rb_insert_color(&pr->rb_node, &tree->root);
> +	ret = 1;
>  
>  out:
>  	return ret;
> @@ -2098,7 +2099,7 @@ void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,
>  		es1 = __es_alloc_extent(true);
>  	if ((err1 || err2) && !es2)
>  		es2 = __es_alloc_extent(true);
> -	if (err1 || err2 || err3) {
> +	if (err1 || err2 || err3 < 0) {
>  		if (lclu_allocated && !pr1)
>  			pr1 = __alloc_pending(true);
>  		if (end_allocated && !pr2)
> @@ -2128,7 +2129,7 @@ void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,
>  
>  	if (lclu_allocated) {
>  		err3 = __insert_pending(inode, lblk, &pr1);
> -		if (err3 != 0)
> +		if (err3 < 0)
>  			goto error;
>  		if (pr1) {
>  			__free_pending(pr1);
> @@ -2137,7 +2138,7 @@ void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,
>  	}
>  	if (end_allocated) {
>  		err3 = __insert_pending(inode, end, &pr2);
> -		if (err3 != 0)
> +		if (err3 < 0)
>  			goto error;
>  		if (pr2) {
>  			__free_pending(pr2);
> @@ -2146,7 +2147,7 @@ void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,
>  	}
>  error:
>  	write_unlock(&EXT4_I(inode)->i_es_lock);
> -	if (err1 || err2 || err3)
> +	if (err1 || err2 || err3 < 0)
>  		goto retry;
>  
>  	ext4_es_print_tree(inode);
> @@ -2256,7 +2257,9 @@ unsigned int ext4_es_delayed_clu(struct inode *inode, ext4_lblk_t lblk,
>   *
>   * Used after a newly allocated extent is added to the extents status tree.
>   * Requires that the extents in the range have either written or unwritten
> - * status.  Must be called while holding i_es_lock.
> + * status.  Must be called while holding i_es_lock. Returns number of new
> + * inserts pending cluster on insert pendings, returns 0 on remove pendings,
> + * return -ENOMEM on failure.
>   */
>  static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
>  			    ext4_lblk_t len,
> @@ -2266,6 +2269,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
>  	ext4_lblk_t end = lblk + len - 1;
>  	ext4_lblk_t first, last;
>  	bool f_del = false, l_del = false;
> +	int pendings = 0;
>  	int ret = 0;
>  
>  	if (len == 0)
> @@ -2293,6 +2297,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
>  			ret = __insert_pending(inode, first, prealloc);
>  			if (ret < 0)
>  				goto out;
> +			pendings += ret;
>  		} else {
>  			last = EXT4_LBLK_CMASK(sbi, end) +
>  			       sbi->s_cluster_ratio - 1;
> @@ -2304,6 +2309,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
>  				ret = __insert_pending(inode, last, prealloc);
>  				if (ret < 0)
>  					goto out;
> +				pendings += ret;
>  			} else
>  				__remove_pending(inode, last);
>  		}
> @@ -2316,6 +2322,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
>  			ret = __insert_pending(inode, first, prealloc);
>  			if (ret < 0)
>  				goto out;
> +			pendings += ret;
>  		} else
>  			__remove_pending(inode, first);
>  
> @@ -2327,9 +2334,10 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
>  			ret = __insert_pending(inode, last, prealloc);
>  			if (ret < 0)
>  				goto out;
> +			pendings += ret;
>  		} else
>  			__remove_pending(inode, last);
>  	}
>  out:
> -	return ret;
> +	return (ret < 0) ? ret : pendings;
>  }
> -- 
> 2.39.2
>
Jan Kara Sept. 4, 2024, 10:23 a.m. UTC | #2 
On Wed 04-09-24 12:15:15, Jan Kara wrote:
> On Tue 13-08-24 20:34:44, Zhang Yi wrote:
> > From: Zhang Yi <yi.zhang@huawei.com>
> > 
> > Let __insert_pending() return 1 after successfully inserting a new
> > pending cluster, and also let __revise_pending() to return the number of
> > of newly inserted pendings.
> > 
> > Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
> 
> AFAICS nothing really uses this functionality in this version of the
> patchset so we can drop this patch?

Now I've realized patch 6 indeed uses the new return value in one place.
This patch looks good so feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza
diff mbox series

Patch

diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index 024cd37d53b3..4d24b56cfaf0 100644
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -887,7 +887,7 @@  void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
 		es1 = __es_alloc_extent(true);
 	if ((err1 || err2) && !es2)
 		es2 = __es_alloc_extent(true);
-	if ((err1 || err2 || err3) && revise_pending && !pr)
+	if ((err1 || err2 || err3 < 0) && revise_pending && !pr)
 		pr = __alloc_pending(true);
 	write_lock(&EXT4_I(inode)->i_es_lock);
 
@@ -915,7 +915,7 @@  void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
 
 	if (revise_pending) {
 		err3 = __revise_pending(inode, lblk, len, &pr);
-		if (err3 != 0)
+		if (err3 < 0)
 			goto error;
 		if (pr) {
 			__free_pending(pr);
@@ -924,7 +924,7 @@  void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
 	}
 error:
 	write_unlock(&EXT4_I(inode)->i_es_lock);
-	if (err1 || err2 || err3)
+	if (err1 || err2 || err3 < 0)
 		goto retry;
 
 	ext4_es_print_tree(inode);
@@ -1933,7 +1933,7 @@  static struct pending_reservation *__get_pending(struct inode *inode,
  * @lblk - logical block in the cluster to be added
  * @prealloc - preallocated pending entry
  *
- * Returns 0 on successful insertion and -ENOMEM on failure.  If the
+ * Returns 1 on successful insertion and -ENOMEM on failure.  If the
  * pending reservation is already in the set, returns successfully.
  */
 static int __insert_pending(struct inode *inode, ext4_lblk_t lblk,
@@ -1977,6 +1977,7 @@  static int __insert_pending(struct inode *inode, ext4_lblk_t lblk,
 
 	rb_link_node(&pr->rb_node, parent, p);
 	rb_insert_color(&pr->rb_node, &tree->root);
+	ret = 1;
 
 out:
 	return ret;
@@ -2098,7 +2099,7 @@  void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,
 		es1 = __es_alloc_extent(true);
 	if ((err1 || err2) && !es2)
 		es2 = __es_alloc_extent(true);
-	if (err1 || err2 || err3) {
+	if (err1 || err2 || err3 < 0) {
 		if (lclu_allocated && !pr1)
 			pr1 = __alloc_pending(true);
 		if (end_allocated && !pr2)
@@ -2128,7 +2129,7 @@  void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,
 
 	if (lclu_allocated) {
 		err3 = __insert_pending(inode, lblk, &pr1);
-		if (err3 != 0)
+		if (err3 < 0)
 			goto error;
 		if (pr1) {
 			__free_pending(pr1);
@@ -2137,7 +2138,7 @@  void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,
 	}
 	if (end_allocated) {
 		err3 = __insert_pending(inode, end, &pr2);
-		if (err3 != 0)
+		if (err3 < 0)
 			goto error;
 		if (pr2) {
 			__free_pending(pr2);
@@ -2146,7 +2147,7 @@  void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,
 	}
 error:
 	write_unlock(&EXT4_I(inode)->i_es_lock);
-	if (err1 || err2 || err3)
+	if (err1 || err2 || err3 < 0)
 		goto retry;
 
 	ext4_es_print_tree(inode);
@@ -2256,7 +2257,9 @@  unsigned int ext4_es_delayed_clu(struct inode *inode, ext4_lblk_t lblk,
  *
  * Used after a newly allocated extent is added to the extents status tree.
  * Requires that the extents in the range have either written or unwritten
- * status.  Must be called while holding i_es_lock.
+ * status.  Must be called while holding i_es_lock. Returns number of new
+ * inserts pending cluster on insert pendings, returns 0 on remove pendings,
+ * return -ENOMEM on failure.
  */
 static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
 			    ext4_lblk_t len,
@@ -2266,6 +2269,7 @@  static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
 	ext4_lblk_t end = lblk + len - 1;
 	ext4_lblk_t first, last;
 	bool f_del = false, l_del = false;
+	int pendings = 0;
 	int ret = 0;
 
 	if (len == 0)
@@ -2293,6 +2297,7 @@  static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
 			ret = __insert_pending(inode, first, prealloc);
 			if (ret < 0)
 				goto out;
+			pendings += ret;
 		} else {
 			last = EXT4_LBLK_CMASK(sbi, end) +
 			       sbi->s_cluster_ratio - 1;
@@ -2304,6 +2309,7 @@  static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
 				ret = __insert_pending(inode, last, prealloc);
 				if (ret < 0)
 					goto out;
+				pendings += ret;
 			} else
 				__remove_pending(inode, last);
 		}
@@ -2316,6 +2322,7 @@  static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
 			ret = __insert_pending(inode, first, prealloc);
 			if (ret < 0)
 				goto out;
+			pendings += ret;
 		} else
 			__remove_pending(inode, first);
 
@@ -2327,9 +2334,10 @@  static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,
 			ret = __insert_pending(inode, last, prealloc);
 			if (ret < 0)
 				goto out;
+			pendings += ret;
 		} else
 			__remove_pending(inode, last);
 	}
 out:
-	return ret;
+	return (ret < 0) ? ret : pendings;
 }