diff options
| author | Stoyan Gaydarov <stoyboyker@gmail.com> | 2009-04-02 17:05:11 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-04-02 17:05:11 -0400 |
| commit | c293498be69816087746161338de4b81efdf69fc (patch) | |
| tree | 32b856b67ca63e2649c8574c9a09352666362ec8 /fs/btrfs | |
| parent | 3e7ad38d20ad113158d1b4c9de0f51c04f50d4f7 (diff) | |
| download | lwn-c293498be69816087746161338de4b81efdf69fc.tar.gz lwn-c293498be69816087746161338de4b81efdf69fc.zip | |
Btrfs: BUG to BUG_ON changes
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/ctree.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/free-space-cache.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/tree-log.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index b8082762ca78..e5b2533b691a 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -2157,8 +2157,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/free-space-cache.c b/fs/btrfs/free-space-cache.c index 3fdadd28e935..768b9523662d 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -253,8 +253,7 @@ int btrfs_add_free_space(struct btrfs_block_group_cache *block_group, if (ret) { printk(KERN_ERR "btrfs: unable to add free space :%d\n", ret); - if (ret == -EEXIST) - BUG(); + BUG_ON(ret == -EEXIST); } return ret; diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index c047eea4093f..25f20ea11f27 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1222,8 +1222,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; } |