Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43758 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754157AbcFEWDO (ORCPT ); Sun, 5 Jun 2016 18:03:14 -0400 Subject: Patch "btrfs: fix mixed block count of available space" has been added to the 4.5-stable tree To: luisbg@osg.samsung.com, dsterba@suse.com, gregkh@linuxfoundation.org Cc: , From: Date: Sun, 05 Jun 2016 14:48:36 -0700 Message-ID: <14651633167739@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled btrfs: fix mixed block count of available space to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: btrfs-fix-mixed-block-count-of-available-space.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From ae02d1bd070767e109f4a6f1bb1f466e9698a355 Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Wed, 30 Mar 2016 21:53:38 +0100 Subject: btrfs: fix mixed block count of available space From: Luis de Bethencourt commit ae02d1bd070767e109f4a6f1bb1f466e9698a355 upstream. Metadata for mixed block is already accounted in total data and should not be counted as part of the free metadata space. Signed-off-by: Luis de Bethencourt Link: https://bugzilla.kernel.org/show_bug.cgi?id=114281 Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/super.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -2024,6 +2024,7 @@ static int btrfs_statfs(struct dentry *d struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv; int ret; u64 thresh = 0; + int mixed = 0; /* * holding chunk_muext to avoid allocating new chunks, holding @@ -2049,8 +2050,17 @@ static int btrfs_statfs(struct dentry *d } } } - if (found->flags & BTRFS_BLOCK_GROUP_METADATA) - total_free_meta += found->disk_total - found->disk_used; + + /* + * Metadata in mixed block goup profiles are accounted in data + */ + if (!mixed && found->flags & BTRFS_BLOCK_GROUP_METADATA) { + if (found->flags & BTRFS_BLOCK_GROUP_DATA) + mixed = 1; + else + total_free_meta += found->disk_total - + found->disk_used; + } total_used += found->disk_used; } @@ -2088,7 +2098,7 @@ static int btrfs_statfs(struct dentry *d */ thresh = 4 * 1024 * 1024; - if (total_free_meta - thresh < block_rsv->size) + if (!mixed && total_free_meta - thresh < block_rsv->size) buf->f_bavail = 0; buf->f_type = BTRFS_SUPER_MAGIC; Patches currently in stable-queue which might be from luisbg@osg.samsung.com are queue-4.5/btrfs-fix-mixed-block-count-of-available-space.patch queue-4.5/btrfs-avoid-overflowing-f_bfree.patch