diff options
| author | Josef Bacik <jbacik@fusionio.com> | 2013-07-22 12:54:30 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-08-09 19:30:16 -0400 |
| commit | f3b15ccdbb9a79781578249a63318805e55a6c34 (patch) | |
| tree | 06a1fa7f70424dcbb111e7f68efe59950d93d86e | |
| parent | ee20a98314e52a6675e94d1a07ca205ffdf09a72 (diff) | |
| download | linux-f3b15ccdbb9a79781578249a63318805e55a6c34.tar.gz linux-f3b15ccdbb9a79781578249a63318805e55a6c34.tar.bz2 linux-f3b15ccdbb9a79781578249a63318805e55a6c34.zip | |
Btrfs: release both paths before logging dir/changed extents
The ceph guys tripped over this bug where we were still holding onto the
original path that we used to copy the inode with when logging. This is based
on Chris's fix which was reported to fix the problem. We need to drop the paths
in two cases anyway so just move the drop up so that we don't have duplicate
code. Thanks,
Cc: stable@vger.kernel.org
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
| -rw-r--r-- | fs/btrfs/tree-log.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 2c6791493637..ff60d8978ae2 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3746,8 +3746,9 @@ next_slot: } log_extents: + btrfs_release_path(path); + btrfs_release_path(dst_path); if (fast_search) { - btrfs_release_path(dst_path); ret = btrfs_log_changed_extents(trans, root, inode, dst_path); if (ret) { err = ret; @@ -3764,8 +3765,6 @@ log_extents: } if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode)) { - btrfs_release_path(path); - btrfs_release_path(dst_path); ret = log_directory_changes(trans, root, inode, path, dst_path); if (ret) { err = ret; |