From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Sun, 5 Dec 2021 08:07:34 +0000 (-0500)
Subject: Revert "zygo: btrfs: accept any non-zero device type until preferred_metadata stabilizes"
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09e99a0408f4a0170fec71ed36974c8fee5e3b8f;p=linux

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 0da5ce8052fb..0b7124e30474 100644
--- 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;