public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/activate/dev_manager.c Date: Fri, 19 Dec 2008 15:23:00 -0000 [thread overview] Message-ID: <20081219152304.12928.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2008-12-19 15:23:03 Modified files: . : WHATS_NEW lib/activate : dev_manager.c Log message: Fail add tree node when requested major/minor is used. Check for major/minor collision is added in _add_dev_to_dtree() where we already read info by uuid, so in the case of requesting major/minor it queries device-mapper by major/minor for device availability. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=204992 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1011&r2=1.1012 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/dev_manager.c.diff?cvsroot=lvm2&r1=1.143&r2=1.144 --- LVM2/WHATS_NEW 2008/12/19 14:43:02 1.1011 +++ LVM2/WHATS_NEW 2008/12/19 15:23:03 1.1012 @@ -1,5 +1,6 @@ Version 2.02.44 - ==================================== + Check if requested major/minor pair is already used. Fix incorrect return value in help function. Fix vgrename using UUID in case there are VGs with the same name. Fix segfault when invalid field given in reporting commands. --- LVM2/lib/activate/dev_manager.c 2008/12/19 14:22:48 1.143 +++ LVM2/lib/activate/dev_manager.c 2008/12/19 15:23:03 1.144 @@ -93,7 +93,8 @@ * Low level device-layer operations. */ static struct dm_task *_setup_task(const char *name, const char *uuid, - uint32_t *event_nr, int task) + uint32_t *event_nr, int task, + uint32_t major, uint32_t minor) { struct dm_task *dmt; @@ -109,12 +110,17 @@ if (event_nr) dm_task_set_event_nr(dmt, *event_nr); + if (major) { + dm_task_set_major(dmt, major); + dm_task_set_minor(dmt, minor); + } + return dmt; } static int _info_run(const char *name, const char *dlid, struct dm_info *info, uint32_t *read_ahead, int mknodes, int with_open_count, - int with_read_ahead) + int with_read_ahead, uint32_t major, uint32_t minor) { int r = 0; struct dm_task *dmt; @@ -122,7 +128,7 @@ dmtask = mknodes ? DM_DEVICE_MKNODES : DM_DEVICE_INFO; - if (!(dmt = _setup_task(name, dlid, 0, dmtask))) + if (!(dmt = _setup_task(name, dlid, 0, dmtask, major, minor))) return_0; if (!with_open_count) @@ -206,23 +212,28 @@ { if (!mknodes && dlid && *dlid) { if (_info_run(NULL, dlid, info, read_ahead, 0, with_open_count, - with_read_ahead) && + with_read_ahead, 0, 0) && info->exists) return 1; else if (_info_run(NULL, dlid + sizeof(UUID_PREFIX) - 1, info, read_ahead, 0, with_open_count, - with_read_ahead) && + with_read_ahead, 0, 0) && info->exists) return 1; } if (name) return _info_run(name, NULL, info, read_ahead, mknodes, - with_open_count, with_read_ahead); + with_open_count, with_read_ahead, 0, 0); return 0; } +static int _info_by_dev(uint32_t major, uint32_t minor, struct dm_info *info) +{ + return _info_run(NULL, NULL, info, NULL, 0, 0, 0, major, minor); +} + int dev_manager_info(struct dm_pool *mem, const char *name, const struct logical_volume *lv, int with_mknodes, int with_open_count, int with_read_ahead, @@ -252,7 +263,7 @@ char *type = NULL; char *params = NULL; - if (!(dmt = _setup_task(name, uuid, 0, DM_DEVICE_STATUS))) + if (!(dmt = _setup_task(name, uuid, 0, DM_DEVICE_STATUS, 0, 0))) return_0; if (!dm_task_no_open_count(dmt)) @@ -339,7 +350,7 @@ *percent = -1; if (!(dmt = _setup_task(name, dlid, event_nr, - wait ? DM_DEVICE_WAITEVENT : DM_DEVICE_STATUS))) + wait ? DM_DEVICE_WAITEVENT : DM_DEVICE_STATUS, 0, 0))) return_0; if (!dm_task_no_open_count(dmt)) @@ -610,7 +621,7 @@ struct logical_volume *lv, const char *layer) { char *dlid, *name; - struct dm_info info; + struct dm_info info, info2; if (!(name = build_dm_name(dm->mem, lv->vg->name, lv->name, layer))) return_0; @@ -624,6 +635,27 @@ return 0; } + /* + * For top level volumes verify that existing device match + * requested major/minor and that major/minor pair is available for use + */ + if (!layer && lv->major != -1 && lv->minor != -1) { + if (info.exists && (info.major != lv->major || info.minor != lv->minor)) { + log_error("Volume %s (%" PRIu32 ":%" PRIu32")" + " differs from already active device " + "(%" PRIu32 ":%" PRIu32")", + lv->name, lv->major, lv->minor, info.major, info.minor); + return 0; + } + if (!info.exists && _info_by_dev(lv->major, lv->minor, &info2) && + info2.exists) { + log_error("The requested major:minor pair " + "(%" PRIu32 ":%" PRIu32") is already used", + lv->major, lv->minor); + return 0; + } + } + if (info.exists && !dm_tree_add_dev(dtree, info.major, info.minor)) { log_error("Failed to add device (%" PRIu32 ":%" PRIu32") to dtree", info.major, info.minor);
next reply other threads:[~2008-12-19 15:23 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2008-12-19 15:23 mbroz [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-05-16 12:50 agk 2012-04-20 14:17 jbrassow 2012-03-05 14:15 zkabelac 2012-02-01 13:47 zkabelac 2012-01-28 20:12 zkabelac 2012-01-23 20:56 jbrassow 2012-01-20 21:56 snitzer 2011-12-21 12:59 zkabelac 2011-11-18 19:42 zkabelac 2011-10-11 8:59 zkabelac 2011-10-11 8:57 zkabelac 2011-08-11 4:18 jbrassow 2011-07-06 0:29 agk 2011-07-05 23:10 agk 2011-01-05 14:03 zkabelac 2010-12-08 19:26 agk 2010-10-25 10:37 agk 2010-10-24 17:37 snitzer 2010-08-26 14:21 jbrassow 2010-08-17 1:51 agk 2010-08-03 13:13 zkabelac 2010-05-24 9:01 zkabelac 2010-05-21 14:48 zkabelac 2010-02-08 23:28 snitzer 2010-01-26 7:58 mbroz 2010-01-22 15:40 snitzer 2009-08-03 18:09 agk 2009-05-28 1:11 agk 2009-05-13 14:13 zkabelac 2008-06-05 12:45 agk 2007-05-14 11:27 mbroz 2007-03-08 19:58 agk 2006-11-20 16:45 agk 2006-07-10 19:17 agk 2005-10-18 12:39 agk 2005-08-04 1:27 agk 2005-08-04 1:15 agk 2004-05-12 20:43 agk
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20081219152304.12928.qmail@sourceware.org \ --to=mbroz@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).