Re: [PATCH] target: use offset_in_page macro

[Johannes Thumshirn]

On Wed, 2015-11-25 at 21:49 +0800, Geliang Tang wrote:
> Use offset_in_page macro instead of (addr & ~PAGE_MASK).
> 
> Signed-off-by: Geliang Tang <geliangtang@xxxxxxx>
> ---
> Âdrivers/target/target_core_user.c | 2 +-
> Âdrivers/target/tcm_fc/tfc_io.cÂÂÂÂ| 8 ++++----
> Â2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/target/target_core_user.c
> b/drivers/target/target_core_user.c
> index 937cebf..d5477c0 100644
> --- a/drivers/target/target_core_user.c
> +++ b/drivers/target/target_core_user.c
> @@ -194,7 +194,7 @@ static struct tcmu_cmd *tcmu_alloc_cmd(struct se_cmd
> *se_cmd)
> Â
> Âstatic inline void tcmu_flush_dcache_range(void *vaddr, size_t size)
> Â{
> -	unsigned long offset = (unsigned long) vaddr & ~PAGE_MASK;
> +	unsigned long offset = offset_in_page(vaddr);
> Â
> Â	size = round_up(size+offset, PAGE_SIZE);
> Â	vaddr -= offset;
> diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
> index 847c1aa..6f7c65a 100644
> --- a/drivers/target/tcm_fc/tfc_io.c
> +++ b/drivers/target/tcm_fc/tfc_io.c
> @@ -154,9 +154,9 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
> Â			BUG_ON(!page);
> Â			from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
> Â			page_addr = from;
> -			from += mem_off & ~PAGE_MASK;
> +			from += offset_in_page(mem_off);
> Â			tlen = min(tlen, (size_t)(PAGE_SIZE -
> -						(mem_off & ~PAGE_MASK)));
> +						offset_in_page(mem_off)));
> Â			memcpy(to, from, tlen);
> Â			kunmap_atomic(page_addr);
> Â			to += tlen;
> @@ -314,9 +314,9 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct
> fc_frame *fp)
> Â
> Â		to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
> Â		page_addr = to;
> -		to += mem_off & ~PAGE_MASK;
> +		to += offset_in_page(mem_off);
> Â		tlen = min(tlen, (size_t)(PAGE_SIZE -
> -					ÂÂ(mem_off & ~PAGE_MASK)));
> +					ÂÂoffset_in_page(mem_off)));
> Â		memcpy(to, from, tlen);
> Â		kunmap_atomic(page_addr);
> Â

Reviewed-by: Johannes Thumshirn <jthumshirn@xxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/