From patchwork Sat May 27 08:16:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9751659 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1592E60393 for ; Sat, 27 May 2017 08:17:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 069CE28455 for ; Sat, 27 May 2017 08:17:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFD0E28474; Sat, 27 May 2017 08:17:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D98328455 for ; Sat, 27 May 2017 08:17:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753909AbdE0IRS (ORCPT ); Sat, 27 May 2017 04:17:18 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:49386 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753845AbdE0IRR (ORCPT ); Sat, 27 May 2017 04:17:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=y4Vh6I9lVhvz0ncYgJQC08kj0m6IdUyoD5iRlopvhls=; b=twbc6hRtIR/95UzQci5uUlXJr aqN6P33JTk3Tta8JvrP2gAzEzv7qfQC4INx0sw/5lMEJk3QpfXc14d02fkj8E/xGaJMIZJjGnzUy4 etpSAnsEl6xHQA4sgUgsQcUKlgoAi9Sw+yL3ingvJxRi1gZ4ur337n49eTHFJR0uRCpld10rU9o4z 6S3c1/5wUdWJn4nAFb78v4KGCWpCWo8l/eAeTFjZR8CJHG2NiOsvcRKXrToHX8UUrB5U8cpWrqWeB SZVeNV3+JpdUqonC61S1MHm/DEVYqk/7EcuVNhf5ldFWfk044HKrdjyZqt/AGGBuriRsQ+hnx3sp3 fr9xaQRtw==; Received: from shol69.static.otenet.gr ([83.235.170.67] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dEWuR-0001a6-Ba; Sat, 27 May 2017 08:17:15 +0000 From: Christoph Hellwig To: Alexander Viro Cc: "J. Bruce Fields" , Jeff Layton , linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 04/10] fs: remove __do_readv_writev Date: Sat, 27 May 2017 11:16:48 +0300 Message-Id: <20170527081654.15957-5-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170527081654.15957-1-hch@lst.de> References: <20170527081654.15957-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-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Split it into one helper each for reads vs writes. Signed-off-by: Christoph Hellwig --- fs/read_write.c | 60 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 5cbdf23d924f..f453c9a485b9 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -916,8 +916,8 @@ ssize_t compat_rw_copy_check_uvector(int type, } #endif -static ssize_t __do_readv_writev(int type, struct file *file, - struct iov_iter *iter, loff_t *pos, int flags) +static ssize_t do_iter_read(struct file *file, struct iov_iter *iter, + loff_t *pos, int flags) { size_t tot_len; ssize_t ret = 0; @@ -925,29 +925,41 @@ static ssize_t __do_readv_writev(int type, struct file *file, tot_len = iov_iter_count(iter); if (!tot_len) goto out; - ret = rw_verify_area(type, file, pos, tot_len); + ret = rw_verify_area(READ, file, pos, tot_len); if (ret < 0) - goto out; - - if (type != READ) - file_start_write(file); + return ret; - if ((type == READ && file->f_op->read_iter) || - (type == WRITE && file->f_op->write_iter)) - ret = do_iter_readv_writev(file, iter, pos, type, flags); + if (file->f_op->read_iter) + ret = do_iter_readv_writev(file, iter, pos, READ, flags); else - ret = do_loop_readv_writev(file, iter, pos, type, flags); + ret = do_loop_readv_writev(file, iter, pos, READ, flags); +out: + if (ret >= 0) + fsnotify_access(file); + return ret; +} - if (type != READ) - file_end_write(file); +static ssize_t do_iter_write(struct file *file, struct iov_iter *iter, + loff_t *pos, int flags) +{ + size_t tot_len; + ssize_t ret = 0; -out: - if ((ret + (type == READ)) > 0) { - if (type == READ) - fsnotify_access(file); - else - fsnotify_modify(file); - } + tot_len = iov_iter_count(iter); + if (!tot_len) + return 0; + ret = rw_verify_area(WRITE, file, pos, tot_len); + if (ret < 0) + return ret; + + file_start_write(file); + if (file->f_op->write_iter) + ret = do_iter_readv_writev(file, iter, pos, WRITE, flags); + else + ret = do_loop_readv_writev(file, iter, pos, WRITE, flags); + file_end_write(file); + if (ret > 0) + fsnotify_modify(file); return ret; } @@ -968,7 +980,7 @@ ssize_t vfs_readv(struct file *file, const struct iovec __user *vec, if (ret < 0) return ret; - ret = __do_readv_writev(READ, file, &iter, pos, flags); + ret = do_iter_read(file, &iter, pos, flags); kfree(iov); return ret; } @@ -991,7 +1003,7 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec, if (ret < 0) return ret; - ret = __do_readv_writev(WRITE, file, &iter, pos, flags); + ret = do_iter_write(file, &iter, pos, flags); kfree(iov); return ret; } @@ -1161,7 +1173,7 @@ static size_t compat_readv(struct file *file, ret = compat_import_iovec(READ, vec, vlen, UIO_FASTIOV, &iov, &iter); if (ret < 0) goto out; - ret = __do_readv_writev(READ, file, &iter, pos, flags); + ret = do_iter_read(file, &iter, pos, flags); kfree(iov); out: if (ret > 0) @@ -1274,7 +1286,7 @@ static size_t compat_writev(struct file *file, ret = compat_import_iovec(WRITE, vec, vlen, UIO_FASTIOV, &iov, &iter); if (ret < 0) goto out; - ret = __do_readv_writev(WRITE, file, &iter, pos, flags); + ret = do_iter_write(file, &iter, pos, flags); kfree(iov); out: if (ret > 0)