From: Sean Bartell <wingedtachikoma@gmail.com>
To: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 2/4] btrfs-convert: Add extent iteration functions.
Date: Mon, 22 Mar 2010 00:55:26 -0400 [thread overview]
Message-ID: <20100322045526.GA21666@flcl.lan> (raw)
In-Reply-To: <20100320042649.GA17106@flcl.lan>
Whoops, there's a major memory leak. Please apply this patch to the
patch :).
diff --git a/convert.c b/convert.c
index dfd2976..7bb4ed0 100644
--- a/convert.c
+++ b/convert.c
@@ -471,21 +471,24 @@ int finish_file_extents(struct extent_iterate_data *priv)
return ret;
}
*priv->inode_nbytes += priv->size;
- return btrfs_insert_inline_extent(priv->trans, priv->root,
- priv->objectid,
- priv->file_off, priv->data,
- priv->size);
- }
-
- ret = commit_file_extents(priv);
- if (ret)
- return ret;
-
- if (priv->total_size > priv->last_file_off) {
- ret = commit_disk_extent(priv, priv->last_file_off, 0,
- priv->total_size - priv->last_file_off);
+ ret = btrfs_insert_inline_extent(priv->trans, priv->root,
+ priv->objectid,
+ priv->file_off, priv->data,
+ priv->size);
if (ret)
return ret;
+ } else {
+ ret = commit_file_extents(priv);
+ if (ret)
+ return ret;
+
+ if (priv->total_size > priv->last_file_off) {
+ ret = commit_disk_extent(priv, priv->last_file_off, 0,
+ priv->total_size -
+ priv->last_file_off);
+ if (ret)
+ return ret;
+ }
}
free(priv->data);
return 0;
next prev parent reply other threads:[~2010-03-22 4:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-20 4:26 [PATCH 2/4] btrfs-convert: Add extent iteration functions Sean Bartell
2010-03-22 4:55 ` Sean Bartell [this message]
2010-05-18 13:06 ` Yan, Zheng
2010-05-18 15:37 ` Sean Bartell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100322045526.GA21666@flcl.lan \
--to=wingedtachikoma@gmail.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).