lvmlockd: always disallow mirror splitting

lv_raid_split() was correctly prevented in a shared VG,
but lv_raid_split_and_track() was missing that check.

diff --git a/WHATS_NEW b/WHATS_NEW
index 32bbc4194be39a9207ddc90307931c6fe8eb59d8..e6cc18db009b03b82dba507c3e8f82eb3ef4dd45 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.174 - 
 =================================
+  Prevent raid1 split with trackchanges in a shared VG.
   Avoid double unlocking of client & lockspace mutexes in lvmlockd.
   Fix leaking of file descriptor for non-blocking filebased locking.
   Fix check for 2nd mda at end of disk fits if using pvcreate --restorefile.

diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 043292849d73c708dc1a6ca713d499bfd3bb4093..72223ca91bd4a854cf790bdba13eb36b9db6c7f8 100644 (file)
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -3426,6 +3426,12 @@ int lv_raid_split_and_track(struct logical_volume *lv,
        int s;
        struct lv_segment *seg = first_seg(lv);
 
+       if (is_lockd_type(lv->vg->lock_type)) {
+               log_error("Splitting raid image is not allowed with lock_type %s.",
+                         lv->vg->lock_type);
+               return 0;
+       }
+
        if (!seg_is_mirrored(seg)) {
                log_error("Unable to split images from non-mirrored RAID.");
                return 0;