diff options
| author | Filipe Manana <fdmanana@gmail.com> | 2014-05-29 23:31:39 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-06-09 17:21:06 -0700 |
| commit | b05fd8742f6291b67571ad0fdad4da6b6eb98025 (patch) | |
| tree | c2fe9187c659db8c7c900b144c55a7810fcbf138 /fs | |
| parent | d77815461f047e561f77a07754ae923ade597d4e (diff) | |
| download | linux-b05fd8742f6291b67571ad0fdad4da6b6eb98025.tar.gz | |
Btrfs: fix transaction leak during fsync call
If btrfs_log_dentry_safe() returns an error, we set ret to 1 and fall through with the goal of committing the transaction. However, in the case where the inode doesn't need a full sync, we would call btrfs_wait_ordered_range() against the target range for our inode, and if it returned an error, we would return without commiting or ending the transaction. Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index eb3f2708a01d..ad7c05909a49 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2025,8 +2025,10 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) if (!full_sync) { ret = btrfs_wait_ordered_range(inode, start, end - start + 1); - if (ret) + if (ret) { + btrfs_end_transaction(trans, root); goto out; + } } ret = btrfs_commit_transaction(trans, root); } else { |