* [PATCH 01/25] [btrfs] BUG to BUG_ON changes
[not found] <1236661850-8237-1-git-send-email-stoyboyker@gmail.com>
@ 2009-03-10 5:10 ` Stoyan Gaydarov
2009-03-10 9:16 ` David John
2009-03-10 13:24 ` Chris Mason
0 siblings, 2 replies; 5+ messages in thread
From: Stoyan Gaydarov @ 2009-03-10 5:10 UTC (permalink / raw)
To: linux-kernel; +Cc: Stoyan Gaydarov, chris.mason, linux-btrfs
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
---
fs/btrfs/ctree.c | 3 +--
fs/btrfs/extent-tree.c | 3 +--
fs/btrfs/free-space-cache.c | 3 +--
fs/btrfs/tree-log.c | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 37f31b5..2c590b0 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -2174,8 +2174,7 @@ static int insert_ptr(struct btrfs_trans_handle *trans, struct btrfs_root
BUG_ON(!path->nodes[level]);
lower = path->nodes[level];
nritems = btrfs_header_nritems(lower);
- if (slot > nritems)
- BUG();
+ BUG_ON(slot > nritems);
if (nritems == BTRFS_NODEPTRS_PER_BLOCK(root))
BUG();
if (slot != nritems) {
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 9abf81f..0314ab6 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -672,8 +672,7 @@ static noinline int insert_extents(struct btrfs_trans_handle *trans,
keys+i, data_size+i, total-i);
BUG_ON(ret < 0);
- if (last && ret > 1)
- BUG();
+ BUG_ON(last && ret > 1);
leaf = path->nodes[0];
for (c = 0; c < ret; c++) {
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d1e5f0e..b0c7661 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -267,8 +267,7 @@ static int __btrfs_add_free_space(struct btrfs_block_group_cache *block_group,
out:
if (ret) {
printk(KERN_ERR "btrfs: unable to add free space :%d\n", ret);
- if (ret == -EEXIST)
- BUG();
+ BUG_ON(ret == -EEXIST);
}
kfree(alloc_info);
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 9c462fb..2c892f6 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1150,8 +1150,7 @@ insert:
ret = insert_one_name(trans, root, path, key->objectid, key->offset,
name, name_len, log_type, &log_key);
- if (ret && ret != -ENOENT)
- BUG();
+ BUG_ON(ret && ret != -ENOENT);
goto out;
}
--
1.6.1.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 01/25] [btrfs] BUG to BUG_ON changes
2009-03-10 5:10 ` [PATCH 01/25] [btrfs] BUG to BUG_ON changes Stoyan Gaydarov
@ 2009-03-10 9:16 ` David John
2009-03-10 18:16 ` Stoyan Gaydarov
2009-03-10 13:24 ` Chris Mason
1 sibling, 1 reply; 5+ messages in thread
From: David John @ 2009-03-10 9:16 UTC (permalink / raw)
To: Stoyan Gaydarov; +Cc: linux-kernel, chris.mason, linux-btrfs
Stoyan Gaydarov wrote:
> Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
> ---
> fs/btrfs/ctree.c | 3 +--
> fs/btrfs/extent-tree.c | 3 +--
> fs/btrfs/free-space-cache.c | 3 +--
> fs/btrfs/tree-log.c | 3 +--
> 4 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> index 37f31b5..2c590b0 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -2174,8 +2174,7 @@ static int insert_ptr(struct btrfs_trans_handle *trans, struct btrfs_root
> BUG_ON(!path->nodes[level]);
> lower = path->nodes[level];
> nritems = btrfs_header_nritems(lower);
> - if (slot > nritems)
> - BUG();
> + BUG_ON(slot > nritems);
> if (nritems == BTRFS_NODEPTRS_PER_BLOCK(root))
> BUG();
^ You seem to have missed one.
> if (slot != nritems) {
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index 9abf81f..0314ab6 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -672,8 +672,7 @@ static noinline int insert_extents(struct btrfs_trans_handle *trans,
> keys+i, data_size+i, total-i);
> BUG_ON(ret < 0);
>
> - if (last && ret > 1)
> - BUG();
> + BUG_ON(last && ret > 1);
>
> leaf = path->nodes[0];
> for (c = 0; c < ret; c++) {
> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
> index d1e5f0e..b0c7661 100644
> --- a/fs/btrfs/free-space-cache.c
> +++ b/fs/btrfs/free-space-cache.c
> @@ -267,8 +267,7 @@ static int __btrfs_add_free_space(struct btrfs_block_group_cache *block_group,
> out:
> if (ret) {
> printk(KERN_ERR "btrfs: unable to add free space :%d\n", ret);
> - if (ret == -EEXIST)
> - BUG();
> + BUG_ON(ret == -EEXIST);
> }
>
> kfree(alloc_info);
> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index 9c462fb..2c892f6 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -1150,8 +1150,7 @@ insert:
> ret = insert_one_name(trans, root, path, key->objectid, key->offset,
> name, name_len, log_type, &log_key);
>
> - if (ret && ret != -ENOENT)
> - BUG();
> + BUG_ON(ret && ret != -ENOENT);
> goto out;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 01/25] [btrfs] BUG to BUG_ON changes
2009-03-10 5:10 ` [PATCH 01/25] [btrfs] BUG to BUG_ON changes Stoyan Gaydarov
2009-03-10 9:16 ` David John
@ 2009-03-10 13:24 ` Chris Mason
1 sibling, 0 replies; 5+ messages in thread
From: Chris Mason @ 2009-03-10 13:24 UTC (permalink / raw)
To: Stoyan Gaydarov; +Cc: linux-kernel, linux-btrfs
On Tue, 2009-03-10 at 00:10 -0500, Stoyan Gaydarov wrote:
> Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
> ---
> fs/btrfs/ctree.c | 3 +--
> fs/btrfs/extent-tree.c | 3 +--
> fs/btrfs/free-space-cache.c | 3 +--
> fs/btrfs/tree-log.c | 3 +--
> 4 files changed, 4 insertions(+), 8 deletions(-)
>
Thanks, I've queued this one up.
-chris
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 01/25] [btrfs] BUG to BUG_ON changes
2009-03-10 9:16 ` David John
@ 2009-03-10 18:16 ` Stoyan Gaydarov
2009-03-10 18:20 ` Oliver Mattos
0 siblings, 1 reply; 5+ messages in thread
From: Stoyan Gaydarov @ 2009-03-10 18:16 UTC (permalink / raw)
To: davidjonx; +Cc: linux-kernel, chris.mason, linux-btrfs
On Tue, Mar 10, 2009 at 4:16 AM, David John <davidjonx@gmail.com> wrote=
:
> Stoyan Gaydarov wrote:
>> Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
>> ---
>> =C2=A0fs/btrfs/ctree.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=
=A0 =C2=A03 +--
>> =C2=A0fs/btrfs/extent-tree.c =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2=A03 +-=
-
>> =C2=A0fs/btrfs/free-space-cache.c | =C2=A0 =C2=A03 +--
>> =C2=A0fs/btrfs/tree-log.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0=
3 +--
>> =C2=A04 files changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
>> index 37f31b5..2c590b0 100644
>> --- a/fs/btrfs/ctree.c
>> +++ b/fs/btrfs/ctree.c
>> @@ -2174,8 +2174,7 @@ static int insert_ptr(struct btrfs_trans_handl=
e *trans, struct btrfs_root
>> =C2=A0 =C2=A0 =C2=A0 BUG_ON(!path->nodes[level]);
>> =C2=A0 =C2=A0 =C2=A0 lower =3D path->nodes[level];
>> =C2=A0 =C2=A0 =C2=A0 nritems =3D btrfs_header_nritems(lower);
>> - =C2=A0 =C2=A0 if (slot > nritems)
>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 BUG();
>> + =C2=A0 =C2=A0 BUG_ON(slot > nritems);
>> =C2=A0 =C2=A0 =C2=A0 if (nritems =3D=3D BTRFS_NODEPTRS_PER_BLOCK(roo=
t))
>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 BUG();
>
> ^ You seem to have missed one.
Actually that one was left on purpose because BUG_ON calls are not to
have any side effects and I do not know enough about btrfs to know
what BTRFS_NODEPTRS_PER_BLOCK does so it was left as is.
>
>> =C2=A0 =C2=A0 =C2=A0 if (slot !=3D nritems) {
>> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
>> index 9abf81f..0314ab6 100644
>> --- a/fs/btrfs/extent-tree.c
>> +++ b/fs/btrfs/extent-tree.c
>> @@ -672,8 +672,7 @@ static noinline int insert_extents(struct btrfs_=
trans_handle *trans,
>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 keys+i, data_size+i, total-i);
>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 BUG_ON(ret < 0);
>>
>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (last && ret > 1)
>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 BUG();
>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 BUG_ON(last && ret > 1);
>>
>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 leaf =3D path->node=
s[0];
>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 for (c =3D 0; c < r=
et; c++) {
>> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache=
=2Ec
>> index d1e5f0e..b0c7661 100644
>> --- a/fs/btrfs/free-space-cache.c
>> +++ b/fs/btrfs/free-space-cache.c
>> @@ -267,8 +267,7 @@ static int __btrfs_add_free_space(struct btrfs_b=
lock_group_cache *block_group,
>> =C2=A0out:
>> =C2=A0 =C2=A0 =C2=A0 if (ret) {
>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 printk(KERN_ERR "bt=
rfs: unable to add free space :%d\n", ret);
>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (ret =3D=3D -EEXIST)
>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 BUG();
>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 BUG_ON(ret =3D=3D -EEXIS=
T);
>> =C2=A0 =C2=A0 =C2=A0 }
>>
>> =C2=A0 =C2=A0 =C2=A0 kfree(alloc_info);
>> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
>> index 9c462fb..2c892f6 100644
>> --- a/fs/btrfs/tree-log.c
>> +++ b/fs/btrfs/tree-log.c
>> @@ -1150,8 +1150,7 @@ insert:
>> =C2=A0 =C2=A0 =C2=A0 ret =3D insert_one_name(trans, root, path, key-=
>objectid, key->offset,
>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 name, name_len, log_type, &log_key);
>>
>> - =C2=A0 =C2=A0 if (ret && ret !=3D -ENOENT)
>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 BUG();
>> + =C2=A0 =C2=A0 BUG_ON(ret && ret !=3D -ENOENT);
>> =C2=A0 =C2=A0 =C2=A0 goto out;
>> =C2=A0}
>>
>
>
--=20
-Stoyan
--
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] 5+ messages in thread
* Re: [PATCH 01/25] [btrfs] BUG to BUG_ON changes
2009-03-10 18:16 ` Stoyan Gaydarov
@ 2009-03-10 18:20 ` Oliver Mattos
0 siblings, 0 replies; 5+ messages in thread
From: Oliver Mattos @ 2009-03-10 18:20 UTC (permalink / raw)
To: Stoyan Gaydarov, davidjonx; +Cc: linux-kernel, chris.mason, linux-btrfs
>>> if (nritems == BTRFS_NODEPTRS_PER_BLOCK(root))
>>> BUG();
>>
>> ^ You seem to have missed one.
>
> Actually that one was left on purpose because BUG_ON calls are not to
> have any side effects and I do not know enough about btrfs to know
> what BTRFS_NODEPTRS_PER_BLOCK does so it was left as is.
>
BTRFS_NODEPTRS_PER_BLOCK has no side effects - it's defined as:
00284 #define BTRFS_NODEPTRS_PER_BLOCK(r) (((r)->nodesize - \
00285 sizeof(struct btrfs_header)) / \
00286 sizeof(struct btrfs_key_ptr))
so it should be fine to put it in the BUG_ON.
----- Original Message -----
From: "Stoyan Gaydarov" <stoyboyker@gmail.com>
To: <davidjonx@gmail.com>
Cc: <linux-kernel@vger.kernel.org>; <chris.mason@oracle.com>;
<linux-btrfs@vger.kernel.org>
Sent: Tuesday, March 10, 2009 6:16 PM
Subject: Re: [PATCH 01/25] [btrfs] BUG to BUG_ON changes
> On Tue, Mar 10, 2009 at 4:16 AM, David John <davidjonx@gmail.com> wrote:
>> Stoyan Gaydarov wrote:
>>> Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
>>> ---
>>> fs/btrfs/ctree.c | 3 +--
>>> fs/btrfs/extent-tree.c | 3 +--
>>> fs/btrfs/free-space-cache.c | 3 +--
>>> fs/btrfs/tree-log.c | 3 +--
>>> 4 files changed, 4 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
>>> index 37f31b5..2c590b0 100644
>>> --- a/fs/btrfs/ctree.c
>>> +++ b/fs/btrfs/ctree.c
>>> @@ -2174,8 +2174,7 @@ static int insert_ptr(struct btrfs_trans_handle
>>> *trans, struct btrfs_root
>>> BUG_ON(!path->nodes[level]);
>>> lower = path->nodes[level];
>>> nritems = btrfs_header_nritems(lower);
>>> - if (slot > nritems)
>>> - BUG();
>>> + BUG_ON(slot > nritems);
>>> if (nritems == BTRFS_NODEPTRS_PER_BLOCK(root))
>>> BUG();
>>
>> ^ You seem to have missed one.
>
> Actually that one was left on purpose because BUG_ON calls are not to
> have any side effects and I do not know enough about btrfs to know
> what BTRFS_NODEPTRS_PER_BLOCK does so it was left as is.
>
>>
>>> if (slot != nritems) {
>>> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
>>> index 9abf81f..0314ab6 100644
>>> --- a/fs/btrfs/extent-tree.c
>>> +++ b/fs/btrfs/extent-tree.c
>>> @@ -672,8 +672,7 @@ static noinline int insert_extents(struct
>>> btrfs_trans_handle *trans,
>>> keys+i, data_size+i, total-i);
>>> BUG_ON(ret < 0);
>>>
>>> - if (last && ret > 1)
>>> - BUG();
>>> + BUG_ON(last && ret > 1);
>>>
>>> leaf = path->nodes[0];
>>> for (c = 0; c < ret; c++) {
>>> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
>>> index d1e5f0e..b0c7661 100644
>>> --- a/fs/btrfs/free-space-cache.c
>>> +++ b/fs/btrfs/free-space-cache.c
>>> @@ -267,8 +267,7 @@ static int __btrfs_add_free_space(struct
>>> btrfs_block_group_cache *block_group,
>>> out:
>>> if (ret) {
>>> printk(KERN_ERR "btrfs: unable to add free space :%d\n", ret);
>>> - if (ret == -EEXIST)
>>> - BUG();
>>> + BUG_ON(ret == -EEXIST);
>>> }
>>>
>>> kfree(alloc_info);
>>> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
>>> index 9c462fb..2c892f6 100644
>>> --- a/fs/btrfs/tree-log.c
>>> +++ b/fs/btrfs/tree-log.c
>>> @@ -1150,8 +1150,7 @@ insert:
>>> ret = insert_one_name(trans, root, path, key->objectid, key->offset,
>>> name, name_len, log_type, &log_key);
>>>
>>> - if (ret && ret != -ENOENT)
>>> - BUG();
>>> + BUG_ON(ret && ret != -ENOENT);
>>> goto out;
>>> }
>>>
>>
>>
>
> --
>
> -Stoyan
> --
> 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] 5+ messages in thread
end of thread, other threads:[~2009-03-10 18:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1236661850-8237-1-git-send-email-stoyboyker@gmail.com>
2009-03-10 5:10 ` [PATCH 01/25] [btrfs] BUG to BUG_ON changes Stoyan Gaydarov
2009-03-10 9:16 ` David John
2009-03-10 18:16 ` Stoyan Gaydarov
2009-03-10 18:20 ` Oliver Mattos
2009-03-10 13:24 ` Chris Mason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox