---

yaml --- r: 280467 b: refs/heads/master c: 67c50a7 h: refs/heads/master i: 280465: 83e5a26 280463: 8d2d419 v: v3
git-mirror · Nov 20, 2011 · 1b35cd8 · 1b35cd8
1 parent d9f224b
commit 1b35cd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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;
 					}
 				}