From 1b35cd883df61bcf1e9b244896926afd3d78bbfe Mon Sep 17 00:00:00 2001 From: Thomas Meyer Date: Sun, 20 Nov 2011 13:35:57 +0100 Subject: [PATCH] --- yaml --- r: 280467 b: refs/heads/master c: 67c50a7ed52a3ba4537d3dad5eb34c1abb5f3e05 h: refs/heads/master i: 280465: 83e5a26e65bf3375e9f284a0ece288c05982dba7 280463: 8d2d4196d58fa704f2a19eed383a03db4f4af98f v: v3 --- [refs] | 2 +- trunk/fs/qnx4/inode.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cab90d3eba64..7d3ccd30312c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6416b9fa43537c01098f8faa5bcbebb4a275297d +refs/heads/master: 67c50a7ed52a3ba4537d3dad5eb34c1abb5f3e05 diff --git a/trunk/fs/qnx4/inode.c b/trunk/fs/qnx4/inode.c index 3bdd21418432..f9e9568810fb 100644 --- a/trunk/fs/qnx4/inode.c +++ b/trunk/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; } }