On Thu, Jan 24, 2008 at 11:25:32AM +0530, Aneesh Kumar K.V wrote:
> +static int free_ext_idx(handle_t *handle, struct inode *inode,
> +                                     struct ext4_extent_idx *ix)
> +{
> +     int i, retval = 0;
> +     ext4_fsblk_t block;
> +     struct buffer_head *bh;
> +     struct ext4_extent_header *eh;
> +
> +     block = idx_pblock(ix);
> +     bh = sb_bread(inode->i_sb, block);
> +     if (!bh)
> +             return -EIO;
> +
> +     eh = (struct ext4_extent_header *)bh->b_data;
> +     if (eh->eh_depth == 0) {
> +             brelse(bh);
> +             ext4_free_blocks(handle, inode, block, 1);
> +     } else {
> +             ix = EXT_FIRST_INDEX(eh);
> +             for (i = 0; i < le16_to_cpu(eh->eh_entries); i++, ix++) {
> +                     retval = free_ext_idx(handle, inode, ix);
> +                     if (retval)
> +                             return retval;
> +             }
> +     }
> +     return retval;
> +}

Aneesh, looks like if eh->eh_depth is != 0, bh gets leaked.  This is
how I plan to fix it up:

+static int free_ext_idx(handle_t *handle, struct inode *inode,
+                                       struct ext4_extent_idx *ix)
+{
+       int i, retval = 0;
+       ext4_fsblk_t block;
+       struct buffer_head *bh;
+       struct ext4_extent_header *eh;
+
+       block = idx_pblock(ix);
+       bh = sb_bread(inode->i_sb, block);
+       if (!bh)
+               return -EIO;
+
+       eh = (struct ext4_extent_header *)bh->b_data;
+       if (eh->eh_depth == 0)
+               ext4_free_blocks(handle, inode, block, 1);
+       else {
+               ix = EXT_FIRST_INDEX(eh);
+               for (i = 0; i < le16_to_cpu(eh->eh_entries); i++, ix++) {
+                       retval = free_ext_idx(handle, inode, ix);
+                       if (retval)
+                               break;
+               }
+       }
+       put_bh(bh);
+       return retval;
+}

                                                - Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to