From patchwork Fri May 19 09:35:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13248029 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BBCEC77B75 for ; Fri, 19 May 2023 09:36:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D06AD28000B; Fri, 19 May 2023 05:36:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C9438280001; Fri, 19 May 2023 05:36:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE47628000B; Fri, 19 May 2023 05:36:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 925F7280001 for ; Fri, 19 May 2023 05:36:20 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5D2F9AE4E3 for ; Fri, 19 May 2023 09:36:20 +0000 (UTC) X-FDA: 80806498920.14.35D5043 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf24.hostedemail.com (Postfix) with ESMTP id 9D48918001B for ; Fri, 19 May 2023 09:36:17 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=lQYT2kwa; spf=none (imf24.hostedemail.com: domain of BATV+aecf67361b95543ec79f+7208+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+aecf67361b95543ec79f+7208+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684488977; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=STVg9hQSNCoHnaWP+j57/x1LHg0FYksrLdPn28xq/k4=; b=uiD8NVJJBNzv2+7DcthS+mnxZe2A6Unc0pzI3LacM+arLeo83yvQzJ2ih/IKCHdtTA7J+D u/iMRXm/TZ+ReAhnJJuS9jQMN7ZYKrpdZgSjxVJ2a8QrkF9QmsOYONTPmYwTkFGuXh0xi9 d+kjQEOO1MmcXxLHNR0vr2TSQlIFJOc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684488977; a=rsa-sha256; cv=none; b=qmRsTfhR4+spinqyHqHLrsgLSBzwdAcR4y9VLjS85q5n53ta2YQ5zOlXcxt6DkYTtQEIS+ LoQFXI9iJCnjFEcwrm3IQQM/pFXXJfFIlviN+YlfjYXRbolR4PYMSiDVli94JrK2Unv3dy qCpYtjveYuIHaoJt/i8RRBhlG19Dd48= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=lQYT2kwa; spf=none (imf24.hostedemail.com: domain of BATV+aecf67361b95543ec79f+7208+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+aecf67361b95543ec79f+7208+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=STVg9hQSNCoHnaWP+j57/x1LHg0FYksrLdPn28xq/k4=; b=lQYT2kwaUEtArFfEb79xA//fBJ qogp7VjnGEoqLT6bjXgEup01sK0KL/4RiA1Fe8gDUeej2m9QIQCe2S/3Jocd+N+cdKp668C9VvAeW phbQS3w1Z6z10f/6yehWWZEY+S9fYiGxT0TfhkNTWvUDWB9iDdV0uv+kx5oc3HcI/0ayvEc19i8ma zliWUfhpNpatxjBI+G08zM6lhwpCdNsKd9r0pUWyuMh5c22vx8ahQkEsYV+AjmSNW3RXuG4Ue3k+H sTtOSNleeSciqjt1JlkB9rX6zj9iM4pWW19+tNfp7ueTD0W+O2LSYhMGFcK+0P4fgPFc3EgSG2rLh YUxjFJXg==; Received: from [2001:4bb8:188:3dd5:e8d0:68bb:e5be:210a] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pzwWk-00Fjjz-1H; Fri, 19 May 2023 09:35:58 +0000 From: Christoph Hellwig To: Matthew Wilcox Cc: Jens Axboe , Xiubo Li , Ilya Dryomov , Alexander Viro , Christian Brauner , "Theodore Ts'o" , Jaegeuk Kim , Chao Yu , Miklos Szeredi , Andreas Gruenbacher , "Darrick J. Wong" , Trond Myklebust , Anna Schumaker , Damien Le Moal , Andrew Morton , linux-block@vger.kernel.org, ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net (open list:F2FS FILE SYSTEM), cluster-devel@redhat.com, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 12/13] fuse: drop redundant arguments to fuse_perform_write Date: Fri, 19 May 2023 11:35:20 +0200 Message-Id: <20230519093521.133226-13-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230519093521.133226-1-hch@lst.de> References: <20230519093521.133226-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Stat-Signature: mqqgyomihh3ospf6hy3kki5tzosswnga X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 9D48918001B X-Rspam-User: X-HE-Tag: 1684488977-671929 X-HE-Meta: U2FsdGVkX1+sHPEnuW7W6VktgW61UYyrqf00RU0yZ0+4gW14gopNwYY/PrqJ25bNvSun0h7XHTktxtvnZbTcKjCz4hsfcfqWpXTbFyD/wfo0LkLpFBqsJMudGqFzviLMD4camZRtxwRs7mlBRCVnQ2TroPWJiLeEttmBfqLZ60hObo3eJhYYZJXkFpMJn0WWZi8OBi1muGmakj2ZuTP2XFKftFzxJVLfCi2uQr/SkwL4lFMC1Lf/KNWqzglswvBg8tphmcnuB82uBB8V/d+20wazSg+r1p5kxpmW9KAAjII5RSfWN2wCr36abZ33oCgL2bV+LWAUhos0bNJXSude/k+pf19/TdRhu2LMYT9jy6wD3n8NAF+r5PjZ6zcmBja6BBRPMM7rDl8cW81shT8pdgHhButSgARfvvWSD0lbRxbCaOnw1k1P5CoeJKglTT0ZlK3KNbSLPoVx2o1wqB9ZL7GMjwsf+pHUMq7FKMR+n0oCE2sqnSPZ1FFFa9E98nTrSi+/bxjTvJCndUFCEj9tHHDVD2310tl4khx0WWZrj+oYBNmNR61wrmMnH9VwnLUq2i7Wcu/Plspj06lo09a6Kb7Pcaq11pMi1YHQHSk8rI3MDcmBBTbUii/Asn3d5Ym4rmU/TNIfhQr+w30vFXQHr9C+NM8FYA1WiOaL4ye4LvMTlJAJRNlDKQKK0csBycRIN4vW+7464GbOs8RvWvtRcvj6JEdMeAwKTM3dWG952FTBiC85SIT/5aRzIt5wzHKbALWdGnDaujiYz1D+tg2/8NSz5IKHKcKPImLRmsL8UB2f6QzNljxIMLNRJtxHt5YIc4iMqZepvyFbwcmjFrvWztaPYUBIIuM+nuKvXF/APWkgZUNw5vAumhDE/CWBltrUZtaqnP8+vXnCIW2UuJnLQPnsKhRCCjItCiwnyr61UXImKjo2BPvsdB7IGlGdMxPlZsz9Msyq30365gJF0EI IdDe8ZED lmCkhkC8nUTCpQyBvq0mmgauptY6GqsQyD0mMlytVk9mML4AIF+JtaJW/caUIXAEzcGWC5zrd871BtssbcIKPSth9HNN228rGK+gJJmLVVTHAU0PjxZQ3lHLBqqpqRdC8cSt8OnYt1chGXFRQp2knKVjLmNJA6rC8/RqD42bh1RZQfS/f4BOoUG9c/r4QMHOcK7tlPkbbwQhVmnN7nUuW4Ft8lTPr6CwVURlOfmAZh4iSBmzGmbuYCBa6qKEZ9+wKxRI9R7SZsh/Kz7tIGFu2KHo52LnJaJv01nOuHJEN18h420qQT/iBU+FthDrUXzKDxTyXzHmiUqbApy1wtOHxvma5ePNDlT0kyHi20r6H9evry7L3pQ/n5hXZtsLPvd6m5vuUp/V4+555kcu+DFJ+bTVXoZ1rfpqtS4kGe3GZuJ5sN40Tw1x1wBMccpohowepPcRUyG8a45iQuhgr4qzYaoqUAw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: pos is always equal to iocb->ki_pos, and mapping is always equal to iocb->ki_filp->f_mapping. Signed-off-by: Christoph Hellwig Reviewed-by: Damien Le Moal --- fs/fuse/file.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index fd2f27f2144750..5f7b58798f99fc 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1280,13 +1280,13 @@ static inline unsigned int fuse_wr_pages(loff_t pos, size_t len, max_pages); } -static ssize_t fuse_perform_write(struct kiocb *iocb, - struct address_space *mapping, - struct iov_iter *ii, loff_t pos) +static ssize_t fuse_perform_write(struct kiocb *iocb, struct iov_iter *ii) { + struct address_space *mapping = iocb->ki_filp->f_mapping; struct inode *inode = mapping->host; struct fuse_conn *fc = get_fuse_conn(inode); struct fuse_inode *fi = get_fuse_inode(inode); + loff_t pos = iocb->ki_pos; int err = 0; ssize_t res = 0; @@ -1385,8 +1385,7 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) if (written < 0 || !iov_iter_count(from)) goto out; - written_buffered = fuse_perform_write(iocb, mapping, from, - iocb->ki_pos); + written_buffered = fuse_perform_write(iocb, from); if (written_buffered < 0) { err = written_buffered; goto out; @@ -1406,7 +1405,7 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) written += written_buffered; iocb->ki_pos += written_buffered; } else { - written = fuse_perform_write(iocb, mapping, from, iocb->ki_pos); + written = fuse_perform_write(iocb, from); } out: current->backing_dev_info = NULL;