On Tue, Dec 01, 2009 at 10:17:02AM -0800, Curt Wohlgemuth wrote:
> This fixes a leak of blocks in an inode prealloc list if device failures
> cause ext4_mb_mark_diskspace_used() to fail.
>
> Signed-off-by: Curt Wohlgemuth <curtw@xxxxxxxxxx>
> ---
> diff -uprN orig/fs/ext4/mballoc.c new/fs/ext4/mballoc.c
> --- orig/fs/ext4/mballoc.c 2009-12-01 09:27:25.000000000 -0800
> +++ new/fs/ext4/mballoc.c 2009-12-01 09:28:38.000000000 -0800
> @@ -3011,6 +3011,22 @@ static void ext4_mb_collect_stats(struct
> }
>
> /*
> + * Called on failure; free up any blocks from the inode PA for this
> + * context.
> + */
> +static void ext4_discard_inode_pa(struct ext4_allocation_context *ac)
> +{
> + struct ext4_prealloc_space *pa = ac->ac_pa;
> + int len;
> +
> + if (pa && pa->pa_type == MB_INODE_PA) {
> + len = ac->ac_b_ex.fe_len;
> + pa->pa_free += len;
> + }
> +
> +}
Can you name it as discard allocated blocks and add a comment saying why
we don't need it for MB_GROUP_PA ? Otherwise
Acked-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
> +
> +/*
> * use blocks preallocated to inode
> */
> static void ext4_mb_use_inode_pa(struct ext4_allocation_context *ac,
> @@ -4295,6 +4311,7 @@ repeat:
> ac->ac_status = AC_STATUS_CONTINUE;
> goto repeat;
> } else if (*errp) {
> + ext4_discard_inode_pa(ac);
> ac->ac_b_ex.fe_len = 0;
> ar->len = 0;
> ext4_mb_show_ac(ac);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
