Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45053603 authored by Mitsuo Hayasaka's avatar Mitsuo Hayasaka Committed by Ben Myers
Browse files

xfs: pass KM_SLEEP flag to kmem_realloc() in xlog_recover_add_to_cnt_trans() 



The kmem_realloc() in xfs is given KM_* memory allocation flags. And it
allocates memory using kmalloc() after they are converted to gfp_mask
flags. In xlog_recover_add_to_cont_trans(), 0u is passed to kmem_realloc(),
instead of them. I guess it is preferred to use them, and here memory must
be allocated but don't have to be done with GFP_ATOMIC. So, this patch
changes it to KM_SLEEP.

Signed-off-by: default avatarMitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
Cc: Ben Myers <bpm@sgi.com>
Cc: Alex Elder <elder@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 9b025eb3

fs/xfs/xfs_log_recover.c

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ xlog_recover_add_to_cont_trans( 
	old_ptr = item->ri_buf[item->ri_cnt-1].i_addr;

	old_len = item->ri_buf[item->ri_cnt-1].i_len;



	ptr = kmem_realloc(old_ptr, len+old_len, old_len, 0u);

	ptr = kmem_realloc(old_ptr, len+old_len, old_len, KM_SLEEP);

	memcpy(&ptr[old_len], dp, len); /* d, s, l */

	item->ri_buf[item->ri_cnt-1].i_len += len;

	item->ri_buf[item->ri_cnt-1].i_addr = ptr;