diff --git a/[refs] b/[refs]
index b4e490cfc399..d02081af1975 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7432675f8ca868a4af365759a8d4c3779a3d922
+refs/heads/master: 8a57a9dda760ea7845390f1cd36f3eb2a49391d8
diff --git a/trunk/fs/ocfs2/stack_o2cb.c b/trunk/fs/ocfs2/stack_o2cb.c
index 3f661376a2de..e49c41050264 100644
--- a/trunk/fs/ocfs2/stack_o2cb.c
+++ b/trunk/fs/ocfs2/stack_o2cb.c
@@ -17,6 +17,7 @@
  * General Public License for more details.
  */
 
+#include <linux/kernel.h>
 #include <linux/crc32.h>
 #include <linux/module.h>
 
@@ -153,7 +154,7 @@ static int status_map[] = {
 
 static int dlm_status_to_errno(enum dlm_status status)
 {
-	BUG_ON(status > (sizeof(status_map) / sizeof(status_map[0])));
+	BUG_ON(status < 0 || status >= ARRAY_SIZE(status_map));
 
 	return status_map[status];
 }