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 34D82C77B73 for ; Mon, 22 May 2023 06:50:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2671900003; Mon, 22 May 2023 02:50:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D69C900002; Mon, 22 May 2023 02:50:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C69C900003; Mon, 22 May 2023 02:50:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 793D8900002 for ; Mon, 22 May 2023 02:50:10 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6E4861A029E for ; Mon, 22 May 2023 06:50:09 +0000 (UTC) X-FDA: 80816966538.07.8BEC66C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 768352000C for ; Mon, 22 May 2023 06:50:07 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VPWN+RJT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf03.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684738207; 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=WPmCmuYomWuJ+5LnnTa+OzAzhut1gbOGrEeSAMZunF8=; b=g1lxVky3vJriZ6XTEmNZF2BA89D/ocDpVpyCw8m+JHmUe2YKp0djgGl86XPajANPi3EC6D iJHLbaNSWGou8wUe0PsB107O7i4FVnPNHPnAhllLHaJ88kYln+6NW+7Sr0v+4IDfWJkhVi nvcozRtxqHfxfVYfHscYEpA9IjtOnQY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VPWN+RJT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf03.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684738207; a=rsa-sha256; cv=none; b=ESrFXSSAl6T6PLWY3WKZggWNVe66SwyZ6UnPdFpMWmXBI8UIRz0I6nTkNK4enhi6d6j0Al MkQPrQC5Xyub2C+iq/COgFo36/0dOde4WeGnK++fPatgT4mwXCMqZKt/7Ayx8vRKgmhuqr mU8dW1Qz+KvxMGtJqtDCkMKwmQcXTcQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684738206; 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=WPmCmuYomWuJ+5LnnTa+OzAzhut1gbOGrEeSAMZunF8=; b=VPWN+RJTT0u5G3YhqHIs5bDv6Py8R1kyX5Mqv0UFRMuQWDj/Ne4h8dQ0dHEa0+MgJJ2F06 uQHFHKOxB/QRlrRl/gtiXIEhLXTHzpUGI0QoR/1chIRkIobgqVechgTynXYqyMiJw/GFQe pIbuw1mfqueD/a0kwpNgBkBqzrNQ+68= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-308-o3bjNUnbPDuBiGmpC7NUHw-1; Mon, 22 May 2023 02:50:03 -0400 X-MC-Unique: o3bjNUnbPDuBiGmpC7NUHw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5281C3828894; Mon, 22 May 2023 06:50:02 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.192.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58B271121315; Mon, 22 May 2023 06:49:59 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <376ab23b-52d0-d7fd-2dd9-414cbb474e01@linux.alibaba.com> References: <376ab23b-52d0-d7fd-2dd9-414cbb474e01@linux.alibaba.com> <20230520000049.2226926-1-dhowells@redhat.com> <20230520000049.2226926-23-dhowells@redhat.com> To: Joseph Qi Cc: dhowells@redhat.com, Jens Axboe , Al Viro , Christoph Hellwig , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Christian Brauner , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , Mark Fasheh , Joel Becker , ocfs2-devel@oss.oracle.com Subject: Re: [PATCH v21 22/30] ocfs2: Provide a splice-read stub MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <2414054.1684738198.1@warthog.procyon.org.uk> Content-Transfer-Encoding: quoted-printable Date: Mon, 22 May 2023 07:49:58 +0100 Message-ID: <2414055.1684738198@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Rspamd-Queue-Id: 768352000C X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: pgby7tjium18m4ezpsrmdft3kpmxqp5g X-HE-Tag: 1684738207-156004 X-HE-Meta: U2FsdGVkX18G8/8MKMaI7zV1QSOW8CCoRmuSsuEuL5psfNblkSgdsM2G0w4wL39PeVBLRRl2faT1eszzjVXrcodVr+gYbOIhuEnHvZ7ch67ZxT/3FxuCDz4kWILceed1FZsvvsiPEj5jvkj4xTLYivrK3lPNpSLHEIGIv8BbueM1vCGhAGZd06exSH+kIRVxgsuqNmlHKTEAmj9XV6OZdZbkMPCeo4iTXOtcZ517TMJOnMt7zK0oAPlC4Yko75FoGzlJJDk45FRyAvFuBXAvVeBg0qw3lIGz6qZPimK+zTQxDrPoQ2xXW/0A9TfxO+mZnozM1FxEnBog4dBXvfEO7kMEZORUJ06MZ5f4G5kYLBMEdSrZwP6p+zGvyYrubdMf/0CEEdDvptqGn2HPIiWKqhs5M34s/ZlI/80Nmcyen/LN5xhXJbfmQ93eL/+a9fytfbfAFebjboKFJfeNcd+hPNKgjqXbRPDGHzxzVjDBSc8P72Y/qbOXgoMKpc+/82Bqu1SwHOi8321VXi0W5JDtCdKMqgCcR+8EnwUklyldAS3naN66806GP90QXP+OE7Jm7vu2esN/ur94cR/Asy7Ykp76+sACPp8VS9h1Dqea3mV9LKfFv3xud1BMp1LEohQi3zn0gx9f98zw/WW6P4eKWcTaQuE9ACh26CPBYOL2b/8Kl3xsjQxGJBwTsPpMvex3jIy6j7E17bNYsFtnyGRlGHOx/FJzz7yEOOjrS+HcodNAw3EHX3QEc9gx72PLDZHCzbu7UJten27PRGhue5QXgSPKFZwHI4IdbXD+YPN+RbmWKOU5vI+pAjB9V+IRaccGeUB1OnvFdFX80nhtlu3CY8Y7x8c0g9rFELf+xPYgqyeDPxYyDOee3FvtVLAYwll6IjrDS7S3v0yYpImBA2A4bg3ixgBzg64vYVIriGyYiHeTlb4u+WwZoAb+g78/5VKjgtMfBiWLIHm90gM4dWN Nbl/EDcD eJ0QlE19lIUOYjUetWvuMLpvPD4GK0rq9D9HeS5CsuQxGDz5lotgL5tGQ3mOObtpu3zIvyYGRQMtNoyjMo59ql17BIGtaobWHzmVFcqGSTU+VoDl97HypxUvTp4L1JEGXcqv8GeCeUyFLUac0lrKEAMDMw4cc3tpLoGyV 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: So something like the attached changes? Any suggestions as to how to impr= ove the comments? David --- diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index f7e00b5689d5..86add13b5f23 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2552,7 +2552,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *io= cb, * * Take and drop the meta data lock to update inode fields * like i_size. This allows the checks down below - * generic_file_read_iter() a chance of actually working. + * copy_splice_read() a chance of actually working. */ ret =3D ocfs2_inode_lock_atime(inode, filp->f_path.mnt, &lock_level, !nowait); @@ -2593,7 +2593,7 @@ static ssize_t ocfs2_file_splice_read(struct file *i= n, loff_t *ppos, (unsigned long long)OCFS2_I(inode)->ip_blkno, in->f_path.dentry->d_name.len, in->f_path.dentry->d_name.name, - 0); + flags); = /* * We're fine letting folks race truncates and extending writes with @@ -2601,10 +2601,10 @@ static ssize_t ocfs2_file_splice_read(struct file = *in, loff_t *ppos, * rw_lock during read. * * Take and drop the meta data lock to update inode fields like i_size. - * This allows the checks down below generic_file_splice_read() a - * chance of actually working. + * This allows the checks down below filemap_splice_read() a chance of + * actually working. */ - ret =3D ocfs2_inode_lock_atime(inode, in->f_path.mnt, &lock_level, true)= ; + ret =3D ocfs2_inode_lock_atime(inode, in->f_path.mnt, &lock_level, 1); if (ret < 0) { if (ret !=3D -EAGAIN) mlog_errno(ret);