BUG_ON conversion for fs/reiserfs

This patch converts several if () BUG(); construct to BUG_ON();
which occupies less space, uses unlikely and is safer when
BUG() is disabled. S_ISREG() has no side effects, so the
conversion is safe.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

1 files changed, 3 insertions, 6 deletions

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 16e9cff8f15..abde1edc223 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -67,8 +67,7 @@ inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de)
 {
         struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num;
 
-        if (de->de_entry_num >= ih_entry_count(de->de_ih))
-                BUG();
+        BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
 
         de->de_entrylen = entry_length(de->de_bh, de->de_ih, de->de_entry_num);
         de->de_namelen = de->de_entrylen - (de_with_sd(deh) ? SD_SIZE : 0);
@@ -80,8 +79,7 @@ inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de)
 // what entry points to
 static inline void set_de_object_key(struct reiserfs_dir_entry *de)
 {
-        if (de->de_entry_num >= ih_entry_count(de->de_ih))
-                BUG();
+        BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
         de->de_dir_id = deh_dir_id(&(de->de_deh[de->de_entry_num]));
         de->de_objectid = deh_objectid(&(de->de_deh[de->de_entry_num]));
 }
@@ -90,8 +88,7 @@ static inline void store_de_entry_key(struct reiserfs_dir_entry *de)
 {
         struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num;
 
-        if (de->de_entry_num >= ih_entry_count(de->de_ih))
-                BUG();
+        BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
 
         /* store key of the found entry */
         de->de_entry_key.version = KEY_FORMAT_3_5;