ceph: d_alloc_root() may fail

[~andy/linux] / fs / qnx4 / inode.c

diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index 3bdd214184321b73b1636b1e987fb3f22c1c44f6..2bfd987f4853407be1027ede89bc940460346bf8 100644 (file)
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -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;
                                        }
                                }
@@ -427,7 +428,6 @@ static struct inode *qnx4_alloc_inode(struct super_block *sb)
 static void qnx4_i_callback(struct rcu_head *head)
 {
        struct inode *inode = container_of(head, struct inode, i_rcu);
-       INIT_LIST_HEAD(&inode->i_dentry);
        kmem_cache_free(qnx4_inode_cachep, qnx4_i(inode));
 }