Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3670882pxv; Mon, 26 Jul 2021 09:06:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5iPx4QcyXBfS1L/En1P+sUt3U15MQR6zf7z445lnS+mXUOJcHbnRGYsrpJSlZC5inIFJ2 X-Received: by 2002:adf:c3c5:: with SMTP id d5mr12329741wrg.76.1627315581848; Mon, 26 Jul 2021 09:06:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627315581; cv=none; d=google.com; s=arc-20160816; b=Oli58LNpiRfCTswGjzIukxqUvT03zbirUZKhJW9CpeJtZWZaAt3u9BAS6Wn6OpEDUh CkGIQ/Ij8qxapitSR4XQBShyRC/siTqGxx4hmaIbCvJfGlq+1uctFNtsvOPSkSOqoVTv tSnbPUMLuS070sEN/Exz4cbYjq1R6KTcPSkUTEhbzvR5oIL4D80dhFq84TCUFrL92qsk cjyknN7tg+UPh7wQJL7gTVwqsGhGbZgi5g+GtmD45C39vibdH2k9HspRrc2Szo5miqff Gf/DUMu9W1KuwvBqbDFVuU35rqfU7+VoioE0iSSlhioGYWu+UUfZAQSC6Ctov9Z87HnL hpqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jikYWPqc1rACDYWoyVLBVvDcnzVtZSZ58KxaAiHnrGE=; b=xvLHa155EPR0r7tgMBPMuTjXI9DPS54nm08hD16hrR+qtEME8F9Gei9SUh8XwttGtZ gYagpLujtY5z1lyUCQkNCW2rKyu7Df5Rn6CVvGPUP0qf3gl/13v1C2SwpcCB7Fq8I7tg +ZdjNGRaVv0mEGRnDzZTx3z61YPlgCXUAQXjUzghX5T3ECy3rFZXegrT9fmIbeXZMRWb 56LEgFJD/PPygQG6NnO/IpKiQKH/UQFNbhT5CBMQJfZpH8lqdWRsdC4nYWD7VmmcvVTr y5GdcLl3CgiNZobHZ1WUOrLsfagzV8RiUEQp3oAUsth/5P7E99VkLyMTUVKpVPtrlt+v zwiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YIx1fmHF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f27si255814ejf.63.2021.07.26.09.05.57; Mon, 26 Jul 2021 09:06:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YIx1fmHF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236831AbhGZPWN (ORCPT + 99 others); Mon, 26 Jul 2021 11:22:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:54244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236888AbhGZPPn (ORCPT ); Mon, 26 Jul 2021 11:15:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BED0561007; Mon, 26 Jul 2021 15:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627314856; bh=o4ayJY8GgOfuqCn82kmF0qhwBEHAphCq4RMCcOk+hDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YIx1fmHFUrd8Z1q7z90Qj1CdymE1+vRQY7sdZ3aY+KQ5dV8VhFVppQxCdW0rYTF3/ sPEjJKG0bVG2/Ol/oQ9Z4wvlGWygmT6OxJs/LtRgckjZLAkta09HNeexhbI3NJPc2A 92u4HMqJZMWPRGCxVnz3OSMsOglXBQkV9fLBugJo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Sterba , Sudip Mukherjee Subject: [PATCH 4.19 117/120] btrfs: compression: dont try to compress if we dont have enough pages Date: Mon, 26 Jul 2021 17:39:29 +0200 Message-Id: <20210726153836.229267265@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210726153832.339431936@linuxfoundation.org> References: <20210726153832.339431936@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Sterba commit f2165627319ffd33a6217275e5690b1ab5c45763 upstream The early check if we should attempt compression does not take into account the number of input pages. It can happen that there's only one page, eg. a tail page after some ranges of the BTRFS_MAX_UNCOMPRESSED have been processed, or an isolated page that won't be converted to an inline extent. The single page would be compressed but a later check would drop it again because the result size must be at least one block shorter than the input. That can never work with just one page. CC: stable@vger.kernel.org # 4.4+ Signed-off-by: David Sterba [sudip: adjust context] Signed-off-by: Sudip Mukherjee Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -530,7 +530,7 @@ again: * inode has not been flagged as nocompress. This flag can * change at any time if we discover bad compression ratios. */ - if (inode_need_compress(inode, start, end)) { + if (nr_pages > 1 && inode_need_compress(inode, start, end)) { WARN_ON(pages); pages = kcalloc(nr_pages, sizeof(struct page *), GFP_NOFS); if (!pages) {