diff options
| author | Linus Torvalds | 2018-06-26 17:41:54 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-06-26 17:41:54 +0200 |
| commit | 84bfed40fc25dd052620398fdcc19d8c77f02270 (patch) | |
| tree | e0a8c7df159edfdc745b91de2c8158f939c31e03 /fs/btrfs/inode.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | Btrfs: fix return value on rename exchange failure (diff) | |
| download | kernel-qcow2-linux-84bfed40fc25dd052620398fdcc19d8c77f02270.tar.gz kernel-qcow2-linux-84bfed40fc25dd052620398fdcc19d8c77f02270.tar.xz kernel-qcow2-linux-84bfed40fc25dd052620398fdcc19d8c77f02270.zip | |
Merge tag 'for-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"Two regression fixes and an incorrect error value propagation fix from
'rename exchange'"
* tag 'for-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Btrfs: fix return value on rename exchange failure
btrfs: fix invalid-free in btrfs_extent_same
Btrfs: fix physical offset reported by fiemap for inline extents
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index e9482f0db9d0..be98dfc8d0f8 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9443,6 +9443,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, u64 new_idx = 0; u64 root_objectid; int ret; + int ret2; bool root_log_pinned = false; bool dest_log_pinned = false; @@ -9639,7 +9640,8 @@ out_fail: dest_log_pinned = false; } } - ret = btrfs_end_transaction(trans); + ret2 = btrfs_end_transaction(trans); + ret = ret ? ret : ret2; out_notrans: if (new_ino == BTRFS_FIRST_FREE_OBJECTID) up_read(&fs_info->subvol_sem); |