diff options
author | Alexandru Gheorghiu <gheorghiuandru@gmail.com> | 2013-03-27 20:24:53 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-03-30 20:12:18 -0400 |
commit | 79b5793be44d97c0a0e905c221858af08e5ebd85 (patch) | |
tree | 055039157ea7aee50eaed019d4be820335c7e5f7 /fs/f2fs/node.c | |
parent | 953a3e27e10fc6acb480801ea47197d0270d735e (diff) |
f2fs: use kmemdup
Use kmemdup instead of kzalloc and memcpy.
Signed-off-by: Alexandru Gheorghiu <gheorghiuandru@gmail.com>
Acked-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs/node.c')
-rw-r--r-- | fs/f2fs/node.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 0177f9434c25..10cbee9dc3d1 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c | |||
@@ -1666,19 +1666,17 @@ static int init_node_manager(struct f2fs_sb_info *sbi) | |||
1666 | spin_lock_init(&nm_i->free_nid_list_lock); | 1666 | spin_lock_init(&nm_i->free_nid_list_lock); |
1667 | rwlock_init(&nm_i->nat_tree_lock); | 1667 | rwlock_init(&nm_i->nat_tree_lock); |
1668 | 1668 | ||
1669 | nm_i->bitmap_size = __bitmap_size(sbi, NAT_BITMAP); | ||
1670 | nm_i->init_scan_nid = le32_to_cpu(sbi->ckpt->next_free_nid); | 1669 | nm_i->init_scan_nid = le32_to_cpu(sbi->ckpt->next_free_nid); |
1671 | nm_i->next_scan_nid = le32_to_cpu(sbi->ckpt->next_free_nid); | 1670 | nm_i->next_scan_nid = le32_to_cpu(sbi->ckpt->next_free_nid); |
1672 | 1671 | nm_i->bitmap_size = __bitmap_size(sbi, NAT_BITMAP); | |
1673 | nm_i->nat_bitmap = kzalloc(nm_i->bitmap_size, GFP_KERNEL); | ||
1674 | if (!nm_i->nat_bitmap) | ||
1675 | return -ENOMEM; | ||
1676 | version_bitmap = __bitmap_ptr(sbi, NAT_BITMAP); | 1672 | version_bitmap = __bitmap_ptr(sbi, NAT_BITMAP); |
1677 | if (!version_bitmap) | 1673 | if (!version_bitmap) |
1678 | return -EFAULT; | 1674 | return -EFAULT; |
1679 | 1675 | ||
1680 | /* copy version bitmap */ | 1676 | nm_i->nat_bitmap = kmemdup(version_bitmap, nm_i->bitmap_size, |
1681 | memcpy(nm_i->nat_bitmap, version_bitmap, nm_i->bitmap_size); | 1677 | GFP_KERNEL); |
1678 | if (!nm_i->nat_bitmap) | ||
1679 | return -ENOMEM; | ||
1682 | return 0; | 1680 | return 0; |
1683 | } | 1681 | } |
1684 | 1682 | ||