Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760300Ab2BJWSs (ORCPT ); Fri, 10 Feb 2012 17:18:48 -0500 Received: from mail.linux-iscsi.org ([67.23.28.174]:58327 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753226Ab2BJWSq (ORCPT ); Fri, 10 Feb 2012 17:18:46 -0500 Subject: Re: [PATCH 25/60] target: remove the second argument of k[un]map_atomic() From: "Nicholas A. Bellinger" To: Cong Wang Cc: linux-kernel@vger.kernel.org, Andrew Morton , Andy Grover , Christoph Hellwig , Kiran Patil , Jiri Kosina , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org In-Reply-To: <1328852421-19678-26-git-send-email-amwang@redhat.com> References: <1328852421-19678-1-git-send-email-amwang@redhat.com> <1328852421-19678-26-git-send-email-amwang@redhat.com> Content-Type: text/plain; charset="UTF-8" Date: Fri, 10 Feb 2012 14:18:43 -0800 Message-ID: <1328912323.9333.92.camel@haakon2.linux-iscsi.org> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2706 Lines: 81 On Fri, 2012-02-10 at 13:39 +0800, Cong Wang wrote: > Signed-off-by: Cong Wang > --- > drivers/target/target_core_transport.c | 4 ++-- > drivers/target/tcm_fc/tfc_io.c | 10 ++++------ > 2 files changed, 6 insertions(+), 8 deletions(-) > Hi Cong, This looks fine to me, I assume you'll push this upstream..? Acked-by: Nicholas Bellinger > diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c > index 58cea07..58c12d7 100644 > --- a/drivers/target/target_core_transport.c > +++ b/drivers/target/target_core_transport.c > @@ -2344,7 +2344,7 @@ static void transport_xor_callback(struct se_cmd *cmd) > > offset = 0; > for_each_sg(cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, count) { > - addr = kmap_atomic(sg_page(sg), KM_USER0); > + addr = kmap_atomic(sg_page(sg)); > if (!addr) > goto out; > > @@ -2352,7 +2352,7 @@ static void transport_xor_callback(struct se_cmd *cmd) > *(addr + sg->offset + i) ^= *(buf + offset + i); > > offset += sg->length; > - kunmap_atomic(addr, KM_USER0); > + kunmap_atomic(addr); > } > > out: > diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c > index d8cabc2..2b693ee 100644 > --- a/drivers/target/tcm_fc/tfc_io.c > +++ b/drivers/target/tcm_fc/tfc_io.c > @@ -146,14 +146,13 @@ int ft_queue_data_in(struct se_cmd *se_cmd) > PAGE_SIZE << compound_order(page); > } else { > BUG_ON(!page); > - from = kmap_atomic(page + (mem_off >> PAGE_SHIFT), > - KM_SOFTIRQ0); > + from = kmap_atomic(page + (mem_off >> PAGE_SHIFT)); > page_addr = from; > from += mem_off & ~PAGE_MASK; > tlen = min(tlen, (size_t)(PAGE_SIZE - > (mem_off & ~PAGE_MASK))); > memcpy(to, from, tlen); > - kunmap_atomic(page_addr, KM_SOFTIRQ0); > + kunmap_atomic(page_addr); > to += tlen; > } > > @@ -291,14 +290,13 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp) > > tlen = min(mem_len, frame_len); > > - to = kmap_atomic(page + (mem_off >> PAGE_SHIFT), > - KM_SOFTIRQ0); > + to = kmap_atomic(page + (mem_off >> PAGE_SHIFT)); > page_addr = to; > to += mem_off & ~PAGE_MASK; > tlen = min(tlen, (size_t)(PAGE_SIZE - > (mem_off & ~PAGE_MASK))); > memcpy(to, from, tlen); > - kunmap_atomic(page_addr, KM_SOFTIRQ0); > + kunmap_atomic(page_addr); > > from += tlen; > frame_len -= tlen; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/