Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp934669ybt; Sun, 14 Jun 2020 05:01:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1opta9z6tGH3fpLhYS6CzIO0+Pf20GSqLLClL3pap8NJdbGD7EvwDNSeMhOz+l1gXNkeO X-Received: by 2002:aa7:d952:: with SMTP id l18mr19253246eds.151.1592136081161; Sun, 14 Jun 2020 05:01:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592136081; cv=none; d=google.com; s=arc-20160816; b=Eyna/m+u8l+1AqPhr3fjRK8DkgIc/TH1tXVrWztp6v8YSkBNWfMNIja2ReeualwuJA dQo6fcEIB9Y94BINb2k/4wgfKUqgE3SJ/ZYc+Xq0yWMCd6FSbjpC+gXXo9UQrlB60den DAp+qex6wp19hCeEGmG/snx7eOOBwaGBEfGlBVTyHUa2vkmk9jED8QodhZ+ToW/w/Xo9 9c+0hRrRuH4JIjLtBNOvNh6j0PInMqXbF/DFKV0DGmjPSlIixXoCSyF0zvHUsJtC1uhm 4KyDosuRPuAfGkRP+y6cVQm7cDGTdMsyk5NOzZe9WXet2fuq31D634FOm4baj85Yl8mj hiIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=zVt5kjh68Y/QNh0I1C6FNFwWIbop2YOYjZPSnZElPe8=; b=zM9K7d+4vG/76DE/kUwuCRUGJ0BtqEVBM1ywkU2wXskWrFbTIwK/f0gRLVnLy9VOBS MtEdQ+2x4qzitEvxZguUZzVjSeuNrGdnV4PBGa7Q+OVCMKC7rD+Vzh7IGLQ0OcP5hHpj D20Eb38H+3aDkq/vyvg6axIrZE6bL8G62NZCX1FCaVa3arMPhm99wOzQmi9XVzT9zLtp IqgCVgM7rTz7tl/n1u2E6olmfXpTs4WpoKVOL+J/nRsXdke18sVu9G4kg0mC6PwYdIQQ jSt0iZ4GiNKOiDuS2NVWJpONNGlrPANGdKs6IqLxrhn9ScXgA9heoJVyXGOXyFZQcGxf fqPg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bf15si7206606edb.553.2020.06.14.05.00.27; Sun, 14 Jun 2020 05:01:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726950AbgFNL4Q (ORCPT + 99 others); Sun, 14 Jun 2020 07:56:16 -0400 Received: from mx2.suse.de ([195.135.220.15]:58794 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725815AbgFNL4Q (ORCPT ); Sun, 14 Jun 2020 07:56:16 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 65DFFAB76; Sun, 14 Jun 2020 11:56:18 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 7B00CDA7C3; Sun, 14 Jun 2020 13:56:06 +0200 (CEST) From: David Sterba To: torvalds@linux-foundation.org Cc: David Sterba , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] Btrfs updates for 5.8, part 2 Date: Sun, 14 Jun 2020 13:56:05 +0200 Message-Id: X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, this reverts the direct io port to iomap infrastructure of btrfs merged in the first pull request. We found problems in invalidate page that don't seem to be fixable as regressions or without changing iomap code that would not affect other filesystems. There are 4 patches reverted in total, but 3 of them are followup cleanups needed to revert a43a67a2d715540c13 cleanly. The result is the buffer head based implementation of direct io. There's one trivial conflict that git does not auto-resolve, in the address space operations readpages has been replaced by readahead and this change is in the context of the direct io callback diff. Reverts are not great, but under current circumstances I don't see better options. Please pull, thanks. ---------------------------------------------------------------- The following changes since commit 2166e5edce9ac1edf3b113d6091ef72fcac2d6c4: btrfs: fix space_info bytes_may_use underflow during space cache writeout (2020-05-28 14:01:53 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-5.8-part2-tag for you to fetch changes up to 55e20bd12a56e06c38b953177bb162cbbaa96004: Revert "btrfs: switch to iomap_dio_rw() for dio" (2020-06-14 01:19:02 +0200) ---------------------------------------------------------------- David Sterba (4): Revert "btrfs: split btrfs_direct_IO to read and write part" Revert "btrfs: remove BTRFS_INODE_READDIO_NEED_LOCK" Revert "fs: remove dio_end_io()" Revert "btrfs: switch to iomap_dio_rw() for dio" fs/btrfs/Kconfig | 1 - fs/btrfs/btrfs_inode.h | 18 +++ fs/btrfs/ctree.h | 4 - fs/btrfs/file.c | 97 +------------ fs/btrfs/inode.c | 379 +++++++++++++++++++++++++++++++------------------ fs/direct-io.c | 19 +++ include/linux/fs.h | 2 + 7 files changed, 286 insertions(+), 234 deletions(-)