Message ID | 1378978644-21280-1-git-send-email-fdmanana@gmail.com (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
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; }
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(+)