ocfs2: Cocci spatch "memdup.spatch"
PATCH 1/1 ocfs2: Cocci spatch "memdup.spatch"
Signed-off-by Thomas Meyer <[email protected]>
---
fs/ocfs2/localalloc.c +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 );
@@ -1244,13 +1243,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),
Acked-by Joel Becker <[email protected]>
Quoted 43 lines · Thomas Meyer
Signed-off-by Thomas Meyer <[email protected]>---
diff -u -p
a/fs/ocfs2/localalloc.cb/fs/ocfs2/localalloc.cfs/ocfs2/localalloc.c +2
-5@@ -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 );@@ -1244,13 +1243,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), --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/