tdata->tpool

diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
index 87a60234f1045f4782600c0c22c223a6d96e50cc..158b3f388e8698c55ff91ac5711b504abd502597 100644 (file)
--- a/lib/misc/lvm-string.c
+++ b/lib/misc/lvm-string.c
@@ -95,58 +95,40 @@ int validate_name(const char *n)
 
 int apply_lvname_restrictions(const char *name)
 {
-       if (!strncmp(name, "snapshot", 8)) {
-               log_error("Names starting \"snapshot\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
-       }
-
-       if (!strncmp(name, "pvmove", 6)) {
-               log_error("Names starting \"pvmove\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
-       }
-
-       if (strstr(name, "_mlog")) {
-               log_error("Names including \"_mlog\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
-       }
-
-       if (strstr(name, "_mimage")) {
-               log_error("Names including \"_mimage\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
-       }
-
-       if (strstr(name, "_rimage")) {
-               log_error("Names including \"_rimage\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
-       }
-
-       if (strstr(name, "_rmeta")) {
-               log_error("Names including \"_rmeta\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
-       }
-
-       if (strstr(name, "_vorigin")) {
-               log_error("Names including \"_vorigin\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
-       }
-
-       if (strstr(name, "_tdata")) {
-               log_error("Names including \"_tpool\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
+       const char *reserved_prefixes[] = {
+               "snapshot",
+               "pvmove",
+               NULL
+       };
+
+       const char *reserved_strings[] = {
+               "_mlog",
+               "_mimage",
+               "_rimage",
+               "_rmeta",
+               "_vorigin",
+               "_tpool",
+               "_tmeta",
+               NULL
+       };
+
+       unsigned i;
+       const char *s;
+
+       for (i = 0; (s = reserved_prefixes[i]); i++) {
+               if (!strncmp(name, s, strlen(s))) {
+                       log_error("Names starting \"%s\" are reserved. "
+                                 "Please choose a different LV name.", s);
+                       return 0;
+               }
        }
 
-       if (strstr(name, "_tmeta")) {
-               log_error("Names including \"_tpool\" are reserved. "
-                         "Please choose a different LV name.");
-               return 0;
+       for (i = 0; (s = reserved_strings[i]); i++) {
+               if (strstr(name, s)) {
+                       log_error("Names including \"%s\" are reserved. "
+                                 "Please choose a different LV name.", s);
+                       return 0;
+               }
        }
 
        return 1;