[ros-diffs] [reactos] 02/02: [BTRFS] Revert "Allow driver to start at first stage when no hive is present."

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=400eb23a6474f15ed65fdb49b9618436017dc035

commit 400eb23a6474f15ed65fdb49b9618436017dc035
Author:     Serge Gautherie <reactos-git_serge_171...@gautherie.fr>
AuthorDate: Sat Sep 7 02:41:26 2019 +0200
Commit:     Pierre Schweitzer <pie...@reactos.org>
CommitDate: Sat Sep 7 19:58:03 2019 +0200

    [BTRFS] Revert "Allow driver to start at first stage when no hive is 
present."
    
    Not needed anymore.
    
    This reverts commit 80e11516b12b19530b56be7539ecc6af2039ed7b.
---
 drivers/filesystems/btrfs/btrfs.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/filesystems/btrfs/btrfs.c 
b/drivers/filesystems/btrfs/btrfs.c
index ada1cc18f45..2f0c97d5675 100644
--- a/drivers/filesystems/btrfs/btrfs.c
+++ b/drivers/filesystems/btrfs/btrfs.c
@@ -5949,19 +5949,12 @@ NTSTATUS __stdcall DriverEntry(_In_ PDRIVER_OBJECT 
DriverObject, _In_ PUNICODE_S
 
     InitializeObjectAttributes(&oa, RegistryPath, OBJ_CASE_INSENSITIVE | 
OBJ_KERNEL_HANDLE, NULL, NULL);
     Status = ZwCreateKey(&regh, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | 
KEY_NOTIFY, &oa, 0, NULL, REG_OPTION_NON_VOLATILE, &dispos);
-    /* ReactOS specific hack: allow BtrFS driver to start in 1st stage with no 
hive */
-#ifndef __REACTOS__
     if (!NT_SUCCESS(Status)) {
         ERR("ZwCreateKey returned %08x\n", Status);
         return Status;
     }
 
     watch_registry(regh);
-#else
-    if (NT_SUCCESS(Status)) {
-        watch_registry(regh);
-    }
-#endif
 
     Status = IoCreateDevice(DriverObject, sizeof(bus_device_extension), NULL, 
FILE_DEVICE_UNKNOWN,
                             FILE_DEVICE_SECURE_OPEN, false, &busobj);