additional activation functions

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index b0d36f1d14504f415dd72d04a177762136da0a9c..49291cfa9d9305296c806747385101c43b06a34d 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -62,10 +62,18 @@ int lvs_in_vg_opened(struct volume_group *vg)
 {
        return 0;
 }
+int lv_suspend(struct cmd_context *cmd, const char *lvid_s)
+{
+       return 1;
+}
 int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s)
 {
        return 1;
 }
+int lv_resume(struct cmd_context *cmd, const char *lvid_s)
+{
+       return 1;
+}
 int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s)
 {
        return 1;
@@ -74,10 +82,19 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s)
 {
        return 1;
 }
+int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
+                        int *activate_lv)
+{
+       return 1;
+}
 int lv_activate(struct cmd_context *cmd, const char *lvid_s)
 {
        return 1;
 }
+int lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s)
+{
+       return 1;
+}
 
 int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv)
 {
@@ -339,7 +356,7 @@ static int _lv_open_count(struct logical_volume *lv)
 }
 
 /* FIXME Need to detect and handle an lv rename */
-static int _lv_activate(struct logical_volume *lv)
+static int _lv_activate_lv(struct logical_volume *lv)
 {
        int r;
        struct dev_manager *dm;
@@ -373,7 +390,7 @@ static int _lv_deactivate(struct logical_volume *lv)
        return r;
 }
 
-static int _lv_suspend(struct logical_volume *lv)
+static int _lv_suspend_lv(struct logical_volume *lv)
 {
        int r;
        struct dev_manager *dm;
@@ -428,8 +445,8 @@ int lvs_in_vg_opened(struct volume_group *vg)
        return count;
 }
 
-/* These return success if the device is not active */
-int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s)
+static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
+                      int error_if_not_suspended)
 {
        struct logical_volume *lv;
        struct lvinfo info;
@@ -451,10 +468,10 @@ int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s)
        }
 
        if (!info.exists || info.suspended)
-               return 1;
+               return error_if_not_suspended ? 0 : 1;
 
        memlock_inc();
-       if (!_lv_suspend(lv)) {
+       if (!_lv_suspend_lv(lv)) {
                memlock_dec();
                fs_unlock();
                return 0;
@@ -463,7 +480,19 @@ int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s)
        return 1;
 }
 
-int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s)
+/* Returns success if the device is not active */
+int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s)
+{
+       return _lv_suspend(cmd, lvid_s, 0);
+}
+
+int lv_suspend(struct cmd_context *cmd, const char *lvid_s)
+{
+       return _lv_suspend(cmd, lvid_s, 1);
+}
+
+static int _lv_resume(struct cmd_context *cmd, const char *lvid_s,
+                     int error_if_not_active)
 {
        struct logical_volume *lv;
        struct lvinfo info;
@@ -485,9 +514,9 @@ int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s)
        }
 
        if (!info.exists || !info.suspended)
-               return 1;
+               return error_if_not_active ? 0 : 1;
 
-       if (!_lv_activate(lv))
+       if (!_lv_activate_lv(lv))
                return 0;
 
        memlock_dec();
@@ -496,6 +525,17 @@ int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s)
        return 1;
 }
 
+/* Returns success if the device is not active */
+int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s)
+{
+       return _lv_resume(cmd, lvid_s, 0);
+}
+
+int lv_resume(struct cmd_context *cmd, const char *lvid_s)
+{
+       return _lv_resume(cmd, lvid_s, 1);
+}
+
 int lv_deactivate(struct cmd_context *cmd, const char *lvid_s)
 {
        struct logical_volume *lv;
@@ -535,7 +575,31 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s)
        return r;
 }
 
-int lv_activate(struct cmd_context *cmd, const char *lvid_s)
+/* Test if LV passes filter */
+int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
+                        int *activate_lv)
+{
+       struct logical_volume *lv;
+
+       if (!activation())
+               goto activate;
+
+       if (!(lv = lv_from_lvid(cmd, lvid_s)))
+               return 0;
+
+       if (!_passes_activation_filter(cmd, lv)) {
+               log_verbose("Not activating %s/%s due to config file settings",
+                           lv->vg->name, lv->name);
+               *activate_lv = 0;
+               return 1;
+       }
+
+      activate:
+       *activate_lv = 1;
+       return 1;
+}
+
+static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, int filter)
 {
        struct logical_volume *lv;
        struct lvinfo info;
@@ -547,7 +611,7 @@ int lv_activate(struct cmd_context *cmd, const char *lvid_s)
        if (!(lv = lv_from_lvid(cmd, lvid_s)))
                return 0;
 
-       if (!_passes_activation_filter(cmd, lv)) {
+       if (filter && !_passes_activation_filter(cmd, lv)) {
                log_verbose("Not activating %s/%s due to config file settings",
                            lv->vg->name, lv->name);
                return 0;
@@ -567,13 +631,25 @@ int lv_activate(struct cmd_context *cmd, const char *lvid_s)
                return 1;
 
        memlock_inc();
-       r = _lv_activate(lv);
+       r = _lv_activate_lv(lv);
        memlock_dec();
        fs_unlock();
 
        return r;
 }
 
+/* Activate LV */
+int lv_activate(struct cmd_context *cmd, const char *lvid_s)
+{
+       return _lv_activate(cmd, lvid_s, 0);
+}
+
+/* Activate LV only if it passes filter */
+int lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s)
+{
+       return _lv_activate(cmd, lvid_s, 1);
+}
+
 int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv)
 {
        struct lvinfo info;

diff --git a/lib/activate/activate.h b/lib/activate/activate.h
index e59108492c7b723c075384333688795f38665b18..0f2441dc0ea1467d3bb6bf53b6aef0688cf8b396 100644 (file)
--- a/lib/activate/activate.h
+++ b/lib/activate/activate.h
@@ -30,9 +30,12 @@ int library_version(char *version, size_t size);
 
 void activation_exit(void);
 
+int lv_suspend(struct cmd_context *cmd, const char *lvid_s);
 int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s);
+int lv_resume(struct cmd_context *cmd, const char *lvid_s);
 int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s);
 int lv_activate(struct cmd_context *cmd, const char *lvid_s);
+int lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s);
 int lv_deactivate(struct cmd_context *cmd, const char *lvid_s);
 
 int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv);
@@ -41,6 +44,13 @@ int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv);
  * Returns 1 if info structure has been populated, else 0.
  */
 int lv_info(const struct logical_volume *lv, struct lvinfo *info);
+
+/*
+ * Returns 1 if activate_lv has been set: 1 = activate; 0 = don't.
+ */
+int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
+                         int *activate_lv);
+
 /*
  * Returns 1 if percent has been set, else 0.
  */