From patchwork Thu Sep 3 14:37:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 11753825 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 369131709 for ; Thu, 3 Sep 2020 14:42:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2989820BED for ; Thu, 3 Sep 2020 14:42:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729379AbgICOmW (ORCPT ); Thu, 3 Sep 2020 10:42:22 -0400 Received: from mx2.suse.de ([195.135.220.15]:50938 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729387AbgICOh2 (ORCPT ); Thu, 3 Sep 2020 10:37:28 -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 28162AFCB; Thu, 3 Sep 2020 14:37:19 +0000 (UTC) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH] btrfs: set ret to 0 in btrfs_get_extent Date: Thu, 3 Sep 2020 17:37:15 +0300 Message-Id: <20200903143715.14848-1-nborisov@suse.com> X-Mailer: git-send-email 2.17.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org When btrfs_get_extent is called for a range that has an overlapping inline extent coupled with with 'page' parameter being NULL it will erroneously return an error instead of the populate extent_mapping struct. Fix this by setting ret to 0 in case we don't have an exact match for our range. Fixes: 85b1eebdaf1d: "btrfs: remove err variable from btrfs_get_extent" Signed-off-by: Nikolay Borisov --- fs/btrfs/inode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3b63b858546e..a1081ec8e130 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6593,6 +6593,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, if (path->slots[0] == 0) goto not_found; path->slots[0]--; + ret = 0; } leaf = path->nodes[0];