1 files changed, 35 insertions, 25 deletions

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 00b8f37cc306..bf71071ab6f6 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -97,15 +97,6 @@ const char *btrfs_decode_error(int errno)
         return errstr;
 }
 
-static void save_error_info(struct btrfs_fs_info *fs_info)
-{
-        /*
-         * today we only save the error info into ram.  Long term we'll
-         * also send it down to the disk
-         */
-        set_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state);
-}
-
 /* btrfs handle error by forcing the filesystem readonly */
 static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
 {
@@ -131,11 +122,11 @@ static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
 }
 
 /*
- * __btrfs_std_error decodes expected errors from the caller and
+ * __btrfs_handle_fs_error decodes expected errors from the caller and
  * invokes the approciate error response.
  */
 __cold
-void __btrfs_std_error(struct btrfs_fs_info *fs_info, const char *function,
+void __btrfs_handle_fs_error(struct btrfs_fs_info *fs_info, const char *function,
                        unsigned int line, int errno, const char *fmt, ...)
 {
         struct super_block *sb = fs_info->sb;
@@ -170,8 +161,13 @@ void __btrfs_std_error(struct btrfs_fs_info *fs_info, const char *function,
         }
 #endif
 
+        /*
+         * Today we only save the error info to memory.  Long term we'll
+         * also send it down to the disk
+         */
+        set_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state);
+
         /* Don't go through full error handling during mount */
-        save_error_info(fs_info);
         if (sb->s_flags & MS_BORN)
                 btrfs_handle_error(fs_info);
 }
@@ -252,7 +248,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
         /* Wake up anybody who may be waiting on this transaction */
         wake_up(&root->fs_info->transaction_wait);
         wake_up(&root->fs_info->transaction_blocked_wait);
-        __btrfs_std_error(root->fs_info, function, line, errno, NULL);
+        __btrfs_handle_fs_error(root->fs_info, function, line, errno, NULL);
 }
 /*
  * __btrfs_panic decodes unexpected, fatal errors from the caller,
@@ -1160,7 +1156,7 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
                 return 0;
         }
 
-        btrfs_wait_ordered_roots(fs_info, -1);
+        btrfs_wait_ordered_roots(fs_info, -1, 0, (u64)-1);
 
         trans = btrfs_attach_transaction_barrier(root);
         if (IS_ERR(trans)) {
@@ -1488,10 +1484,10 @@ static int setup_security_options(struct btrfs_fs_info *fs_info,
                 memcpy(&fs_info->security_opts, sec_opts, sizeof(*sec_opts));
         } else {
                 /*
-                 * Since SELinux(the only one supports security_mnt_opts) does
-                 * NOT support changing context during remount/mount same sb,
-                 * This must be the same or part of the same security options,
-                 * just free it.
+                 * Since SELinux (the only one supporting security_mnt_opts)
+                 * does NOT support changing context during remount/mount of
+                 * the same sb, this must be the same or part of the same
+                 * security options, just free it.
                  */
                 security_free_mnt_opts(sec_opts);
         }
@@ -1669,8 +1665,8 @@ static inline void btrfs_remount_cleanup(struct btrfs_fs_info *fs_info,
                                          unsigned long old_opts)
 {
         /*
-         * We need cleanup all defragable inodes if the autodefragment is
-         * close or the fs is R/O.
+         * We need to cleanup all defragable inodes if the autodefragment is
+         * close or the filesystem is read only.
          */
         if (btrfs_raw_test_opt(old_opts, AUTO_DEFRAG) &&
             (!btrfs_raw_test_opt(fs_info->mount_opt, AUTO_DEFRAG) ||
@@ -2051,9 +2047,10 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
         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
+         * holding chunk_mutex to avoid allocating new chunks, holding
          * device_list_mutex to avoid the device being removed
          */
         rcu_read_lock();
@@ -2076,8 +2073,17 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
                                 }
                         }
                 }
-                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;
         }
@@ -2090,7 +2096,11 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 
         /* Account global block reserve as used, it's in logical size already */
         spin_lock(&block_rsv->lock);
-        buf->f_bfree -= block_rsv->size >> bits;
+        /* Mixed block groups accounting is not byte-accurate, avoid overflow */
+        if (buf->f_bfree >= block_rsv->size >> bits)
+                buf->f_bfree -= block_rsv->size >> bits;
+        else
+                buf->f_bfree = 0;
         spin_unlock(&block_rsv->lock);
 
         buf->f_bavail = div_u64(total_free_data, factor);
@@ -2115,7 +2125,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
          */
         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;