From 154d22695ad6f131f0e2f99b895b3b1038c10eea Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 29 Sep 2017 14:23:17 +0200
Subject: [PATCH] dissect: split list of discard-supporting fs out into
 mount-util.c

Let's manage the list of file systems that do a specific thing at one
place, following similar naming.

No functional changes.
---
 src/basic/mount-util.c     | 12 ++++++++++++
 src/basic/mount-util.h     |  1 +
 src/shared/dissect-image.c |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 843d266a2f..9069280721 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -591,6 +591,18 @@ bool fstype_is_ro(const char *fstype) {
         return nulstr_contains(table, fstype);
 }
 
+bool fstype_can_discard(const char *fstype) {
+
+        static const char table[] =
+                "btrfs\0"
+                "ext4\0"
+                "vfat\0"
+                "xfs\0"
+                ;
+
+        return nulstr_contains(table, fstype);
+}
+
 int repeat_unmount(const char *path, int flags) {
         bool done = false;
 
diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index 3ec0e7d1f8..1e066d8886 100644
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -46,6 +46,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
 bool fstype_is_network(const char *fstype);
 bool fstype_is_api_vfs(const char *fstype);
 bool fstype_is_ro(const char *fsype);
+bool fstype_can_discard(const char *fstype);
 
 union file_handle_union {
         struct file_handle handle;
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index b02b2897d3..243a46f2e3 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -684,7 +684,7 @@ static int mount_partition(
                 p = where;
 
         /* If requested, turn on discard support. */
-        if (STR_IN_SET(fstype, "btrfs", "ext4", "vfat", "xfs") &&
+        if (fstype_can_discard(fstype) &&
             ((flags & DISSECT_IMAGE_DISCARD) ||
              ((flags & DISSECT_IMAGE_DISCARD_ON_LOOP) && is_loop_device(m->node))))
                 options = "discard";
-- 
2.25.1