diff options
| author | Filipe David Borba Manana <fdmanana@gmail.com> | 2013-09-11 20:36:44 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-09-21 11:05:29 -0400 |
| commit | a0634be562c27ddee7c94bce4f765f8071244e07 (patch) | |
| tree | 0c32bf5f94d9a63d86975515f2ea706669702303 /fs | |
| parent | a724b4369097897db45d61108c0e976912e586c7 (diff) | |
| download | linux-a0634be562c27ddee7c94bce4f765f8071244e07.tar.bz2 | |
Btrfs: don't leak transaction in btrfs_sync_file()
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: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 5ba87b0d2ef8..d12107e90987 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1859,8 +1859,8 @@ 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); - goto out; + /* Fallthrough and commit/free transaction. */ + ret = 1; } /* we've logged all the items and now have a consistent |