From fe686a518028d887374a0ca4fa12f55c461fa7e2 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 10 Jul 2006 19:17:40 +0000 Subject: [PATCH] Don't ignore persistent minor numbers when activating. --- WHATS_NEW | 1 + lib/activate/dev_manager.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index fa8278d07..6e075d9c5 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.07 - ================================= + Don't ignore persistent minor numbers when activating. Use RTLD_GLOBAL when loading shared libraries. Add some forgotten memlock checks to _vg_read to protect against full scans. Add mutex to dmeventd_mirror to avoid concurrent execution. diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 46e659312..9056f03ba 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -866,8 +866,8 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, * Major/minor settings only apply to the visible layer. */ if (!(dnode = dm_tree_add_new_dev(dtree, name, dlid, - layer ? (uint32_t) lv->major : UINT32_C(0), - layer ? (uint32_t) lv->minor : UINT32_C(0), + layer ? UINT32_C(0) : (uint32_t) lv->major, + layer ? UINT32_C(0) : (uint32_t) lv->minor, _read_only_lv(lv), (lv->vg->status & PRECOMMITTED) ? 1 : 0, lvlayer)))