From patchwork Sun Sep 3 07:29:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9936001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 73D3F6037D for ; Sun, 3 Sep 2017 07:30:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63FB528632 for ; Sun, 3 Sep 2017 07:30:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 585582868C; Sun, 3 Sep 2017 07:30:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0D1828632 for ; Sun, 3 Sep 2017 07:30:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751497AbdICHaE (ORCPT ); Sun, 3 Sep 2017 03:30:04 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:53057 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751196AbdICHaD (ORCPT ); Sun, 3 Sep 2017 03:30:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jwMfzrlp4mTEHRRLzdJdQcwhVZ0uY0I2lJ2U7qhb4lk=; b=KWEquXmI4OLIrDd0RZRN22mEQ YNknXIMkenmpoZd0t7J5vaV8WH+N5ZA2x6ezqrYx3V1mokgUNReZzr8GcAoTHPo4qRUYyUZcGqdqw XjXehmc0AmtJjWhe7ZQvhCne+OEiNSSwJL12UD/GKw98kXl/molWlYFoHl0ZjtJmx1TrYreNXA1x8 /sw2Sat8kcgXr7F2IYnBXN+AmX5c9dVaA7Dimk4+ZJ2ny03fyuB6xWcjuBsPOvapYTEQstQx9jT4+ 28H5lUZ8TU4fhCFizxZFYiakN/nLXG9A78YxZpSzE1kIJpPNw/iHxdU7WC43JcRfUxauPT4Z5UfJz SZ/gY1XyA==; Received: from [91.114.64.3] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1doPM3-0005ii-5n for linux-xfs@vger.kernel.org; Sun, 03 Sep 2017 07:30:03 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Subject: [PATCH 01/17] xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real Date: Sun, 3 Sep 2017 09:29:40 +0200 Message-Id: <20170903072956.3175-2-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170903072956.3175-1-hch@lst.de> References: <20170903072956.3175-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There was one spot in xfs_bmap_add_extent_unwritten_real that didn't use the passed in new extent state but always converted to normal, leading to wrong behavior when converting from normal to unwritten. Only found by code inspection, it seems like this code path to move partial extent from written to unwritten while merging it with the next extent is rarely exercised. Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster --- fs/xfs/libxfs/xfs_bmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 9558f5ee1bf9..a60744a46bdf 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -2573,7 +2573,7 @@ xfs_bmap_add_extent_unwritten_real( &i))) goto done; XFS_WANT_CORRUPTED_GOTO(mp, i == 0, done); - cur->bc_rec.b.br_state = XFS_EXT_NORM; + cur->bc_rec.b.br_state = new->br_state; if ((error = xfs_btree_insert(cur, &i))) goto done; XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);