The patch titled fs/ext2: use BUG_ON has been removed from the -mm tree. Its filename was fs-ext2-use-bug_on.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/ext2: use BUG_ON From: Julia Lawall <julia@xxxxxxx> if (...) BUG(); should be replaced with BUG_ON(...) when the test has no side-effects to allow a definition of BUG_ON that drops the code completely. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @ disable unlikely @ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (unlikely(E)) { BUG(); } + BUG_ON(E); ) @@ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (E) { BUG(); } + BUG_ON(E); ) // </smpl> Signed-off-by: Julia Lawall <julia@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ext2/balloc.c | 3 +-- fs/ext2/dir.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff -puN fs/ext2/balloc.c~fs-ext2-use-bug_on fs/ext2/balloc.c --- a/fs/ext2/balloc.c~fs-ext2-use-bug_on +++ a/fs/ext2/balloc.c @@ -245,8 +245,7 @@ restart: prev = rsv; } printk("Window map complete.\n"); - if (bad) - BUG(); + BUG_ON(bad); } #define rsv_window_dump(root, verbose) \ __rsv_window_dump((root), (verbose), __FUNCTION__) diff -puN fs/ext2/dir.c~fs-ext2-use-bug_on fs/ext2/dir.c --- a/fs/ext2/dir.c~fs-ext2-use-bug_on +++ a/fs/ext2/dir.c @@ -41,8 +41,8 @@ static inline __le16 ext2_rec_len_to_dis { if (len == (1 << 16)) return cpu_to_le16(EXT2_MAX_REC_LEN); - else if (len > (1 << 16)) - BUG(); + else + BUG_ON(len > (1 << 16)); return cpu_to_le16(len); } _ Patches currently in -mm which might be from julia@xxxxxxx are origin.patch drivers-scsi-use-time_before-time_before_eq-etc.patch fs-affs-filec-use-bug_on.patch drivers-misc-elide-a-non-zero-test-on-a-result-that-is-never-0.patch fs-ext4-use-bug_on.patch drivers-char-ds1286c-use-time_before-time_before_eq-etc.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html