ocfs2_dlm: Add missing locks in dlm_empty_lockres

[linux-2.6] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 457fdac4c17d98db97cebd0c6910e23f4f97399f..050a1f0f3a8633ff90f8f89355e3b562f070ce7f 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -5,6 +5,7 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/genhd.h>
+#include <linux/kdev_t.h>
 #include <linux/kernel.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
@@ -61,6 +62,8 @@ int register_blkdev(unsigned int major, const char *name)
        /* temporary */
        if (major == 0) {
                for (index = ARRAY_SIZE(major_names)-1; index > 0; index--) {
+                       if (is_lanana_major(index))
+                               continue;
                        if (major_names[index] == NULL)
                                break;
                }