Merge "Disable async merge writes until we figure out the intermittent I/O errors."
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp
index d4d4efe..ffb982a 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp
@@ -461,6 +461,14 @@
return false;
}
+ {
+ // TODO: b/219642530 - Disable io_uring for merge
+ // until we figure out the cause of intermittent
+ // IO failures.
+ merge_async_ = false;
+ return true;
+ }
+
ring_ = std::make_unique<struct io_uring>();
int ret = io_uring_queue_init(queue_depth_, ring_.get(), 0);