From patchwork Fri Jun 16 16:06:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 13282978 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6F06EB64D8 for ; Fri, 16 Jun 2023 16:13:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231757AbjFPQNQ (ORCPT ); Fri, 16 Jun 2023 12:13:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229658AbjFPQNP (ORCPT ); Fri, 16 Jun 2023 12:13:15 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 563FB359E; Fri, 16 Jun 2023 09:13:12 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 1452E1F749; Fri, 16 Jun 2023 16:13:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1686931991; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jUV5F1onpuE9Pjbo2RijvzWbMPt3gaxg5d/KUkj0P+8=; b=sOzikArASRrYdLe+jB0KB4ALjRmDLQZmCCB5IIdiWg1gIZur1LuC/362ReBG2/qGIX7L0N STBcSunZ9K+8CkHNHGL1QHsXCb0tzGwvUVSvbGCeDBHMmv4RA7X5F3HuSncmY7kPqOZI8E nIFyP54vVtCNk9Il3McecKq7z2vrC+A= Received: from ds.suse.cz (ds.suse.cz [10.100.12.205]) by relay2.suse.de (Postfix) with ESMTP id F13C52C141; Fri, 16 Jun 2023 16:13:10 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 42F56DA7D7; Fri, 16 Jun 2023 18:06:51 +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 fixes 6.4-rc7, part 2 Date: Fri, 16 Jun 2023 18:06:50 +0200 Message-Id: X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Hi, here's the second part, two fixes for NOCOW files, a regression fix in scrub and an assertion fix. Please pull, thanks. - NOCOW fixes: - keep length of iomap direct io request in case of a failure - properly pass mode of extent reference checking, this can break some cases for swapfile - fix error value confusion when scrubbing a stripe - convert assertion to a proper error handling when loading global roots, reported by syzbot ---------------------------------------------------------------- The following changes since commit 79b8ee702c918f1936e17cc53e14bec388ce1045: btrfs: scrub: also report errors hit during the initial read (2023-06-08 14:34:01 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-6.4-rc6-tag for you to fetch changes up to b50f2d048ecf1512ff85128ea4153bceb0e60590: btrfs: scrub: fix a return value overwrite in scrub_stripe() (2023-06-14 18:30:30 +0200) ---------------------------------------------------------------- Chris Mason (1): btrfs: can_nocow_file_extent should pass down args->strict from callers Christoph Hellwig (1): btrfs: fix iomap_begin length for nocow writes Qu Wenruo (2): btrfs: do not ASSERT() on duplicated global roots btrfs: scrub: fix a return value overwrite in scrub_stripe() fs/btrfs/disk-io.c | 10 ++++++++-- fs/btrfs/inode.c | 20 +++++++++++++------- fs/btrfs/scrub.c | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-)