Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-2.6.git] / fs / qnx4 / inode.c
index b90c796..2bfd987 100644 (file)
@@ -199,12 +199,13 @@ static const char *qnx4_checkroot(struct super_block *sb)
                                        if (!strcmp(rootdir->di_fname,
                                                    QNX4_BMNAME)) {
                                                found = 1;
-                                               qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL );
+                                               qnx4_sb(sb)->BitMap = kmemdup(rootdir,
+                                                                             sizeof(struct qnx4_inode_entry),
+                                                                             GFP_KERNEL);
                                                if (!qnx4_sb(sb)->BitMap) {
                                                        brelse (bh);
                                                        return "not enough memory for bitmap inode";
-                                               }
-                                               memcpy( qnx4_sb(sb)->BitMap, rootdir, sizeof( struct qnx4_inode_entry ) );      /* keep bitmap inode known */
+                                               }/* keep bitmap inode known */
                                                break;
                                        }
                                }