Btrfs: fix remount vs autodefrag

[linux-imx.git] / fs / btrfs / file.c

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 9f67e623206d90c7ef279a6291b116f5211007b4..6e6dd8cdad92201c661dedb9bdbcfe749749ed9e 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -374,6 +374,11 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info)
 
        atomic_inc(&fs_info->defrag_running);
        while(1) {
+               /* Pause the auto defragger. */
+               if (test_bit(BTRFS_FS_STATE_REMOUNTING,
+                            &fs_info->fs_state))
+                       break;
+
                if (!__need_auto_defrag(fs_info->tree_root))
                        break;