public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW tools/vgreduce.c Date: Fri, 30 Mar 2012 14:59:00 -0000 [thread overview] Message-ID: <20120330145936.1325.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2012-03-30 14:59:36 Modified files: . : WHATS_NEW tools : vgreduce.c Log message: Fix unlocking in error path of vgreduce When vg_read fails, it internally unlocks VG if it's been locked, so in error path we should skip unlock_vg for this case. (user would see ugly internal warning) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2374&r2=1.2375 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgreduce.c.diff?cvsroot=lvm2&r1=1.116&r2=1.117 --- LVM2/WHATS_NEW 2012/03/30 11:39:52 1.2374 +++ LVM2/WHATS_NEW 2012/03/30 14:59:35 1.2375 @@ -1,5 +1,6 @@ Version 2.02.96 - ================================ + Fix unlocking volume group in vgreduce in error path. Exit immediately if LISTEN_PID env var incorrect during systemd handover. Detect VG name being part of the LV name in lvconvert --splitmirrors -n. Fix exclusive lvchange running from other node. (2.02.89) --- LVM2/tools/vgreduce.c 2012/02/27 10:06:58 1.116 +++ LVM2/tools/vgreduce.c 2012/03/30 14:59:35 1.117 @@ -206,6 +206,7 @@ int fixed = 1; int repairing = arg_count(cmd, removemissing_ARG); int saved_ignore_suspended_devices = ignore_suspended_devices(); + int locked = 0; if (!argc && !repairing) { log_error("Please give volume group name and " @@ -260,6 +261,8 @@ && !arg_count(cmd, removemissing_ARG)) goto_out; + locked = !vg_read_error(vg); + if (repairing) { if (!vg_read_error(vg) && !vg_missing_pv_count(vg)) { log_error("Volume group \"%s\" is already consistent", @@ -275,6 +278,7 @@ READ_ALLOW_INCONSISTENT | READ_ALLOW_EXPORTED); + locked |= !vg_read_error(vg); if (vg_read_error(vg) && vg_read_error(vg) != FAILED_READ_ONLY && vg_read_error(vg) != FAILED_INCONSISTENT) goto_out; @@ -314,7 +318,10 @@ } out: init_ignore_suspended_devices(saved_ignore_suspended_devices); - unlock_and_release_vg(cmd, vg, vg_name); + if (locked) + unlock_vg(cmd, vg_name); + + release_vg(vg); return ret;
next reply other threads:[~2012-03-30 14:59 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-30 14:59 zkabelac [this message] -- strict thread matches above, loose matches on Subject: below -- 2007-01-31 16:26 agk 2006-09-07 23:23 agk 2005-12-21 18:51 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=20120330145936.1325.qmail@sourceware.org \ --to=zkabelac@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).