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 1C155C77B7A for ; Thu, 25 May 2023 16:03:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 01A156B0074; Thu, 25 May 2023 12:03:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE5D16B0075; Thu, 25 May 2023 12:03:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D85D5900002; Thu, 25 May 2023 12:03:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C66306B0074 for ; Thu, 25 May 2023 12:03:33 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9D736140D9F for ; Thu, 25 May 2023 16:03:32 +0000 (UTC) X-FDA: 80829247464.23.433558A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id D68291A0110 for ; Thu, 25 May 2023 16:02:53 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WNYhwdjT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of agruenba@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=agruenba@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685030575; 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=WiRt50oXKhasmrzR2kh6FHaULiNwoG0spSQORGoTHTA=; b=V8KMOLFp7WRy+s71lBhCQ5XvvkTAyAqd0Q7gzeRnZE2JAuSb2MIDA0F4v2wz7uW2tybMO1 ZyOhI1AUpkFwl5HQqLquBieXmOKmQtWsNve3Vg48ENc13D//+MXbk9JAFbUsxtL9F6IbHI UFrkdB3eDdkqtzG7ZYbiWIJDqdAGmXI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WNYhwdjT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of agruenba@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=agruenba@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685030575; a=rsa-sha256; cv=none; b=6f50LmPEgMFX45ng4EARFMBta+mzX//1ibtdPrIF1afWb+Rx2VxsP/zz6tFYAcng9myVzo H0zik8wa6rkcvPOhHU2g0KPLZku/gQN1oPDGGEV54pL4EoidtDQjygVPXexqAcuzxFGG86 Pt0C3oLhifhwNQop0HBky5boDsQpRmc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685030572; 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=WiRt50oXKhasmrzR2kh6FHaULiNwoG0spSQORGoTHTA=; b=WNYhwdjTeOYsSg1WqmAqLbtvBkqyA1fjxWwNqF1oMMDUvPNQ/OybetPHAO+MNiC4fw5blv JvdY1QWhnVKgzpLAXeeI37HK0m6aJQ5nri2uyg2704j3GvwyPNhNlSu7ehb+raz6RK6nir MKQ9Ne6XGE3vq4Nz8zUiqFPRKnXz5zI= Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-I_Qyz-z8PtShvnXtc9DqTA-1; Thu, 25 May 2023 12:02:51 -0400 X-MC-Unique: I_Qyz-z8PtShvnXtc9DqTA-1 Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-5340957a1f1so1099787a12.1 for ; Thu, 25 May 2023 09:02:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685030570; x=1687622570; 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=WiRt50oXKhasmrzR2kh6FHaULiNwoG0spSQORGoTHTA=; b=EBaxJGy+jT58HSLKdn8TB7j3sWsF/M2rGLMgvP60xqHkvtYkfJ9Fw/U1VRkbpt1PzX G/+WFy7/Sj1BiXr7Ed6+VkF44M4pS6zJe+tegaO2K0CzLVcqX8aExovjDty9B3bi3u87 NrkUUD0OWp0l2MlzZdKCqr3BBMCCZPT9SbuRA8WJapuTSzDSmVFLQQvT4qYt1GGIRwl8 Kzt7bDokYls0k56PHQt20Cv2cBucJ2LvfKksOacqgXiKhISRCH8DQHcQV+sq98N4zWN+ fqJ3TDsAJOsCrYS4iUc7bnjiAtNV78pmiQfiDlwiTjIGYDhzO/rtF0kPGirWRz//x3DF YPMg== X-Gm-Message-State: AC+VfDw3bMEBbxAgl5SYb7FS3cDT+mheCKJgNLYnWC4Oi8hrhudOq5z2 4kifj9rtHreByU8avMrYcFzWibw3dEJSBbfLoaHhdS3A93oTKolta+3hvjRwvLoBG5XR9ZeI0Zz R9v9bs8EdhIbtRgsLMKYIJ47Xm3A= X-Received: by 2002:a17:902:f54c:b0:1af:f64c:f363 with SMTP id h12-20020a170902f54c00b001aff64cf363mr3052091plf.15.1685030569955; Thu, 25 May 2023 09:02:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6IxaSUVZPKltFK7HOITIsIRGnmd5NzIdTwh6dJNU2vgkdbKhe1zl+1aodXLLyyl7kcWSFpgVAL2XCU4JAoynY= X-Received: by 2002:a17:902:f54c:b0:1af:f64c:f363 with SMTP id h12-20020a170902f54c00b001aff64cf363mr3052030plf.15.1685030569588; Thu, 25 May 2023 09:02:49 -0700 (PDT) MIME-Version: 1.0 References: <20230524063810.1595778-1-hch@lst.de> <20230524063810.1595778-8-hch@lst.de> In-Reply-To: <20230524063810.1595778-8-hch@lst.de> From: Andreas Gruenbacher Date: Thu, 25 May 2023 18:02:37 +0200 Message-ID: Subject: Re: [PATCH 07/11] iomap: update ki_pos in iomap_file_buffered_write To: Christoph Hellwig Cc: Matthew Wilcox , Jens Axboe , Xiubo Li , Ilya Dryomov , Alexander Viro , Christian Brauner , "Theodore Ts'o" , Jaegeuk Kim , Chao Yu , Miklos Szeredi , "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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: D68291A0110 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: rqy3pmigwyoqdhwpb8g9gnenfq79xf13 X-HE-Tag: 1685030573-345153 X-HE-Meta: U2FsdGVkX1+z+W1eg0/bVEUpDR2A178Eu7ivKeggTxlD1teLsetnj+KQFXL5XBQFcIGHWyyF3sVjOaHApHt36N6+mjitPcAkv2hf6icEISYZYPl322o4DZhJ89GGCyjcxvfCpqEX0S5bdvWNrlopdOCixo3Ru7fizmTQ8apoqOlrbsDp+fwoo4MTRKBtG68j31jXR82y5djQsfj3LPGfe8h+Ze9RCmQuu8cp3dqM0gKgP7jzNLUfqk/dfEQjwOWSJboIDheM5DzhKXjbK4aPDrxUXfwRGoMsBZ/SRFVyetbvT+n5rf0o4s4u0r7o8LqrkPKolzosX6udyQKgWckMCQ3BOFgyq0hH+qOmYeBd+Zn1ELQGEt6B8A6QmzG6J1MBRtfgtZm43mVax6J7Lvqu5oyWDJvhuy6CgfNJKgu/pKYMJFO3Iw5+6MQfwo2eWCyXy6kD57eJan9UJXtcquNbjmu53kVS3qarM+/dDMA3cB5WzNEx4gqjj+SbDRKXgY0wOzpewx+LR4RA+x0H9DGOL/w7Mi1HYYrmZL8lTE7/nDsDwx8ZP9Yt2+1csgpEeyfkl5nRX9BbB0ZDWfTSP1Hq+ZYpBPnWi3AQrOSXPdu4JMvKoAXJ/bCTvdD8dJLy12FY0HEvy8lnbBsx5pRqlmr9PYqdvYxc0lO3Z5hXj5YdRM5WWnhfd1SSc0rischG5uSO+uVQaxcfzfShjvOj2C2OskpqHy231/lQG4LoBDbndjCOo8GTnI2JYzX50kOunL1wo27xpnQQWofcbXISbvoZQsxzOPL/k9kWnPvjsIVMYh14k8WcqaMKzE4c3pKpqPdiF+z0/FB4uO1vWPJWp5KSGNnPPadbIOhzVIYlXUTzn8xCSXgL0G1Bd4XBKegKv9WGYhnIAQeXPsJ7hSQygzz1vkOKCfo9tI5YGX1S6FASbbWbToZiA2M9I634bNUHXqoc/gXo/tw+8hwDidS3ubG wR9I13Ht S+7SLq0XKUYlkjgtHBHAbuI1S4BGnXWWrqWt3VPT2X87Tg4EyM8OmF66ZcP5mgkI5UYaz+ulgC210qu/LNUl7qHO4vQGdfnsJsj0dkW0NyDWr5wA4gjMODFxN4DIjbgXEtIH1iKLAbsrhc9E/ywl8/kHQt9hipFV7qN5AfCh4iEmulpOJmMkGJwtb3diPoqy+5tPGCtDxkSDOZqJXcMUPoZISr8JlkU1W2lT54FmXbBJpjHeWNLz5dZabxlexl/W7TViS9G8EjIlpvhivNjEKv7xBy+LVY+jqXpedDZo21KULJg42/BwRZvJFULG+X8PFdurUDgkc21oQh6ua0YZ4oiQKeXn3NU6x3if+XY4GsVx5ThQr3zdedtwYPA== 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 Wed, May 24, 2023 at 8:54=E2=80=AFAM Christoph Hellwig wrot= e: > All callers of iomap_file_buffered_write need to updated ki_pos, move it > into common code. Thanks for this set of cleanups, especially for the patch killing current->backing_dev_info. Reviewed-by: Andreas Gruenbacher > Signed-off-by: Christoph Hellwig > Acked-by: Damien Le Moal > Reviewed-by: Darrick J. Wong > --- > fs/gfs2/file.c | 4 +--- > fs/iomap/buffered-io.c | 9 ++++++--- > fs/xfs/xfs_file.c | 2 -- > fs/zonefs/file.c | 4 +--- > 4 files changed, 8 insertions(+), 11 deletions(-) > > diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c > index 904a0d6ac1a1a9..c6a7555d5ad8bb 100644 > --- a/fs/gfs2/file.c > +++ b/fs/gfs2/file.c > @@ -1044,10 +1044,8 @@ static ssize_t gfs2_file_buffered_write(struct kio= cb *iocb, > pagefault_disable(); > ret =3D iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); > pagefault_enable(); > - if (ret > 0) { > - iocb->ki_pos +=3D ret; > + if (ret > 0) > written +=3D ret; > - } > > if (inode =3D=3D sdp->sd_rindex) > gfs2_glock_dq_uninit(statfs_gh); > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 063133ec77f49e..550525a525c45c 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -864,16 +864,19 @@ iomap_file_buffered_write(struct kiocb *iocb, struc= t iov_iter *i, > .len =3D iov_iter_count(i), > .flags =3D IOMAP_WRITE, > }; > - int ret; > + ssize_t ret; > > if (iocb->ki_flags & IOCB_NOWAIT) > iter.flags |=3D IOMAP_NOWAIT; > > while ((ret =3D iomap_iter(&iter, ops)) > 0) > iter.processed =3D iomap_write_iter(&iter, i); > - if (iter.pos =3D=3D iocb->ki_pos) > + > + if (unlikely(ret < 0)) > return ret; > - return iter.pos - iocb->ki_pos; > + ret =3D iter.pos - iocb->ki_pos; > + iocb->ki_pos +=3D ret; > + return ret; > } > EXPORT_SYMBOL_GPL(iomap_file_buffered_write); > > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index 431c3fd0e2b598..d57443db633637 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -720,8 +720,6 @@ xfs_file_buffered_write( > trace_xfs_file_buffered_write(iocb, from); > ret =3D iomap_file_buffered_write(iocb, from, > &xfs_buffered_write_iomap_ops); > - if (likely(ret >=3D 0)) > - iocb->ki_pos +=3D ret; > > /* > * If we hit a space limit, try to free up some lingering preallo= cated > diff --git a/fs/zonefs/file.c b/fs/zonefs/file.c > index 132f01d3461f14..e212d0636f848e 100644 > --- a/fs/zonefs/file.c > +++ b/fs/zonefs/file.c > @@ -643,9 +643,7 @@ static ssize_t zonefs_file_buffered_write(struct kioc= b *iocb, > goto inode_unlock; > > ret =3D iomap_file_buffered_write(iocb, from, &zonefs_write_iomap= _ops); > - if (ret > 0) > - iocb->ki_pos +=3D ret; > - else if (ret =3D=3D -EIO) > + if (ret =3D=3D -EIO) > zonefs_io_error(inode, true); > > inode_unlock: > -- > 2.39.2 >