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 5B6CCC77B75 for ; Mon, 22 May 2023 06:55:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF664900004; Mon, 22 May 2023 02:55:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DA509900002; Mon, 22 May 2023 02:55:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C9393900004; Mon, 22 May 2023 02:55:03 -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 BA6FB900002 for ; Mon, 22 May 2023 02:55:03 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 95CDB1C773B for ; Mon, 22 May 2023 06:55:03 +0000 (UTC) X-FDA: 80816978886.14.5DF15C7 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by imf06.hostedemail.com (Postfix) with ESMTP id BAE3A180002 for ; Mon, 22 May 2023 06:55:00 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf06.hostedemail.com: domain of joseph.qi@linux.alibaba.com designates 115.124.30.98 as permitted sender) smtp.mailfrom=joseph.qi@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684738502; 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; bh=b10nFJUe2PxmZbANLD5sS6brYaYP2px5ZFFm4OINHJo=; b=Ptdr7hwmf1K9oouhIRYme6Ye34gPvBOi7vCQ/5D8YG7I1PyzUF9FXyPx21G2R9+hU3G14U gYsc4ICkJe6og9t5Vx1IiCvC6iB3iU+V7Qkd/viSTFek9rmg9jldfrEJRhC/mBxIBpGtS+ /kfhT+UiIwbWuekANvwDY0LM4hW3l4k= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf06.hostedemail.com: domain of joseph.qi@linux.alibaba.com designates 115.124.30.98 as permitted sender) smtp.mailfrom=joseph.qi@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684738502; a=rsa-sha256; cv=none; b=Yfhcekk/v+VsinkOeokKGwCd4XRvQCEtE+DPDTr9QypCFEAQoZyo/RcE1lpggRz3SOv2z5 iQK3T2IoP/SR0X2WOtbJXOhrBlXni+gcYxe72+vJF8RZGA1FScQgDngdWO6Q4TPAj1+Bhk iOmciMnfjZU7Am4I1ehAO31oPtW9+KI= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=joseph.qi@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0Vj99.vZ_1684738493; Received: from 30.221.132.35(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0Vj99.vZ_1684738493) by smtp.aliyun-inc.com; Mon, 22 May 2023 14:54:55 +0800 Message-ID: <9059d4e5-3813-b84c-b0d6-ecfd9a1c5570@linux.alibaba.com> Date: Mon, 22 May 2023 14:54:53 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v21 22/30] ocfs2: Provide a splice-read stub Content-Language: en-US To: David Howells Cc: 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 References: <376ab23b-52d0-d7fd-2dd9-414cbb474e01@linux.alibaba.com> <20230520000049.2226926-1-dhowells@redhat.com> <20230520000049.2226926-23-dhowells@redhat.com> <2414055.1684738198@warthog.procyon.org.uk> From: Joseph Qi In-Reply-To: <2414055.1684738198@warthog.procyon.org.uk> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: BAE3A180002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: fma4im46qsrs6powdw1mn5n8ym9orjfs X-HE-Tag: 1684738500-877897 X-HE-Meta: U2FsdGVkX18KY4DARTpcFM6MivZRiIguNKIgM9SX1vE/6e8usKJMEn10up6R9XujhRE/4N+SLMJ+GSXFAKbA8PwLtTuPrli75KkXvPIXRK8CMauhNxHTOq0i1/G2todpwK7RI6K157xG3WGlU44FhXy47yUfHIGmTmjW0qokOAFYrZRpCTKeskUfI/u4sG9/YneM4Pwmk8h0ghqcrjcLZsJ9ynQKwtf5/sXId+WZBs+tawIr8OmRJdD/k7ivokSeAUSM5RNPkbKacr1lJoSCsz/1iRkkWISUHu9zFyXA/XRcQucmv/gx/gt8aol2PwJHhoo+oeg930okmvU55ZkD8lZ/jKEBBqtU2kE511+cahGsZHH5Z2PcME6Fw1LNpjcPpUIkWqvYuy1QP2KR1y21vtVXKaButUFT02upuSd7forsLq3UpSPCRNLXVHiCx/ymdl3bYyMmlzlwqi3/WBKS9pwvR0tpGSMLk1t8xG4PyE1Sgh1bryw5PllgPxbb/8nqiLLviqYWCiIi3bDjUgIewM4qk81BhznqSOYTcOOM6oqgdsKIgEPyo5SqetTi6w7DjnFlxnhyziON99e4xraLHuVIP1cozH+Y3Qp0RrPKJt1miOX11qO+fZx4rlbZogb9yeyLJaCZrgIXGzhOGfmVQhnSNyhzBGLQFAlbxLiP9Iv50LFepoDh34v3w35WnvfUZutugXID+hAyFxF+TUtuDgESOvaU58o4T+TJVzmfmH6sjlgVMER5LH0BPZpgbGnJTmMXjGixxhdQ6zDpuga85UTPOAgKLAue+OPxmnrVbeZuAFvin/mwzZNWG22+ouCUqkRbwUFaiNSkwRwU38U1BpQwueo/yBorzk/tJ6ySjTxsgCw2t0gIG1RwDpzHwV42Z3wX8HP4Q/5nH0gO7LvVEHMvmdvRbco3YtWYioih2e4AYUehbFQeykFw692uKwgB0srD+yCP4l9GNoTrZRw 1AL29tDV soCwyLe6xFKyHbI3NrXwkSqVe9/JRGDivt0pFwuOb+dOteWM7Y4xD1Toc95cwdcTE8PHC13JsLnGyZCRg/qLJ5Zda0x7e9gtXykwQXwQtjYZLmlA= 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 5/22/23 2:49 PM, David Howells wrote: > So something like the attached changes? Any suggestions as to how to improve > the comments? > Looks fine to me now. Thanks. Reviewed-by: Joseph Qi > 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 *iocb, > * > * 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 = 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 *in, 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 = ocfs2_inode_lock_atime(inode, in->f_path.mnt, &lock_level, true); > + ret = ocfs2_inode_lock_atime(inode, in->f_path.mnt, &lock_level, 1); > if (ret < 0) { > if (ret != -EAGAIN) > mlog_errno(ret);