5.5-stable patches

added patches:
	btrfs-do-not-zero-f_bavail-if-we-have-available-space.patch

diff --git a/queue-5.5/btrfs-do-not-zero-f_bavail-if-we-have-available-space.patch b/queue-5.5/btrfs-do-not-zero-f_bavail-if-we-have-available-space.patch
new file mode 100644 (file)
index 0000000..b6f4245
--- /dev/null
+++ b/queue-5.5/btrfs-do-not-zero-f_bavail-if-we-have-available-space.patch
@@ -0,0 +1,61 @@
+From d55966c4279bfc6a0cf0b32bf13f5df228a1eeb6 Mon Sep 17 00:00:00 2001
+From: Josef Bacik <josef@toxicpanda.com>
+Date: Fri, 31 Jan 2020 09:31:05 -0500
+Subject: btrfs: do not zero f_bavail if we have available space
+
+From: Josef Bacik <josef@toxicpanda.com>
+
+commit d55966c4279bfc6a0cf0b32bf13f5df228a1eeb6 upstream.
+
+There was some logic added a while ago to clear out f_bavail in statfs()
+if we did not have enough free metadata space to satisfy our global
+reserve.  This was incorrect at the time, however didn't really pose a
+problem for normal file systems because we would often allocate chunks
+if we got this low on free metadata space, and thus wouldn't really hit
+this case unless we were actually full.
+
+Fast forward to today and now we are much better about not allocating
+metadata chunks all of the time.  Couple this with d792b0f19711 ("btrfs:
+always reserve our entire size for the global reserve") which now means
+we'll easily have a larger global reserve than our free space, we are
+now more likely to trip over this while still having plenty of space.
+
+Fix this by skipping this logic if the global rsv's space_info is not
+full.  space_info->full is 0 unless we've attempted to allocate a chunk
+for that space_info and that has failed.  If this happens then the space
+for the global reserve is definitely sacred and we need to report
+b_avail == 0, but before then we can just use our calculated b_avail.
+
+Reported-by: Martin Steigerwald <martin@lichtvoll.de>
+Fixes: ca8a51b3a979 ("btrfs: statfs: report zero available if metadata are exhausted")
+CC: stable@vger.kernel.org # 4.5+
+Reviewed-by: Qu Wenruo <wqu@suse.com>
+Tested-By: Martin Steigerwald <martin@lichtvoll.de>
+Signed-off-by: Josef Bacik <josef@toxicpanda.com>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/btrfs/super.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/fs/btrfs/super.c
++++ b/fs/btrfs/super.c
+@@ -2104,7 +2104,15 @@ static int btrfs_statfs(struct dentry *d
+        */
+       thresh = SZ_4M;
+ 
+-      if (!mixed && total_free_meta - thresh < block_rsv->size)
++      /*
++       * We only want to claim there's no available space if we can no longer
++       * allocate chunks for our metadata profile and our global reserve will
++       * not fit in the free metadata space.  If we aren't ->full then we
++       * still can allocate chunks and thus are fine using the currently
++       * calculated f_bavail.
++       */
++      if (!mixed && block_rsv->space_info->full &&
++          total_free_meta - thresh < block_rsv->size)
+               buf->f_bavail = 0;
+ 
+       buf->f_type = BTRFS_SUPER_MAGIC;

diff --git a/queue-5.5/series b/queue-5.5/series
index 25577fce617dd013b26774aa4f1d4c4513b2ad01..4ae6e3eaf50f7b7bb3986fcd325200d356a219e1 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -21,3 +21,4 @@ tomoyo-use-atomic_t-for-statistics-counter.patch
 ttyprintk-fix-a-potential-deadlock-in-interrupt-context-issue.patch
 bluetooth-fix-race-condition-in-hci_release_sock.patch
 cgroup-prevent-double-killing-of-css-when-enabling-threaded-cgroup.patch
+btrfs-do-not-zero-f_bavail-if-we-have-available-space.patch