diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2017-02-15 16:28:32 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-02-17 12:03:56 +0100 |
| commit | 21e75ffe3cd2c99ca4ea5ecb25dcbeb6a8024c30 (patch) | |
| tree | d42f1ab5c842f8b0e2955e6ef9ead2af690c20ff | |
| parent | 77ab86bf1c64ab282f2230521c7d4d7f69ea3a3f (diff) | |
| download | op-kernel-dev-21e75ffe3cd2c99ca4ea5ecb25dcbeb6a8024c30.zip op-kernel-dev-21e75ffe3cd2c99ca4ea5ecb25dcbeb6a8024c30.tar.gz | |
btrfs: btrfs_truncate_free_space_cache always allocates path
btrfs_truncate_free_space_cache always allocates a btrfs_path structure
but only uses it when the caller passes a block group. Let's move the
allocation and free into the conditional.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/free-space-cache.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 27820d4..1a131f7 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -232,15 +232,15 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans, { struct btrfs_root *root = BTRFS_I(inode)->root; int ret = 0; - struct btrfs_path *path = btrfs_alloc_path(); bool locked = false; - if (!path) { - ret = -ENOMEM; - goto fail; - } - if (block_group) { + struct btrfs_path *path = btrfs_alloc_path(); + + if (!path) { + ret = -ENOMEM; + goto fail; + } locked = true; mutex_lock(&trans->transaction->cache_write_mutex); if (!list_empty(&block_group->io_list)) { @@ -257,8 +257,8 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans, spin_lock(&block_group->lock); block_group->disk_cache_state = BTRFS_DC_CLEAR; spin_unlock(&block_group->lock); + btrfs_free_path(path); } - btrfs_free_path(path); btrfs_i_size_write(inode, 0); truncate_pagecache(inode, 0); |
