Re: [PATCH] ext4: More buffer head reference leaks

[Curt Wohlgemuth <curtw@google.com>]

Any comment on the patch below?  Ted?

Thanks,
Curt


On Wed, Jul 15, 2009 at 8:53 AM, Curt Wohlgemuth<curtw@google.com> wrote:
> I've cleaned up the patch to
>   - fix the comment in ext4_alloc_branch()
>   - change ext4_add_entry() to remove the gotos and label
>
>
>       Signed-off-by: Curt Wohlgemuth <curtw@google.com>
>
> ---
> diff -Naur orig/fs/ext4/inode.c new/fs/ext4/inode.c
> --- orig/fs/ext4/inode.c        2009-07-14 11:19:01.000000000 -0700
> +++ new/fs/ext4/inode.c 2009-07-15 08:12:15.000000000 -0700
> @@ -758,8 +758,9 @@
>                BUFFER_TRACE(bh, "call get_create_access");
>                err = ext4_journal_get_create_access(handle, bh);
>                if (err) {
> +                       /* Don't brelse(bh) here; it's done in
> +                        * ext4_journal_forget() below */
>                        unlock_buffer(bh);
> -                       brelse(bh);
>                        goto failed;
>                }
>
> diff -Naur orig/fs/ext4/namei.c new/fs/ext4/namei.c
> --- orig/fs/ext4/namei.c        2009-07-14 11:19:46.000000000 -0700
> +++ new/fs/ext4/namei.c 2009-07-15 08:12:09.000000000 -0700
> @@ -1518,8 +1518,12 @@
>                        return retval;
>
>                if (blocks == 1 && !dx_fallback &&
> -                   EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX))
> -                       return make_indexed_dir(handle, dentry, inode, bh);
> +                   EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX)) {
> +                       retval = make_indexed_dir(handle, dentry, inode, bh);
> +                       if (retval == -ENOSPC)
> +                               brelse(bh);
> +                       return retval;
> +               }
>                brelse(bh);
>        }
>        bh = ext4_append(handle, dir, &block, &retval);
> @@ -1528,7 +1532,10 @@
>        de = (struct ext4_dir_entry_2 *) bh->b_data;
>        de->inode = 0;
>        de->rec_len = ext4_rec_len_to_disk(blocksize, blocksize);
> -       return add_dirent_to_buf(handle, dentry, inode, de, bh);
> +       retval = add_dirent_to_buf(handle, dentry, inode, de, bh);
> +       if (retval == -ENOSPC)
> +               brelse(bh);
> +       return retval;
>  }
>
>  /*
> @@ -1657,7 +1664,8 @@
>        if (!de)
>                goto cleanup;
>        err = add_dirent_to_buf(handle, dentry, inode, de, bh);
> -       bh = NULL;
> +       if (err != -ENOSPC)
> +               bh = NULL;
>        goto cleanup;
>
>  journal_error:
>
--
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