From patchwork Mon Apr 24 05:49:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13221658 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 D5900C7EE2F for ; Mon, 24 Apr 2023 05:49:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4BFF26B007D; Mon, 24 Apr 2023 01:49:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 448C56B007E; Mon, 24 Apr 2023 01:49:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EC1A6B0080; Mon, 24 Apr 2023 01:49:56 -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 218876B007D for ; Mon, 24 Apr 2023 01:49:56 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6BFFF40134 for ; Mon, 24 Apr 2023 05:49:55 +0000 (UTC) X-FDA: 80715208350.26.3AB4892 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf22.hostedemail.com (Postfix) with ESMTP id C8EE1C000B for ; Mon, 24 Apr 2023 05:49:53 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=cM1FMSAw; spf=none (imf22.hostedemail.com: domain of BATV+e16e2fc4419b117693a1+7183+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+e16e2fc4419b117693a1+7183+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=1682315393; 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=3c56lCE/WpWmApGzGmNY2gwMFr2O/06RZiXwIkvRQAA=; b=R9hlsxQ6wmnX8Qtiml01JgNpJ6JM9aRb08fln/x9j6RwQ1JKYkgqr/XbIM+F2QLkqLcpoV 4QqfVIbN6bjYkDVGBOtMFnAhEyxPrVzSkFdtEc1QwaVR3Z0rGWC5g4fxQNenW3JOy3f+tl W/vQI6iImFyrG2EujMKcza9OLD6LD0Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682315393; a=rsa-sha256; cv=none; b=noTEX3C0br7XFovdfqtb9t9ROiSD0dJMp5dKFl/oiep+cg1A27YLRC2XlIFcg6bTNM5YgA 06wS+hJqjvCTUXRjd0yiX+QdNoxTUoIW+Zdbn6TRpMkKJPJ70EDfhI3Yy3W5tViIkshkUA sExrAzGDfuhBKtFe0LxtVD8Ocw3p3TE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=cM1FMSAw; spf=none (imf22.hostedemail.com: domain of BATV+e16e2fc4419b117693a1+7183+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+e16e2fc4419b117693a1+7183+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=3c56lCE/WpWmApGzGmNY2gwMFr2O/06RZiXwIkvRQAA=; b=cM1FMSAwc/AcWY9+ks8bZeTOQS HSRE1wj1RmlIHQ8bv8JqINzDuFQyl7YsoQO9Evk1tQKaU3yYt2c2UI9Wkit37h631rokvkd0z9B2l VVR+BaKxya/38EoJ2UI+TEap1+Ose9SVw/y8UrqGFhmlrsWIquEeWKjrX32vtILQS5aSgVf0A0uaL Ujm1de5SPOrTuaN6+/YdmMaLU7F/3TLvzgdhR5BVXO6OzWn5yVlHyHDIyq0elCmeLixuuC8FOmM6S Qn7nRM49zrqQDcjoKZ3gEI5dasf5T027NjT8LyJlv76Nt62r/CuI41r9aJ9HgIGXVKNKJ2N8Fjal6 Pdgu78vg==; Received: from [2001:4bb8:189:a74f:e8a5:5f73:6d2:23b8] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pqp57-00FOvQ-0r; Mon, 24 Apr 2023 05:49:45 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Miklos Szeredi , "Darrick J. Wong" , Andrew Morton , David Howells , Matthew Wilcox , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, ceph-devel@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, linux-kernel@vger.kernel.org Subject: [PATCH 05/17] filemap: update ki_pos in generic_perform_write Date: Mon, 24 Apr 2023 07:49:14 +0200 Message-Id: <20230424054926.26927-6-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230424054926.26927-1-hch@lst.de> References: <20230424054926.26927-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-Rspam-User: X-Rspamd-Queue-Id: C8EE1C000B X-Rspamd-Server: rspam09 X-Stat-Signature: ydutypst9zcydfc6gsg653b1jm57yyp8 X-HE-Tag: 1682315393-206191 X-HE-Meta: U2FsdGVkX1/RjidNNJNV9jb10KZ2K8wW5a4T1Tl7pWZfF4Et5VxEcSAG3w4sbG1BYNaNk07W787hYXjq1G0jwY6owO+y3vlA+VjkDvGUST853b8P5QvJFwxTVmuGAW47yCUZdmjY+cXUn5RW/5rujFwB1osVYbNewlTo5nt/3kLYHOEzW+nYjsJFYWs87OFOxYsLPYoBi2AR0VO6xt/3Rx2Axx7m5CzOL9Ur6OzjXnhNguWR8t7GvkoMI7VMpdgJ4RLWS3ACy0khVe87jFqB5Lw4APBGg4xHdbSsW/a5iW0asGbLyZqs+AEB1F8D369YrfU3THmVuzRdeHkuVnmplWyrz76GmP4b+YKs9G8YP6t/TNPFumdqoQq/USH3Hi9nRiirRmuPbVyYauokRtuSyU+T7zTIRHN8Ltf6gj4W2Q9L+SjLLpud+xH8DP+ACvy2+jXxphPys4WF8Sjtkov59o3HZsdCpUcqZ+v69HJwBEd8UYya3rI6AlxumnweRSH+8WrV9n+DUdHnat/fDXQIdTNLjTOea84+wVPUsYAwLbYgY953zzaNpiK1e70z2Df5M9d7NKRMd+jPUAPnWCmtMmJ2WK0MvurixqyaE+g9fK6oUrdiFB5FVAOt84SpFrxXn7QqIlj5dAFu7DF9FypNqTBD5JqJka4udslcEsQeDObBPUGno3FTyOTRJjSmsrY6BeynUgVH0U4CKXIImZ46XUQ0unQ08MBxTsTHVpy3oNJ3s8d7XkG3NvSkeVXBxGm5ktARTdxRGrUCazWtTVqmscHihAvDc4ljJyUzCvQ/HeIuAEahaWs513JkICpGUr44JITnZGQVu0cI47onb+YV4WQMSrgjTSTg5EOkY5oEJHJ2wuci0gGVIl5JqRQV3HCMJ1ddRlTE/beEHQuUJk/QzbMXS+DEc1UMw1RLL+JJiYj208zlR0TwtjIeDA7UEK07rj1E58I8BNyGCQoW6+k Y+zRwThs 7V/wKutEF4SXdgvEp6l/QJmqiNh92YOiKpxFkOP4i/e14Jax6azfNISXTlnhZvpbPplcNDFds4Uo2DZmwUV2CWChObgeXhmMIgH6aab7xhdCuDVUZsqy0Eann/9rTkIDbI36vtmG48jljrZGw0qnD9XMiBNK/o15YlC4fU4WIcp/OM7g1RRWc2/AIHmnXwSyjkU2noGULSYuvsBTLSFwQUQIYhnoC6bgmeu0IOG+grcTPQJSNKENHpDd1qeex1OJoiyfni0BJJ4mZDcrSGjvzLVuZU3noaHWNk75lewO/1g8QGXTkSBuG75OS1NtJvs+mrfpicMaidm3jxaT8Ddnuh4HKbkWxVeCFmZXRDUTaful8UTvYIQi2t0X0KdtO0fcQjkMSG58uAriM8rljWEt2oOb7wX3pOAwEulB1V/WTxggSQDwa4UDnpRCzbahgdvdZG5/oLVTAR96EfEU= 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: All callers of generic_perform_write need to updated ki_pos, move it into common code. Signed-off-by: Christoph Hellwig --- fs/ceph/file.c | 2 -- fs/ext4/file.c | 9 +++------ fs/f2fs/file.c | 1 - fs/nfs/file.c | 1 - mm/filemap.c | 8 ++++---- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index f4d8bf7dec88a8..feeb9882ef635a 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1894,8 +1894,6 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) * can not run at the same time */ written = generic_perform_write(iocb, from); - if (likely(written >= 0)) - iocb->ki_pos = pos + written; ceph_end_io_write(inode); } diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 0b8b4499e5ca18..1026acaf1235a0 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -291,12 +291,9 @@ static ssize_t ext4_buffered_write_iter(struct kiocb *iocb, out: inode_unlock(inode); - if (likely(ret > 0)) { - iocb->ki_pos += ret; - ret = generic_write_sync(iocb, ret); - } - - return ret; + if (unlikely(ret <= 0)) + return ret; + return generic_write_sync(iocb, ret); } static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index f4ab23efcf85f8..5a9ae054b6da7d 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4511,7 +4511,6 @@ static ssize_t f2fs_buffered_write_iter(struct kiocb *iocb, current->backing_dev_info = NULL; if (ret > 0) { - iocb->ki_pos += ret; f2fs_update_iostat(F2FS_I_SB(inode), inode, APP_BUFFERED_IO, ret); } diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 893625eacab9fa..abdae2b29369be 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -666,7 +666,6 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) goto out; written = result; - iocb->ki_pos += written; nfs_add_stats(inode, NFSIOS_NORMALWRITTENBYTES, written); if (mntflags & NFS_MOUNT_WRITE_EAGER) { diff --git a/mm/filemap.c b/mm/filemap.c index 2723104cc06a12..0110bde3708b3f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3960,7 +3960,10 @@ ssize_t generic_perform_write(struct kiocb *iocb, struct iov_iter *i) balance_dirty_pages_ratelimited(mapping); } while (iov_iter_count(i)); - return written ? written : status; + if (!written) + return status; + iocb->ki_pos += written; + return written; } EXPORT_SYMBOL(generic_perform_write); @@ -4039,7 +4042,6 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from) endbyte = pos + status - 1; err = filemap_write_and_wait_range(mapping, pos, endbyte); if (err == 0) { - iocb->ki_pos = endbyte + 1; written += status; invalidate_mapping_pages(mapping, pos >> PAGE_SHIFT, @@ -4052,8 +4054,6 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from) } } else { written = generic_perform_write(iocb, from); - if (likely(written > 0)) - iocb->ki_pos += written; } out: current->backing_dev_info = NULL;