On 7/10/14, 8:35 PM, Satoru Takeuchi wrote:
> This is the v3 patch.
>
> ===
> From: Satoru Takeuchi <takeuchi_sat...@jp.fujitsu.com>
>
> If "(!IS_ERR(trans) || PTR_ERR(trans) != -ENOSPC))" is false,
> obviously "trans" is -ENOSPC. So we can safely remove the redundant
> "(PTR_ERR(trans) == -ENOSPC)" check.
>
> Signed-off-by: Satoru Takeuchi <takeuchi_sat...@jp.fujitsu.com>
Reviewed-by: Eric Sandeen <sand...@redhat.com>
> ---
> fs/btrfs/inode.c | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 3668048..e7ac779 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -3790,6 +3790,7 @@ static struct btrfs_trans_handle
> *__unlink_start_trans(struct inode *dir)
> {
> struct btrfs_trans_handle *trans;
> struct btrfs_root *root = BTRFS_I(dir)->root;
> + u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);
> int ret;
>
> /*
> @@ -3803,22 +3804,21 @@ static struct btrfs_trans_handle
> *__unlink_start_trans(struct inode *dir)
> if (!IS_ERR(trans) || PTR_ERR(trans) != -ENOSPC)
> return trans;
>
> - if (PTR_ERR(trans) == -ENOSPC) {
> - u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);
> + /* Handle ENOSPC */
>
> - trans = btrfs_start_transaction(root, 0);
> - if (IS_ERR(trans))
> - return trans;
> - ret = btrfs_cond_migrate_bytes(root->fs_info,
> - &root->fs_info->trans_block_rsv,
> - num_bytes, 5);
> - if (ret) {
> - btrfs_end_transaction(trans, root);
> - return ERR_PTR(ret);
> - }
> - trans->block_rsv = &root->fs_info->trans_block_rsv;
> - trans->bytes_reserved = num_bytes;
> + trans = btrfs_start_transaction(root, 0);
> + if (IS_ERR(trans))
> + return trans;
> + ret = btrfs_cond_migrate_bytes(root->fs_info,
> + &root->fs_info->trans_block_rsv,
> + num_bytes, 5);
> + if (ret) {
> + btrfs_end_transaction(trans, root);
> + return ERR_PTR(ret);
> }
> + trans->block_rsv = &root->fs_info->trans_block_rsv;
> + trans->bytes_reserved = num_bytes;
> +
> return trans;
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
