Merge branch 'master'

[linux-2.6-omap-h63xx.git] / fs / gfs2 / util.h

diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h
index c9624c30cad64ff7ebb4b210b9166f70dbe2f9b2..8216d28bd816ebbd42ccf9bfff38f421ac5b2515 100644 (file)
--- a/fs/gfs2/util.h
+++ b/fs/gfs2/util.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
@@ -30,6 +30,7 @@ void gfs2_assert_i(struct gfs2_sbd *sdp);
 do { \
        if (unlikely(!(assertion))) { \
                gfs2_assert_i(sdp); \
+               BUG(); \
         } \
 } while (0)