ocfs2: Use kmemdup rather than duplicating its implementation
PATCH 1/1 ocfs2: Use kmemdup rather than duplicating its implementation
Use kmemdup rather than duplicating its implementation
The semantic patch that makes this change is available in scripts/coccinelle/api/memdup.cocci.
Signed-off-by Thomas Meyer <[email protected]>
---
fs/ocfs2/localalloc.c 2011-11-08 10:34:40.993095086 +0100 renamed from fs/ocfs2/localalloc.c 2011-11-07 19:38:23.787162856 +0100 +2 -4
@@ -434,12 +434,11 @@ void ocfs2_shutdown_local_alloc(struct o bh = osb->local_alloc_bh; alloc = (struct ocfs2_dinode *) bh->b_data; - alloc_copy = kmalloc(bh->b_size, GFP_NOFS); + alloc_copy = kmemdup(alloc, bh->b_size, GFP_NOFS); if (!alloc_copy) { status = -ENOMEM; goto out_commit; } - memcpy(alloc_copy, alloc, bh->b_size); status = ocfs2_journal_access_di(handle, INODE_CACHE(local_alloc_inode), bh, OCFS2_JOURNAL_ACCESS_WRITE);
@@ -1249,13 +1248,12 @@ static int ocfs2_local_alloc_slide_windo * local alloc shutdown won't try to double free main bitmap * bits. Make a copy so the sync function knows which bits to * free. */ - alloc_copy = kmalloc(osb->local_alloc_bh->b_size, GFP_NOFS); + alloc_copy = kmemdup(alloc, osb->local_alloc_bh->b_size, GFP_NOFS); if (!alloc_copy) { status = -ENOMEM; mlog_errno(status); goto bail; } - memcpy(alloc_copy, alloc, osb->local_alloc_bh->b_size); status = ocfs2_journal_access_di(handle, INODE_CACHE(local_alloc_inode),