* [PATCH] btrfs: remove unnecessary error check
@ 2014-07-10 3:19 Satoru Takeuchi
2014-07-10 3:26 ` Eric Sandeen
0 siblings, 1 reply; 6+ messages in thread
From: Satoru Takeuchi @ 2014-07-10 3:19 UTC (permalink / raw)
To: linux-btrfs@vger.kernel.org
From: Satoru Takeuchi <takeuchi_satoru@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_satoru@jp.fujitsu.com>
---
fs/btrfs/inode.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 3668048..01bb43c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3803,22 +3803,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);
+ u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);
- 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;
}
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] btrfs: remove unnecessary error check
2014-07-10 3:19 [PATCH] btrfs: remove unnecessary error check Satoru Takeuchi
@ 2014-07-10 3:26 ` Eric Sandeen
2014-07-10 6:44 ` [PATCH v2] " Satoru Takeuchi
0 siblings, 1 reply; 6+ messages in thread
From: Eric Sandeen @ 2014-07-10 3:26 UTC (permalink / raw)
To: Satoru Takeuchi; +Cc: linux-btrfs@vger.kernel.org
> On Jul 9, 2014, at 10:20 PM, Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> wrote:
>
> From: Satoru Takeuchi <takeuchi_satoru@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.
>
True, but now a comment like:
/* Handle ENOSPC */
might still be nice...
Eric
> Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
>
> ---
> fs/btrfs/inode.c | 27 +++++++++++++--------------
> 1 file changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 3668048..01bb43c 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -3803,22 +3803,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);
> + u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);
>
> - 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;
> }
>
> --
> 1.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] btrfs: remove unnecessary error check
2014-07-10 3:26 ` Eric Sandeen
@ 2014-07-10 6:44 ` Satoru Takeuchi
2014-07-10 13:27 ` Eric Sandeen
0 siblings, 1 reply; 6+ messages in thread
From: Satoru Takeuchi @ 2014-07-10 6:44 UTC (permalink / raw)
To: Eric Sandeen; +Cc: linux-btrfs@vger.kernel.org
(2014/07/10 12:26), Eric Sandeen wrote:
>
>
>> On Jul 9, 2014, at 10:20 PM, Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> wrote:
>>
>> From: Satoru Takeuchi <takeuchi_satoru@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.
>>
>
> True, but now a comment like:
>
> /* Handle ENOSPC */
>
> might still be nice...
Eric, thank you for your comment. I fixed my patch.
How about is it?
===
From: Satoru Takeuchi <takeuchi_satoru@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_satoru@jp.fujitsu.com>
---
fs/btrfs/inode.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 3668048..115aac3 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3803,22 +3803,23 @@ 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;
+ u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);
+
+ 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;
}
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] btrfs: remove unnecessary error check
2014-07-10 6:44 ` [PATCH v2] " Satoru Takeuchi
@ 2014-07-10 13:27 ` Eric Sandeen
2014-07-11 1:35 ` [PATCH v3] " Satoru Takeuchi
0 siblings, 1 reply; 6+ messages in thread
From: Eric Sandeen @ 2014-07-10 13:27 UTC (permalink / raw)
To: Satoru Takeuchi; +Cc: linux-btrfs@vger.kernel.org
On 7/10/14, 1:44 AM, Satoru Takeuchi wrote:
> (2014/07/10 12:26), Eric Sandeen wrote:
>>
>>
>>> On Jul 9, 2014, at 10:20 PM, Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> wrote:
>>>
>>> From: Satoru Takeuchi <takeuchi_satoru@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.
>>>
>>
>> True, but now a comment like:
>>
>> /* Handle ENOSPC */
>>
>> might still be nice...
>
> Eric, thank you for your comment. I fixed my patch.
> How about is it?
One other thing I missed the first time, I'm sorry, notes below:
>
> ===
> From: Satoru Takeuchi <takeuchi_satoru@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_satoru@jp.fujitsu.com>
>
> ---
> fs/btrfs/inode.c | 29 +++++++++++++++--------------
> 1 file changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 3668048..115aac3 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -3803,22 +3803,23 @@ 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;
> + u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);
This variable should be declared at the beginning of the function,
not in the middle, because it's no longer in a separate code block.
Also, somehow by the time the patch got here, tabs turned into
4 spaces, so this one wouldn't apply for me.
Sorry for missing the variable declaration problem the first time!
-Eric
> +
> + 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;
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] btrfs: remove unnecessary error check
2014-07-10 13:27 ` Eric Sandeen
@ 2014-07-11 1:35 ` Satoru Takeuchi
2014-07-11 14:23 ` Eric Sandeen
0 siblings, 1 reply; 6+ messages in thread
From: Satoru Takeuchi @ 2014-07-11 1:35 UTC (permalink / raw)
To: sandeen; +Cc: linux-btrfs@vger.kernel.org
Hi Eric,
(2014/07/10 22:27), Eric Sandeen wrote:
> On 7/10/14, 1:44 AM, Satoru Takeuchi wrote:
>> (2014/07/10 12:26), Eric Sandeen wrote:
>>>
>>>
>>>> On Jul 9, 2014, at 10:20 PM, Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> wrote:
>>>>
>>>> From: Satoru Takeuchi <takeuchi_satoru@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.
>>>>
>>>
>>> True, but now a comment like:
>>>
>>> /* Handle ENOSPC */
>>>
>>> might still be nice...
>>
>> Eric, thank you for your comment. I fixed my patch.
>> How about is it?
>
> One other thing I missed the first time, I'm sorry, notes below:
>
>>
>> ===
>> From: Satoru Takeuchi <takeuchi_satoru@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_satoru@jp.fujitsu.com>
>>
>> ---
>> fs/btrfs/inode.c | 29 +++++++++++++++--------------
>> 1 file changed, 15 insertions(+), 14 deletions(-)
>>
>> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
>> index 3668048..115aac3 100644
>> --- a/fs/btrfs/inode.c
>> +++ b/fs/btrfs/inode.c
>> @@ -3803,22 +3803,23 @@ 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;
>> + u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);
>
> This variable should be declared at the beginning of the function,
> not in the middle, because it's no longer in a separate code block.
OK, moved.
>
> Also, somehow by the time the patch got here, tabs turned into
> 4 spaces, so this one wouldn't apply for me.
I did't realize that. Thank you.
>
> Sorry for missing the variable declaration problem the first time!
No problem, more review is welcome. THank you very much :-)
This is the v3 patch.
===
From: Satoru Takeuchi <takeuchi_satoru@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_satoru@jp.fujitsu.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;
}
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3] btrfs: remove unnecessary error check
2014-07-11 1:35 ` [PATCH v3] " Satoru Takeuchi
@ 2014-07-11 14:23 ` Eric Sandeen
0 siblings, 0 replies; 6+ messages in thread
From: Eric Sandeen @ 2014-07-11 14:23 UTC (permalink / raw)
To: Satoru Takeuchi; +Cc: linux-btrfs@vger.kernel.org
On 7/10/14, 8:35 PM, Satoru Takeuchi wrote:
> This is the v3 patch.
>
> ===
> From: Satoru Takeuchi <takeuchi_satoru@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_satoru@jp.fujitsu.com>
Reviewed-by: Eric Sandeen <sandeen@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;
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-11 14:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-10 3:19 [PATCH] btrfs: remove unnecessary error check Satoru Takeuchi
2014-07-10 3:26 ` Eric Sandeen
2014-07-10 6:44 ` [PATCH v2] " Satoru Takeuchi
2014-07-10 13:27 ` Eric Sandeen
2014-07-11 1:35 ` [PATCH v3] " Satoru Takeuchi
2014-07-11 14:23 ` Eric Sandeen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).