Ext4: release reserved quota before block reservation for delalloc retry
ext4_da_reserve_space() can reserve quota blocks multiple times if
ext4_claim_free_blocks() fail and we retry the allocation. We should
release the quota reservation before restarting.
Bug found be Jan Kara.
Signed-off-by: Mingming Cao <[email protected]>
---
fs/ext4/inode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.31-rc4/fs/ext4/inode.c
===================================================================
--- linux-2.6.31-rc4.orig/fs/ext4/inode.c
+++ linux-2.6.31-rc4/fs/ext4/inode.c
@@ -1785,11 +1785,11 @@ repeat:
if (ext4_claim_free_blocks(sbi, total)) {
spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
+ vfs_dq_release_reservation_block(inode, total);
if (ext4_should_retry_alloc(inode->i_sb, &retries)) {
yield();
goto repeat;
}
- vfs_dq_release_reservation_block(inode, total);
return -ENOSPC;
}
EXT4_I(inode)->i_reserved_data_blocks += nrblocks;
On Mon 21-09-09 09:52:30, Mingming wrote:
> Ext4: release reserved quota before block reservation for delalloc retry
>
> ext4_da_reserve_space() can reserve quota blocks multiple times if
> ext4_claim_free_blocks() fail and we retry the allocation. We should
> release the quota reservation before restarting.
>
> Bug found be Jan Kara.
^^ by
>
> Signed-off-by: Mingming Cao <[email protected]>
>
> ---
> fs/ext4/inode.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6.31-rc4/fs/ext4/inode.c
> ===================================================================
> --- linux-2.6.31-rc4.orig/fs/ext4/inode.c
> +++ linux-2.6.31-rc4/fs/ext4/inode.c
> @@ -1785,11 +1785,11 @@ repeat:
>
> if (ext4_claim_free_blocks(sbi, total)) {
> spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
> + vfs_dq_release_reservation_block(inode, total);
> if (ext4_should_retry_alloc(inode->i_sb, &retries)) {
> yield();
> goto repeat;
> }
> - vfs_dq_release_reservation_block(inode, total);
> return -ENOSPC;
> }
> EXT4_I(inode)->i_reserved_data_blocks += nrblocks;
>
The patch is fine. Acked-by: Jan Kara <[email protected]>
But it's certainly not the issue hit by Pavol but I'm out of ideas where
could be a problem provided he runs with extents...
Honza
--
Jan Kara <[email protected]>
SUSE Labs, CR
On Mon, 2009-09-21 at 20:15 +0200, Jan Kara wrote:
> On Mon 21-09-09 09:52:30, Mingming wrote:
> > Ext4: release reserved quota before block reservation for delalloc retry
> >
> > ext4_da_reserve_space() can reserve quota blocks multiple times if
> > ext4_claim_free_blocks() fail and we retry the allocation. We should
> > release the quota reservation before restarting.
> >
> > Bug found be Jan Kara.
> ^^ by
attached is the updated patch with this typo fixed.
> >
> > Signed-off-by: Mingming Cao <[email protected]>
> >
> > ---
> > fs/ext4/inode.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Index: linux-2.6.31-rc4/fs/ext4/inode.c
> > ===================================================================
> > --- linux-2.6.31-rc4.orig/fs/ext4/inode.c
> > +++ linux-2.6.31-rc4/fs/ext4/inode.c
> > @@ -1785,11 +1785,11 @@ repeat:
> >
> > if (ext4_claim_free_blocks(sbi, total)) {
> > spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
> > + vfs_dq_release_reservation_block(inode, total);
> > if (ext4_should_retry_alloc(inode->i_sb, &retries)) {
> > yield();
> > goto repeat;
> > }
> > - vfs_dq_release_reservation_block(inode, total);
> > return -ENOSPC;
> > }
> > EXT4_I(inode)->i_reserved_data_blocks += nrblocks;
> >
> The patch is fine. Acked-by: Jan Kara <[email protected]>
Thanks!
> But it's certainly not the issue hit by Pavol but I'm out of ideas where
> could be a problem provided he runs with extents...
>
I am not sure where is the problem reported by Pavol by looking at the
code either. Perhaps enable some debugging code, but I am under
impression that the system is in-use now...
Mingming
On Mon, Sep 21, 2009 at 04:18:02PM -0700, Mingming wrote:
> On Mon, 2009-09-21 at 20:15 +0200, Jan Kara wrote:
> > On Mon 21-09-09 09:52:30, Mingming wrote:
> > > Ext4: release reserved quota before block reservation for delalloc retry
> > >
> > > ext4_da_reserve_space() can reserve quota blocks multiple times if
> > > ext4_claim_free_blocks() fail and we retry the allocation. We should
> > > release the quota reservation before restarting.
> > >
> > > Bug found be Jan Kara.
> > ^^ by
>
> attached is the updated patch with this typo fixed.
Added to the ext4 patch queue, thanks.
- Ted