From: Filipe David Borba Manana <fdmanana@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: jbacik@fusionio.com, Filipe David Borba Manana <fdmanana@gmail.com>
Subject: [PATCH v2] Btrfs: don't leak transaction in btrfs_sync_file()
Date: Thu, 12 Sep 2013 10:37:24 +0100 [thread overview]
Message-ID: <1378978644-21280-1-git-send-email-fdmanana@gmail.com> (raw)
In-Reply-To: <1378928204-12641-1-git-send-email-fdmanana@gmail.com>
In btrfs_sync_file(), if the call to btrfs_log_dentry_safe() returns
a negative error (for e.g. -ENOMEM via btrfs_log_inode()), we would
return without ending/freeing the transaction.
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
V2: If btrfs_log_dentry_safe() returns error, don't fall through because
that will override the final return value, and can make us return
success (0) instead of an error.
fs/btrfs/file.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 5ba87b0..8c305f5 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1860,6 +1860,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
ret = btrfs_log_dentry_safe(trans, root, dentry);
if (ret < 0) {
mutex_unlock(&inode->i_mutex);
+ btrfs_end_transaction(trans, root);
goto out;
}
--
1.7.9.5
prev parent reply other threads:[~2013-09-12 9:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-11 19:36 [PATCH] Btrfs: don't leak transaction in btrfs_sync_file() Filipe David Borba Manana
2013-09-12 9:37 ` Filipe David Borba Manana [this message]
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=1378978644-21280-1-git-send-email-fdmanana@gmail.com \
--to=fdmanana@gmail.com \
--cc=jbacik@fusionio.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).