[MIPS] Early check for SMTC kernel on non-MT processor

[linux-2.6] / fs / ocfs2 / slot_map.c

diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index 871627961d6df49a5a476c9a486e576c7ee417bf..d8b79067dc14778a5d67556c20c62fec9a5e4de7 100644 (file)
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -26,7 +26,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/smp_lock.h>
 
 #define MLOG_MASK_PREFIX ML_SUPER
 #include <cluster/masklog.h>
@@ -175,7 +174,7 @@ int ocfs2_init_slot_info(struct ocfs2_super *osb)
        struct buffer_head *bh = NULL;
        struct ocfs2_slot_info *si;
 
-       si = kcalloc(1, sizeof(struct ocfs2_slot_info), GFP_KERNEL);
+       si = kzalloc(sizeof(struct ocfs2_slot_info), GFP_KERNEL);
        if (!si) {
                status = -ENOMEM;
                mlog_errno(status);
@@ -197,7 +196,7 @@ int ocfs2_init_slot_info(struct ocfs2_super *osb)
                goto bail;
        }
 
-       status = ocfs2_extent_map_get_blocks(inode, 0ULL, 1, &blkno, NULL);
+       status = ocfs2_extent_map_get_blocks(inode, 0ULL, &blkno, NULL, NULL);
        if (status < 0) {
                mlog_errno(status);
                goto bail;
@@ -264,7 +263,7 @@ int ocfs2_find_slot(struct ocfs2_super *osb)
        osb->slot_num = slot;
        spin_unlock(&si->si_lock);
 
-       mlog(ML_NOTICE, "taking node slot %d\n", osb->slot_num);
+       mlog(0, "taking node slot %d\n", osb->slot_num);
 
        status = ocfs2_update_disk_slots(osb, si);
        if (status < 0)