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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9125C388F9 for ; Fri, 23 Oct 2020 16:06:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D4352168B for ; Fri, 23 Oct 2020 16:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751298AbgJWQGw (ORCPT ); Fri, 23 Oct 2020 12:06:52 -0400 Received: from mx2.suse.de ([195.135.220.15]:45264 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S464934AbgJWQGw (ORCPT ); Fri, 23 Oct 2020 12:06:52 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 3CDA7AFC0; Fri, 23 Oct 2020 16:06:51 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 67EDDDA7F1; Fri, 23 Oct 2020 18:05:19 +0200 (CEST) Date: Fri, 23 Oct 2020 18:05:19 +0200 From: David Sterba To: Goldwyn Rodrigues Cc: Johannes Thumshirn , David Sterba , linux-btrfs@vger.kernel.org Subject: Re: [PATCH v2] btrfs: don't fallback to buffered read if we don't need to Message-ID: <20201023160519.GI6756@twin.jikos.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Goldwyn Rodrigues , Johannes Thumshirn , linux-btrfs@vger.kernel.org References: <0584c1f8bdbef5e56a684919df24481e90ddf334.1603375354.git.johannes.thumshirn@wdc.com> <20201022150033.uqvg2wqtjo5fnx5b@fiona> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201022150033.uqvg2wqtjo5fnx5b@fiona> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Thu, Oct 22, 2020 at 10:00:33AM -0500, Goldwyn Rodrigues wrote: > > diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c > > index 6f5ecba74f54..1c97e559aefb 100644 > > --- a/fs/btrfs/file.c > > +++ b/fs/btrfs/file.c > > @@ -3612,7 +3612,8 @@ static ssize_t btrfs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) > > inode_lock_shared(inode); > > ret = btrfs_direct_IO(iocb, to); > > inode_unlock_shared(inode); > > - if (ret < 0) > > + if (ret < 0 || !iov_iter_count(to) || > > + iocb->ki_pos >= i_size_read(file_inode(iocb->ki_filp))) > > return ret; JFYI, this conflicts with patch "btrfs: split btrfs_direct_IO to read and write" from your dsync/dio series it will need to be refreshed.