1 files changed, 4 insertions, 3 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index c0363626c5da..18541dc4ec0b 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2750,7 +2750,7 @@ int open_ctree(struct super_block *sb,
          */
         fs_info->compress_type = BTRFS_COMPRESS_ZLIB;
 
-        ret = btrfs_parse_options(tree_root, options);
+        ret = btrfs_parse_options(tree_root, options, sb->s_flags);
         if (ret) {
                 err = ret;
                 goto fail_alloc;
@@ -3029,8 +3029,9 @@ retry_root_backup:
         if (ret)
                 goto fail_trans_kthread;
 
-        /* do not make disk changes in broken FS */
-        if (btrfs_super_log_root(disk_super) != 0) {
+        /* do not make disk changes in broken FS or nologreplay is given */
+        if (btrfs_super_log_root(disk_super) != 0 &&
+            !btrfs_test_opt(tree_root, NOLOGREPLAY)) {
                 ret = btrfs_replay_log(fs_info, fs_devices);
                 if (ret) {
                         err = ret;