author: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-08 13:21:22 -0800
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-08 13:21:22 -0800
commit: 98793265b429a3f0b3f1750e74d67cd4d740d162
parent: b4a133da2eaccb844a7beaef16ffd9c76a0d21d3
Commit Summary:
Diffstat:
1 file changed, 4 insertions, 3 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index b90c7967fcae..2bfd987f4853 100644
--- 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;
}
}