Patchwork [v1,2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called

login
register
mail settings
Submitter Wang shilong
Date Feb. 7, 2013, 2:57 p.m.
Message ID <1360249074-2642-1-git-send-email-wangshilong1991@gmail.com>
Download mbox | patch
Permalink /patch/218935/
State Not Applicable
Headers show

Comments

Wang shilong - Feb. 7, 2013, 2:57 p.m.
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>

We should mark inode dirty after the function dquot_free_block_nodirty
is called.Besides,add a check whether it is necessary to call
dquot_free_block_nodirty functon.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
---
 fs/ext2/balloc.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
Jan Kara - Feb. 7, 2013, 3:45 p.m.
On Thu 07-02-13 22:57:53, Wang shilong wrote:
> From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
> 
> We should mark inode dirty after the function dquot_free_block_nodirty
> is called.Besides,add a check whether it is necessary to call
> dquot_free_block_nodirty functon.
  Thanks. I've added the patch to my tree.

								Honza
> 
> Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
> ---
>  fs/ext2/balloc.c | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
> index 22993a0..9d372bf 100644
> --- a/fs/ext2/balloc.c
> +++ b/fs/ext2/balloc.c
> @@ -568,8 +568,11 @@ do_more:
>  	}
>  error_return:
>  	brelse(bitmap_bh);
> -	release_blocks(sb, freed);
> -	dquot_free_block_nodirty(inode, freed);
> +	if (freed) {
> +		release_blocks(sb, freed);
> +		dquot_free_block_nodirty(inode, freed);
> +		mark_inode_dirty(inode);
> +	}
>  }
>  
>  /**
> @@ -1412,9 +1415,11 @@ allocated:
>  
>  	*errp = 0;
>  	brelse(bitmap_bh);
> -	dquot_free_block_nodirty(inode, *count-num);
> -	mark_inode_dirty(inode);
> -	*count = num;
> +	if (num < *count) {
> +		dquot_free_block_nodirty(inode, *count-num);
> +		mark_inode_dirty(inode);
> +		*count = num;
> +	}
>  	return ret_block;
>  
>  io_error:
> -- 
> 1.7.11.7
>

Patch

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 22993a0..9d372bf 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -568,8 +568,11 @@  do_more:
 	}
 error_return:
 	brelse(bitmap_bh);
-	release_blocks(sb, freed);
-	dquot_free_block_nodirty(inode, freed);
+	if (freed) {
+		release_blocks(sb, freed);
+		dquot_free_block_nodirty(inode, freed);
+		mark_inode_dirty(inode);
+	}
 }
 
 /**
@@ -1412,9 +1415,11 @@  allocated:
 
 	*errp = 0;
 	brelse(bitmap_bh);
-	dquot_free_block_nodirty(inode, *count-num);
-	mark_inode_dirty(inode);
-	*count = num;
+	if (num < *count) {
+		dquot_free_block_nodirty(inode, *count-num);
+		mark_inode_dirty(inode);
+		*count = num;
+	}
 	return ret_block;
 
 io_error: