Revert "zygo: btrfs: accept any non-zero device type until preferred_metadata stabilizes"

This reverts commit d54876befb88f3bbcbb26c5f0ccf4829200405d7.

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 0da5ce8052fb0045c7747c4731b5b23561dac293..0b7124e304742bd8a8746415f15032726ff29bd8 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5047,7 +5047,8 @@ static int gather_device_info(struct btrfs_fs_devices *fs_devices,
                devices_info[ndevs].max_avail = max_avail;
                devices_info[ndevs].total_avail = total_avail;
                devices_info[ndevs].dev = device;
-               devices_info[ndevs].preferred_metadata = !!(device->type);
+               devices_info[ndevs].preferred_metadata = !!(device->type &
+                       BTRFS_DEV_PREFERRED_METADATA);
                if (devices_info[ndevs].preferred_metadata)
                        nr_preferred_metadata++;
                ++ndevs;