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/tools toollib.c Date: Wed, 10 Jun 2009 11:15:00 -0000 [thread overview] Message-ID: <20090610111529.12465.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2009-06-10 11:15:29 Modified files: tools : toollib.c Log message: Unlock VG in recover_vg if metadata read failed. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/toollib.c.diff?cvsroot=lvm2&r1=1.157&r2=1.158 --- LVM2/tools/toollib.c 2009/06/10 10:15:28 1.157 +++ LVM2/tools/toollib.c 2009/06/10 11:15:29 1.158 @@ -497,10 +497,8 @@ unlock_and_release_vg(cmd, vg, vg_name); dev_close_all(); log_error("Volume group %s inconsistent", vg_name); - if (!(vg = recover_vg(cmd, vg_name, LCK_VG_WRITE))) { - unlock_vg(cmd, vg_name); + if (!(vg = recover_vg(cmd, vg_name, LCK_VG_WRITE))) return ECMD_FAILED; - } consistent = 1; break; } @@ -1209,6 +1207,7 @@ uint32_t lock_type) { int consistent = 1; + struct volume_group *vg; /* Don't attempt automatic recovery without proper locking */ if (lockingfailed()) @@ -1223,7 +1222,10 @@ return NULL; } - return vg_read_internal(cmd, vgname, NULL, &consistent); + if (!(vg = vg_read_internal(cmd, vgname, NULL, &consistent))) + unlock_vg(cmd, vgname); + + return vg; } int apply_lvname_restrictions(const char *name)
next reply other threads:[~2009-06-10 11:15 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-06-10 11:15 mbroz [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-03-04 15:58 zkabelac 2010-12-20 14:05 zkabelac 2010-12-01 12:22 zkabelac 2010-12-01 10:36 zkabelac 2010-10-25 12:08 zkabelac 2010-04-28 12:23 zkabelac 2009-07-15 12:23 wysochanski 2009-07-15 12:15 wysochanski 2009-07-15 5:23 wysochanski 2009-06-10 10:15 mbroz 2009-04-23 16:45 mornfall 2009-04-07 10:22 mbroz 2008-06-11 15:02 meyering 2007-11-12 14:36 agk 2006-11-03 21:23 agk 2006-03-10 15:41 agk 2005-01-19 17:31 agk 2005-01-19 17:31 agk 2004-06-20 15:14 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=20090610111529.12465.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).