Patchwork ext4: fix xattr block allocation/release with bigalloc

login
register
mail settings
Submitter Lukas Czerner
Date Feb. 18, 2013, 8:14 a.m.
Message ID <1361175262-16205-1-git-send-email-lczerner@redhat.com>
Download mbox | patch
Permalink /patch/221150/
State Accepted
Headers show

Comments

Lukas Czerner - Feb. 18, 2013, 8:14 a.m.
Currently when new xattr block is created or released we we would call
dquot_free_block() or dquot_alloc_block() respectively, among the else
decrementing or incrementing the number of blocks assigned to the inode
by one block.

This however does not work for bigalloc file system because we always
allocate/free the whole cluster so we have to count with that in
dquot_free_block() and dquot_alloc_block() as well.

Use the clusters-to-blocks conversion EXT4_C2B() when passing number of
blocks to the dquot_alloc/free functions to fix the problem.

The problem has been revealed by xfstests #117 (and possibly others).

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 fs/ext4/xattr.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
Eric Sandeen - Feb. 18, 2013, 3:26 p.m.
On 2/18/13 2:14 AM, Lukas Czerner wrote:
> Currently when new xattr block is created or released we we would call
> dquot_free_block() or dquot_alloc_block() respectively, among the else
> decrementing or incrementing the number of blocks assigned to the inode
> by one block.
> 
> This however does not work for bigalloc file system because we always
> allocate/free the whole cluster so we have to count with that in
> dquot_free_block() and dquot_alloc_block() as well.
> 
> Use the clusters-to-blocks conversion EXT4_C2B() when passing number of
> blocks to the dquot_alloc/free functions to fix the problem.
> 
> The problem has been revealed by xfstests #117 (and possibly others).
> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>

Thanks for finding this!

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  fs/ext4/xattr.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
> index 3a91ebc..b6741be 100644
> --- a/fs/ext4/xattr.c
> +++ b/fs/ext4/xattr.c
> @@ -549,7 +549,7 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode,
>  		error = ext4_handle_dirty_xattr_block(handle, inode, bh);
>  		if (IS_SYNC(inode))
>  			ext4_handle_sync(handle);
> -		dquot_free_block(inode, 1);
> +		dquot_free_block(inode, EXT4_C2B(EXT4_SB(inode->i_sb), 1));
>  		ea_bdebug(bh, "refcount now=%d; releasing",
>  			  le32_to_cpu(BHDR(bh)->h_refcount));
>  	}
> @@ -832,7 +832,8 @@ inserted:
>  			else {
>  				/* The old block is released after updating
>  				   the inode. */
> -				error = dquot_alloc_block(inode, 1);
> +				error = dquot_alloc_block(inode,
> +						EXT4_C2B(EXT4_SB(sb), 1));
>  				if (error)
>  					goto cleanup;
>  				error = ext4_journal_get_write_access(handle,
> @@ -928,7 +929,7 @@ cleanup:
>  	return error;
>  
>  cleanup_dquot:
> -	dquot_free_block(inode, 1);
> +	dquot_free_block(inode, EXT4_C2B(EXT4_SB(sb), 1));
>  	goto cleanup;
>  
>  bad_block:
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o - Feb. 18, 2013, 5:25 p.m.
On Mon, Feb 18, 2013 at 09:26:07AM -0600, Eric Sandeen wrote:
> On 2/18/13 2:14 AM, Lukas Czerner wrote:
> > Currently when new xattr block is created or released we we would call
> > dquot_free_block() or dquot_alloc_block() respectively, among the else
> > decrementing or incrementing the number of blocks assigned to the inode
> > by one block.
> > 
> > This however does not work for bigalloc file system because we always
> > allocate/free the whole cluster so we have to count with that in
> > dquot_free_block() and dquot_alloc_block() as well.
> > 
> > Use the clusters-to-blocks conversion EXT4_C2B() when passing number of
> > blocks to the dquot_alloc/free functions to fix the problem.
> > 
> > The problem has been revealed by xfstests #117 (and possibly others).
> > 
> > Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> 
> Reviewed-by: Eric Sandeen <sandeen@redhat.com>

Thanks, indeed.  Applied.

						- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 3a91ebc..b6741be 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -549,7 +549,7 @@  ext4_xattr_release_block(handle_t *handle, struct inode *inode,
 		error = ext4_handle_dirty_xattr_block(handle, inode, bh);
 		if (IS_SYNC(inode))
 			ext4_handle_sync(handle);
-		dquot_free_block(inode, 1);
+		dquot_free_block(inode, EXT4_C2B(EXT4_SB(inode->i_sb), 1));
 		ea_bdebug(bh, "refcount now=%d; releasing",
 			  le32_to_cpu(BHDR(bh)->h_refcount));
 	}
@@ -832,7 +832,8 @@  inserted:
 			else {
 				/* The old block is released after updating
 				   the inode. */
-				error = dquot_alloc_block(inode, 1);
+				error = dquot_alloc_block(inode,
+						EXT4_C2B(EXT4_SB(sb), 1));
 				if (error)
 					goto cleanup;
 				error = ext4_journal_get_write_access(handle,
@@ -928,7 +929,7 @@  cleanup:
 	return error;
 
 cleanup_dquot:
-	dquot_free_block(inode, 1);
+	dquot_free_block(inode, EXT4_C2B(EXT4_SB(sb), 1));
 	goto cleanup;
 
 bad_block: