From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sagi Grimberg Subject: Re: [PATCH 3/3] target: use vfs_bvec_read/write Date: Sun, 18 Jan 2015 17:37:41 +0200 Message-ID: <54BBD345.7070103@dev.mellanox.co.il> References: <1421593624-4462-1-git-send-email-hch@lst.de> <1421593624-4462-4-git-send-email-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: Jens Axboe , Nicholas Bellinger , Ming Lei , linux-fsdevel@vger.kernel.org, target-devel@vger.kernel.org To: Christoph Hellwig , Al Viro Return-path: Received: from mail-we0-f172.google.com ([74.125.82.172]:56971 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751597AbbARPhq (ORCPT ); Sun, 18 Jan 2015 10:37:46 -0500 Received: by mail-we0-f172.google.com with SMTP id k11so27470813wes.3 for ; Sun, 18 Jan 2015 07:37:45 -0800 (PST) In-Reply-To: <1421593624-4462-4-git-send-email-hch@lst.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On 1/18/2015 5:07 PM, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig > --- > drivers/target/target_core_file.c | 29 ++++++++++++----------------- > 1 file changed, 12 insertions(+), 17 deletions(-) > > diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c > index d836de2..63ca7d5 100644 > --- a/drivers/target/target_core_file.c > +++ b/drivers/target/target_core_file.c > @@ -331,36 +331,31 @@ static int fd_do_rw(struct se_cmd *cmd, struct scatterlist *sgl, > struct fd_dev *dev = FD_DEV(se_dev); > struct file *fd = dev->fd_file; > struct scatterlist *sg; > - struct iovec *iov; > - mm_segment_t old_fs; > + struct bio_vec *bvec; > + ssize_t len = 0; > loff_t pos = (cmd->t_task_lba * se_dev->dev_attrib.block_size); > int ret = 0, i; > > - iov = kzalloc(sizeof(struct iovec) * sgl_nents, GFP_KERNEL); > - if (!iov) { > + bvec = kzalloc(sizeof(struct bio_vec) * sgl_nents, GFP_KERNEL); > + if (!bvec) { Can you make that kcalloc so checkpatch would be happy? Otherwise, Looks good to me. Reviewed-by: Sagi Grimberg > pr_err("Unable to allocate fd_do_readv iov[]\n"); > return -ENOMEM; > } > > for_each_sg(sgl, sg, sgl_nents, i) { > - iov[i].iov_len = sg->length; > - iov[i].iov_base = kmap(sg_page(sg)) + sg->offset; > - } > + bvec[i].bv_page = sg_page(sg); > + bvec[i].bv_len = sg->length; > + bvec[i].bv_offset = sg->offset; > > - old_fs = get_fs(); > - set_fs(get_ds()); > + len += sg->length; > + } > > if (is_write) > - ret = vfs_writev(fd, &iov[0], sgl_nents, &pos); > + ret = vfs_bvec_write(fd, bvec, sgl_nents, len, &pos); > else > - ret = vfs_readv(fd, &iov[0], sgl_nents, &pos); > - > - set_fs(old_fs); > - > - for_each_sg(sgl, sg, sgl_nents, i) > - kunmap(sg_page(sg)); > + ret = vfs_bvec_read(fd, bvec, sgl_nents, len, &pos); > > - kfree(iov); > + kfree(bvec); > > if (is_write) { > if (ret < 0 || ret != cmd->data_length) { >