Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   =?UTF-8?q?Lu=C3=ADs=20Henriques?= <lhenriques@suse.de>
To:     Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
        David Sterba <dsterba@suse.com>,
        Johannes Thumshirn <Johannes.Thumshirn@wdc.com>
Cc:     linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
        =?UTF-8?q?Lu=C3=ADs=20Henriques?= <lhenriques@suse.de>
Subject: [PATCH v2] btrfs: propagate error from function unpin_extent_cache()
Date:   Thu, 20 Jul 2023 14:41:23 +0100
Message-Id: <20230720134123.13148-1-lhenriques@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Function unpin_extent_cache() doesn't propagate an error if the call to
lookup_extent_mapping() fails.  This patch adds an error return (EINVAL)
and simply logs it in the only caller.

Signed-off-by: Luís Henriques <lhenriques@suse.de>
---
Hi!

As per David and Johannes reviews, I'm now proposing a different approach.
Note that I kept the WARN_ON() instead of replacing it by an ASSERT().  In
fact, I considered removing the WARN_ON() completely and simply return the
error if em->start != start.  But I guess it may useful for debug.

Changes since v1:
Instead of changing unpin_extent_cache() into a void function, make it
propage an error code instead.

 fs/btrfs/extent_map.c | 4 +++-
 fs/btrfs/inode.c      | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 0cdb3e86f29b..f4e7956edc05 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -304,8 +304,10 @@ int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len,
 
 	WARN_ON(!em || em->start != start);
 
-	if (!em)
+	if (!em) {
+		ret = -EINVAL;
 		goto out;
+	}
 
 	em->generation = gen;
 	clear_bit(EXTENT_FLAG_PINNED, &em->flags);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index dbbb67293e34..21eb66fcc0df 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3273,8 +3273,12 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)
 						ordered_extent->disk_num_bytes);
 		}
 	}
-	unpin_extent_cache(&inode->extent_tree, ordered_extent->file_offset,
-			   ordered_extent->num_bytes, trans->transid);
+
+	/* Proceed even if we fail to unpin extent from cache */
+	if (unpin_extent_cache(&inode->extent_tree, ordered_extent->file_offset,
+			       ordered_extent->num_bytes, trans->transid) < 0)
+		btrfs_warn(fs_info, "failed to unpin extent from cache");
+
 	if (ret < 0) {
 		btrfs_abort_transaction(trans, ret);
 		goto out;