From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751963AbdH3PAp (ORCPT ); Wed, 30 Aug 2017 11:00:45 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:54221 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751377AbdH3PAm (ORCPT ); Wed, 30 Aug 2017 11:00:42 -0400 From: Christoph Hellwig To: viro@zeniv.linux.org.uk Cc: arve@android.com, riandrews@android.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/16] btrfs: switch write_buf to kernel_write Date: Wed, 30 Aug 2017 17:00:01 +0200 Message-Id: <20170830150007.3953-11-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170830150007.3953-1-hch@lst.de> References: <20170830150007.3953-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of playing with the addressing limits. Signed-off-by: Christoph Hellwig --- fs/btrfs/send.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index b082210df9c8..24b989fd130c 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -539,33 +539,23 @@ static struct btrfs_path *alloc_path_for_send(void) static int write_buf(struct file *filp, const void *buf, u32 len, loff_t *off) { int ret; - mm_segment_t old_fs; u32 pos = 0; - old_fs = get_fs(); - set_fs(KERNEL_DS); - while (pos < len) { - ret = vfs_write(filp, (__force const char __user *)buf + pos, - len - pos, off); + ret = kernel_write(filp, buf + pos, len - pos, off); /* TODO handle that correctly */ /*if (ret == -ERESTARTSYS) { continue; }*/ if (ret < 0) - goto out; + return ret; if (ret == 0) { - ret = -EIO; - goto out; + return -EIO; } pos += ret; } - ret = 0; - -out: - set_fs(old_fs); - return ret; + return 0; } static int tlv_put(struct send_ctx *sctx, u16 attr, const void *data, int len) -- 2.11.0