From patchwork Thu Nov 9 13:26:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10050893 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 F09B560381 for ; Thu, 9 Nov 2017 13:27:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBF722ABD5 for ; Thu, 9 Nov 2017 13:27:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0A262ABD8; Thu, 9 Nov 2017 13:27:07 +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 32FD72ABD5 for ; Thu, 9 Nov 2017 13:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754639AbdKIN1G (ORCPT ); Thu, 9 Nov 2017 08:27:06 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:39191 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754436AbdKIN1G (ORCPT ); Thu, 9 Nov 2017 08:27:06 -0500 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:Cc:To:From:Sender:Reply-To: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=TOgwpkWilTP8/9p0P4ikH2zwp5A11RB7XnbNyZa6ay8=; b=ejYE8DiFojyEiekluuyf0R6rH IszenWIh6KIp5qlOUBYQbQC+kOwoG9b/jyk6WunHNDozxsGr3oxe7Y337bcz81lD1aWXNeyrCE6JK CBzvhvcweAx5Ku+D+C81x6Q7BEQ7NCXaqkoUoM2HtfQuN2QoCL9coAvQ8HOTrO7F4dr/XljTSDAJD aZ0ejnVwMbueD2PoDCjxo5CEG+V56696/nvgCXCGr0JD0QXHbKAAmhwfpPzh2iDste02xlh3oD1NI w6nBbFfDPmHlUkqbrcrvA/UObXQojAzc4WoDWps2vZhz1aAQkdZY0Vhsv7FCtdJOyocLjVvMxoUG1 bQUjDRP6Q==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1eCmrJ-0002Xa-Hg; Thu, 09 Nov 2017 13:27:05 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: bfoster@redhat.com Subject: [PATCH 1/6] xfs: fix number of records handling in xfs_iext_split_leaf Date: Thu, 9 Nov 2017 14:26:51 +0100 Message-Id: <20171109132656.1649-2-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171109132656.1649-1-hch@lst.de> References: <20171109132656.1649-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 Fix to check the correct value, and remove a duplicate handling of the uneven record number split algorith, Reported-by: Brian Foster Signed-off-by: Christoph Hellwig --- fs/xfs/libxfs/xfs_iext_tree.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_iext_tree.c b/fs/xfs/libxfs/xfs_iext_tree.c index 00d660dcb05e..85d7f708eafc 100644 --- a/fs/xfs/libxfs/xfs_iext_tree.c +++ b/fs/xfs/libxfs/xfs_iext_tree.c @@ -555,16 +555,13 @@ xfs_iext_split_leaf( int i; /* for sequential append operations just spill over into the new node */ - if (cur->pos == KEYS_PER_NODE) { + if (cur->pos == RECS_PER_LEAF) { cur->leaf = new; cur->pos = 0; *nr_entries = 0; goto done; } - if (nr_keep & 1) - nr_keep++; - for (i = 0; i < nr_move; i++) { new->recs[i] = leaf->recs[nr_keep + i]; xfs_iext_rec_clear(&leaf->recs[nr_keep + i]);