aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/namei.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-10-03 17:36:38 -0400
committerAdrian Bunk <bunk@stusta.de>2006-10-03 17:36:38 -0400
commit14a61442c2203d2a49f2f954bfa9259c0ddac1aa (patch)
treec146effc3dbaa41dd6fdd01e6f3f8fcdd63ad705 /fs/reiserfs/namei.c
parent8d8f3cbe777e014123bfa63f2cebd6eb29032225 (diff)
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>
Diffstat (limited to 'fs/reiserfs/namei.c')
-rw-r--r--fs/reiserfs/namei.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 16e9cff8f15d..abde1edc2235 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)
67{ 67{
68 struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num; 68 struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num;
69 69
70 if (de->de_entry_num >= ih_entry_count(de->de_ih)) 70 BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
71 BUG();
72 71
73 de->de_entrylen = entry_length(de->de_bh, de->de_ih, de->de_entry_num); 72 de->de_entrylen = entry_length(de->de_bh, de->de_ih, de->de_entry_num);
74 de->de_namelen = de->de_entrylen - (de_with_sd(deh) ? SD_SIZE : 0); 73 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)
80// what entry points to 79// what entry points to
81static inline void set_de_object_key(struct reiserfs_dir_entry *de) 80static inline void set_de_object_key(struct reiserfs_dir_entry *de)
82{ 81{
83 if (de->de_entry_num >= ih_entry_count(de->de_ih)) 82 BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
84 BUG();
85 de->de_dir_id = deh_dir_id(&(de->de_deh[de->de_entry_num])); 83 de->de_dir_id = deh_dir_id(&(de->de_deh[de->de_entry_num]));
86 de->de_objectid = deh_objectid(&(de->de_deh[de->de_entry_num])); 84 de->de_objectid = deh_objectid(&(de->de_deh[de->de_entry_num]));
87} 85}
@@ -90,8 +88,7 @@ static inline void store_de_entry_key(struct reiserfs_dir_entry *de)
90{ 88{
91 struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num; 89 struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num;
92 90
93 if (de->de_entry_num >= ih_entry_count(de->de_ih)) 91 BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
94 BUG();
95 92
96 /* store key of the found entry */ 93 /* store key of the found entry */
97 de->de_entry_key.version = KEY_FORMAT_3_5; 94 de->de_entry_key.version = KEY_FORMAT_3_5;