From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 65/75] cxgbi: convert to SKB paged frag API. Date: Fri, 19 Aug 2011 14:27:37 +0100 Message-ID: <1313760467-8598-65-git-send-email-ian.campbell@citrix.com> References: <1313760393.5010.356.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain Cc: linux-kernel@vger.kernel.org, Ian Campbell , "James E.J. Bottomley" , "David S. Miller" , Mike Christie , James Bottomley , Karen Xie , linux-scsi@vger.kernel.org To: netdev@vger.kernel.org Return-path: In-Reply-To: <1313760393.5010.356.camel@zakaz.uk.xensource.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Signed-off-by: Ian Campbell Cc: "James E.J. Bottomley" Cc: "David S. Miller" Cc: Mike Christie Cc: James Bottomley Cc: Karen Xie Cc: linux-scsi@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/scsi/cxgbi/libcxgbi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c index 77ac217..0debb06 100644 --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c @@ -1812,7 +1812,7 @@ static int sgl_read_to_frags(struct scatterlist *sg, unsigned int sgoffset, } copy = min(datalen, sglen); - if (i && page == frags[i - 1].page && + if (i && page == skb_frag_page(&frags[i - 1]) && sgoffset + sg->offset == frags[i - 1].page_offset + frags[i - 1].size) { frags[i - 1].size += copy; @@ -1948,7 +1948,7 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset, /* data fits in the skb's headroom */ for (i = 0; i < tdata->nr_frags; i++, frag++) { - char *src = kmap_atomic(frag->page, + char *src = kmap_atomic(skb_frag_page(frag), KM_SOFTIRQ0); memcpy(dst, src+frag->page_offset, frag->size); @@ -1963,7 +1963,7 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset, } else { /* data fit into frag_list */ for (i = 0; i < tdata->nr_frags; i++) - get_page(tdata->frags[i].page); + __skb_frag_ref(&tdata->frags[i]); memcpy(skb_shinfo(skb)->frags, tdata->frags, sizeof(skb_frag_t) * tdata->nr_frags); -- 1.7.2.5