Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

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

diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index aa6f5aadedc4f9f0d169e8b456e1d1e081b26c92..2d3ac32cb74e9bcaecfffbe405080c6c7b040902 100644 (file)
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -175,7 +175,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);