From patchwork Wed May 31 07:50:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13261648 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 BE9A8C7EE24 for ; Wed, 31 May 2023 07:51:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58F726B0078; Wed, 31 May 2023 03:51:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 53FB26B007E; Wed, 31 May 2023 03:51:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 407FE6B0081; Wed, 31 May 2023 03:51:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3265B6B0078 for ; Wed, 31 May 2023 03:51:17 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1480D1C6F61 for ; Wed, 31 May 2023 07:51:17 +0000 (UTC) X-FDA: 80849779794.25.9A6AE4B Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf16.hostedemail.com (Postfix) with ESMTP id 68FC1180007 for ; Wed, 31 May 2023 07:51:15 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=aD7gWyr8; dmarc=none; spf=none (imf16.hostedemail.com: domain of BATV+b81a8c9a6d22e8bb2302+7220+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+b81a8c9a6d22e8bb2302+7220+infradead.org+hch@bombadil.srs.infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685519475; 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=aL4JtBxyhKSUIoIs8zshulNYsaa+7wvzZcQ7A9usZGk=; b=mu6ZSdp+rATynO8gXyBkmQUdOGn+29auUZ5AX97k57UkoQoIZLUhptA2oGchtZe7jU842f NWZIAgMnfIiaai/3o46K0OU9jPjsgIpQl6GxX1H26T6lo812glU5RnfyrbhZD7OB/Iwdzd 01kzO9kUJb0COSnhiIlodvaaxAWu6+w= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=aD7gWyr8; dmarc=none; spf=none (imf16.hostedemail.com: domain of BATV+b81a8c9a6d22e8bb2302+7220+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+b81a8c9a6d22e8bb2302+7220+infradead.org+hch@bombadil.srs.infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685519475; a=rsa-sha256; cv=none; b=Dh1nFv7HjMgbqOabvedOGVAHqWq1OFOaKtCen4FyjE0ctpagI3ebLkqMWqwfeCctupSPMq TZf0wwQ8zDUFYY5uErZzCXK13PClH1jKnZnD6lXmV7kBbRy5nAy0YBwUarlDDLyKOB85gv smCUfjvFD1M+3S/7EBn0v/SejMxAs/g= 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=aL4JtBxyhKSUIoIs8zshulNYsaa+7wvzZcQ7A9usZGk=; b=aD7gWyr8b1clmJUz0ng4wh8iN1 2pIdPjbYXIRRh1Kmmhvr9XUZfJmEzYUSG9MpfRaqOXtpIf81N0C4KW91kRTVNx/1xjofKh6ID5fEZ y0kgxzCPuOAOcRvxjkI+DhSzh8PYwGOXVEdzJScdskD02HMegMKHsJzKs791UpMHizTDm3fmN//tX 6rl5sT9sqqCp86Mfokmpj/WL2CP1OSYP66n1f8RX2gICxutiEFyhwPyN+TIwbF9/1JsQcegS+vv7u 4nIF9K3m4qzWLhU31xzEOyoJGgpwCjxO0CBkTrYH/d1JRTGC4jWZ7AwjftTuF3pr+nYL1/XFGg0kY tKlqRbMg==; Received: from [2001:4bb8:182:6d06:f5c3:53d7:b5aa:b6a7] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1q4Gbi-00GW03-0R; Wed, 31 May 2023 07:50: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, cluster-devel@redhat.com, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, Hannes Reinecke , Miklos Szeredi Subject: [PATCH 11/12] fuse: drop redundant arguments to fuse_perform_write Date: Wed, 31 May 2023 09:50:25 +0200 Message-Id: <20230531075026.480237-12-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531075026.480237-1-hch@lst.de> References: <20230531075026.480237-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-Rspamd-Queue-Id: 68FC1180007 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: wb1wfh4oirzw9gouyar6oxg4sdbq1nnn X-HE-Tag: 1685519475-892764 X-HE-Meta: U2FsdGVkX1/mChL/ozOOQyVtiRUoLibAfuk1IHC7u618UgRVYdTf36Wgf7PFxFxS7woZaR6nrShJeKKdXQAuNBt4fhXbyKjOML3ohNDqkevNIHd4P7WX5wEL0rd3w37jz6Uk6YMuztpUfBiv0AyUluodS4wvW/RKFyKCjy0UiW8fxHhrLanHzT9bBTgyvJ37jFvnB1610XhkU+WDBw8pa7vY83oGqq+CkI+zJSr3zolYYKjhwQ4D0fHC3atr791ya1HcN/oLYRVwwmu2h2CxK3VkKcQMcnCWyA7uWOhanrRXf3APKJ5+xFYWLb3skgT+DLRjeJUkUwna/TRPkDxhxyCuW87vovqF8r5K3WnQIBScT/Bnk5ZSukjWcLpOPnJRJLPJCNavpoorwUrfgCKSLnlwBEPtVZeBhXmx81Jd7PGaea4qtfOfRwsVh1IQhkFl283UCajP0aNeChDARexEnaV1fcHmb0Aa1MZ5SPeyE2xP4s96n8dMxkHZmbhBG8IyvnAS/gXnhJIKfG2kKrn5q0T1Puwu63iqQawJF8W2cfflX/gzjRq9Vl+l5x8IrnPhElQD310+tut0sfajejw/G4F1DXcZXogho6QJBzpVk+rIP5Zv2iO/n5yedWH3WRDGgxUKHnNLGsN3vJdtHnaS7EHf4XRNst3nP95tTXA67JPBlXfgaPxXz/DTxxCS/O9d98IN3Vdi4CEBsFoRKzrPN7PGCAh95abJT3TqR/LcvsnPjKgA5ecQ28/XqTT/48yExYAm3AXxZAIPL0Aot3qBVGhjd3YK7eYJm1AHi+T6aue1TskgsY2pwQMpOP+9KxGYMU4yh4bTa5EPVVPwavjPNnc9zsP44yVrOjHMmHSEv9jJr5nw0WNvAxNmka6Q2Ts/jo241lZxo4NP6i1SK63mUT/XZn6YImgapUKOio/38uBIeITFb6uxeJa/DkfTFxlT9lBpY8tAj99tnXq/tZ4 MQCYxLyz 3B7IaVQdbC0mFvzH814W4546/dhSFkfltemkMZGaJoyjBDX8SSUJHSociM22CH/5TtzvRjI4Epqx+RYViYjlpT6PLIXFCLLHYhSXCPrSh5EDP1fpfH1x/hzgRwzAzemVnUUsWdSeMHnehtEGe4o6RHXugTPknLPEnCr49exrh9lKlhb3zhq0nIEZxNZ2tyWCfRRhXl7fhtAFy5lRa/vqMTUgClojZbwz0uozuU8JutgeSMBdng9wU+10rOK4JPSOukSakeP5Namfm7IU4s9aM3+D976ocwlr3Z9e9wJSJJnNyvCerljGjR4LNNGCQMJcnOtEdSkBnsca7YeVHW9b0ukNC3ADqgC7UjFhPwDp7p6eVcN3TVA06zGXN9SjRKx17kOEjzXZdclMB3NVkwcGymr/bDbwzCWEvd+vI/B3XVnFLnsm1oVPKk2sK6xDu7Yj0H+kUjj1GieCseA4NDScu6Z2DXRYnTrajNzauIafa+HujRR6ZLiqP7iV/lsdGMXfRiON/5NE8EKwXMo9igJDJPdtVZP6MSSLB+QW/ 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 Reviewed-by: Hannes Reinecke Acked-by: Miklos Szeredi --- 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 e60e48bf392d49..025973ad813e05 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; @@ -1383,8 +1383,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; @@ -1403,7 +1402,7 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) written += written_buffered; } else { - written = fuse_perform_write(iocb, mapping, from, iocb->ki_pos); + written = fuse_perform_write(iocb, from); } out: inode_unlock(inode);