From mboxrd@z Thu Jan 1 00:00:00 1970 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 B4D78C77B61 for ; Mon, 24 Apr 2023 18:55:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D1856B007D; Mon, 24 Apr 2023 14:55:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4330E6B007E; Mon, 24 Apr 2023 14:55:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D3E06B0080; Mon, 24 Apr 2023 14:55:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1E2706B007D for ; Mon, 24 Apr 2023 14:55:14 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D7936A030A for ; Mon, 24 Apr 2023 18:55:13 +0000 (UTC) X-FDA: 80717187306.07.A86FFEC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 841BB1A0006 for ; Mon, 24 Apr 2023 18:55:11 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eXIuqQc4; spf=pass (imf19.hostedemail.com: domain of agruenba@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682362511; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cC2m6cj4by0ic+ocHcPEbRFoxwEEiKQQoS0Ge1Avf1U=; b=nOT7swegux0MTzrvCkkM72cHTFaH82sZ7tbrOBdy2rTTwThhKbhSqZU6cxkoj7Qod38K2u 1UvAH05MjFyJriWKx2pf6XqOuVmghqYB70bMXdMK/1M+P3ujHEE+DvTxiRgTxCrJULP29c 1TgEQLYYXY1B2qaENm6KSr2C9dcNDjg= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eXIuqQc4; spf=pass (imf19.hostedemail.com: domain of agruenba@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682362511; a=rsa-sha256; cv=none; b=uImzPGJhOqn0vLLCk4HPZlMjM1D1rcGl2qcARZMZaGm972gPwGnvBVSmmnNYRAViUo3OCg 38Les2pBpVRrCndCUmD4Pn/CdrykQ73L6C/t4DHJFzfKqH8nYyvKyytQrJjUvjtyj6D/RS uwcilmz/kfNhiHwu+AfP+SmRS984CCo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682362510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cC2m6cj4by0ic+ocHcPEbRFoxwEEiKQQoS0Ge1Avf1U=; b=eXIuqQc4jpMTnNotakUfcHMztDE4KLaz+C/f3E7nq8gpq7tXM6Kw4EA6Me/EkDAkJJIQnN qAMKzVP5W9+nbepdk5/F0vLUjyHtQbuMPsezR8igLkV3bKred+r+4AITu5C6e5mepa/C6T pL9uSixeh59GSC5r4bbxWQBcT+7PFSg= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-557-RTTi_XCvPH-f5FlpmnOy1w-1; Mon, 24 Apr 2023 14:55:09 -0400 X-MC-Unique: RTTi_XCvPH-f5FlpmnOy1w-1 Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-24b6a888085so3451285a91.0 for ; Mon, 24 Apr 2023 11:55:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682362508; x=1684954508; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cC2m6cj4by0ic+ocHcPEbRFoxwEEiKQQoS0Ge1Avf1U=; b=XnyFlsI+wNLYJ7bVFAW1CyokHLAWutejwcjahZeIHADIt8rl61hFaybc+gS18HWdHI FteA9kypTBml54KG7L+mnk3TIXpmv6VafI4k8kIaN0jd3XyVzcShgnEvULcrx19+RJrS vOYFTBM9QlfJrOF9YgZESoJzFhhb2oA39XOHo7Uhw0MZgIxs0wQ5HPdZsWYhiNbC3ZLe Wz5HAKPnEx2hTeUM2Cf7W1chqwIa1EgLDlG61Z4N81hpMQkzJbc65DjjPKrVJ4xvZq7d dKQP3Wm5fESmG0ppUUTRnt1iLmk0YyQOgt4LqD61wn+FUsmnJJVHQpI0x2au0zxv0lBj Rk1A== X-Gm-Message-State: AAQBX9d14HfPtXYfUzW+nA1XJ1prUGSOS/+yu+q/OwUpx8vPDeiJAw/J Go/VmhDaGMNu6qIO5czcyf2ZL8oZFZKHr22c1j8CpKs4N0ZCAYv8NRg7TS3ZVas4Bfp54xAPMVA UYCNtNkPls9xhEjvpe+6h+QOwcFA= X-Received: by 2002:a17:90b:3a8d:b0:23e:f855:79ed with SMTP id om13-20020a17090b3a8d00b0023ef85579edmr14646838pjb.28.1682362508598; Mon, 24 Apr 2023 11:55:08 -0700 (PDT) X-Google-Smtp-Source: AKy350bw6UUmfa7x2kgzI/S3M36kQcMIx/LORGs9afdrTUJulizrDq8UK+lWvA5A9k5nXONeKEERR5M4Fbn0vBOkkLM= X-Received: by 2002:a17:90b:3a8d:b0:23e:f855:79ed with SMTP id om13-20020a17090b3a8d00b0023ef85579edmr14646811pjb.28.1682362508271; Mon, 24 Apr 2023 11:55:08 -0700 (PDT) MIME-Version: 1.0 References: <20230424054926.26927-1-hch@lst.de> <20230424054926.26927-6-hch@lst.de> In-Reply-To: <20230424054926.26927-6-hch@lst.de> From: Andreas Gruenbacher Date: Mon, 24 Apr 2023 20:54:56 +0200 Message-ID: Subject: Re: [Cluster-devel] [PATCH 05/17] filemap: update ki_pos in generic_perform_write To: Christoph Hellwig Cc: Jens Axboe , linux-block@vger.kernel.org, linux-nfs@vger.kernel.org, cluster-devel@redhat.com, linux-xfs@vger.kernel.org, Miklos Szeredi , "Darrick J. Wong" , linux-kernel@vger.kernel.org, Matthew Wilcox , linux-f2fs-devel@lists.sourceforge.net, David Howells , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Andrew Morton , linux-ext4@vger.kernel.org, ceph-devel@vger.kernel.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 841BB1A0006 X-Stat-Signature: k31pnne7ipsdwzcgg5st7jh3pwyy6uw3 X-HE-Tag: 1682362511-858344 X-HE-Meta: U2FsdGVkX1+ywzXVcxuszrrdD15KBC8H2pIsGJF68mrUPNFcX0yE6dY0YYhLNdUU2+GEmhmZMq0bvvwbqSb1KAch8Oy5AwR04IKiFHTEQQC6JRBEn1JBzN54bhvX3aYTFUY6CKYDsJtIFrh+F9K+zeoncqS4PzXLwPhPR8TXp5WlRdlaf2NqVQUH7oa63iMlPs/a4BZ3Aed7l+8JmsxdRVq1/k3lwD9zmC44UKWHDWgBsE+bkuZNae9t4sxga5VoLHjPzpFtpK1JsaAqB7vT3/TFjzbr2w3IUKP4Ix1zJSPhRNPVc4sEr9FVCajUfzHVSxPMds9Y5jb6aqvS3Un8qT3DKK8JFPRKCDdLCPMqRsjq9om1zok+BPI1+zlMtPKwBNsbmN0e+CtfY1vjU6tA45rmeowtY8KYwwnDBnjqC3eDrkgtT30e280CTiLaPgZV69MiEZREfoPRL/alm6QBAm2FtQBK4wRtUautE7CmpLOKFl9oRajy1f6pysyLCzImj6cYjqCoyPk2u5uPiXFSldppZDt05y7N9MQch88fCpMgiQAkogjF7QNi4Cjx32s8GkkTwGy3jCnHOEyiUNRkRwrMP5MbsuP4m1plFCydo4OfnxqoZWNbJkuTSb2KoEkuCG8Zk2ikTdJXWElSzUDaDuGl/AeK32ADjWegCXuvDgUMYx3Oys+w+Ebz82ZXguDFlGjK1H6HQt7oa+/7W6twqeh1M55GBtgjYY0P8AMA4tfRU8OkAEEGldobMZU0sfBhUBh3Vp74YtgitlSMKc54t9D9D2mnuL3P4ZbQd+DuruiU9i8Bx28JUl3IYwJ2wIOFbTngiFbKkMK7+j5h/yrrhPWi3bI3HOhsMz6gEUP55O2aETP6Y/Iy924Dz728qdmBlQfcVyZOOSsvs27xqWFY+mygRx3gqZ7/snVP2iTYpSGtVqQZNWZrolz9hdHEn/h1Z6dmDQQ9TKl8t11PLlk MfLI6rwn 1QibZrYXAmV7aDBHvD7Kocweah9gTCjl3CdMwMh99uM0No8f2mCD91Zwc7R/tE1+r2qheF4kQuWoNFgSb0ckRHp52QaEwDllSvi2FsmtnxFfNq7lMWPQYUs0wJhV510MKZBN92WW/3ca38v/ZSYK502Jt04Vfd7/yjEJKyXAPe3iy8GZGKpVPpmgm3TNVlBQenn5DggU0/PbKpuve3LEeoxCV/G4WmrvUVp1AdndiJGzjO6eo56iyNSJ+K4drKZVrSjJAd3z1jtRzSW4u5At2Kdabfyr2bTFbSWDp5gAt2Pcj0No= 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: On Mon, Apr 24, 2023 at 8:22=E2=80=AFAM Christoph Hellwig wrot= e: > All callers of generic_perform_write need to updated ki_pos, move it into > common code. We've actually got a similar situation with iomap_file_buffered_write() and its callers. Would it make sense to fix that up as well? > 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 =3D generic_perform_write(iocb, from); > - if (likely(written >=3D 0)) > - iocb->ki_pos =3D 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 +=3D ret; > - ret =3D generic_write_sync(iocb, ret); > - } > - > - return ret; > + if (unlikely(ret <=3D 0)) > + return ret; > + return generic_write_sync(iocb, ret); > } > > static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t o= ffset, > 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 kioc= b *iocb, > current->backing_dev_info =3D NULL; > > if (ret > 0) { > - iocb->ki_pos +=3D 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 =3D result; > - iocb->ki_pos +=3D 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 +=3D written; Could be turned into: iocb->ki_pos =3D pos; > + return written; > } > EXPORT_SYMBOL(generic_perform_write); > > @@ -4039,7 +4042,6 @@ ssize_t __generic_file_write_iter(struct kiocb *ioc= b, struct iov_iter *from) > endbyte =3D pos + status - 1; > err =3D filemap_write_and_wait_range(mapping, pos, endbyt= e); > if (err =3D=3D 0) { > - iocb->ki_pos =3D endbyte + 1; > written +=3D status; > invalidate_mapping_pages(mapping, > pos >> PAGE_SHIFT, > @@ -4052,8 +4054,6 @@ ssize_t __generic_file_write_iter(struct kiocb *ioc= b, struct iov_iter *from) > } > } else { > written =3D generic_perform_write(iocb, from); > - if (likely(written > 0)) > - iocb->ki_pos +=3D written; > } > out: > current->backing_dev_info =3D NULL; > -- > 2.39.2 > Thanks, Andreas