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 daemons/clvmd/lvm-functions.c
Date: Tue, 26 Jan 2010 08:00:00 -0000	[thread overview]
Message-ID: <20100126080004.23012.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2010-01-26 08:00:03

Modified files:
	.              : WHATS_NEW 
	daemons/clvmd  : lvm-functions.c 

Log message:
	Unlock shared lock if activation calls failed.
	
	Clvmd should unlock new lock if activation in device-mapper fails.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1408&r2=1.1409
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.83&r2=1.84

--- LVM2/WHATS_NEW	2010/01/26 07:58:23	1.1408
+++ LVM2/WHATS_NEW	2010/01/26 08:00:02	1.1409
@@ -1,5 +1,6 @@
 Version 2.02.60 - 23rd January 2010
 ===================================
+  Unlock shared lock in clvmd if activation calls failed.
   Fix return code of info call for query by uuid.
   Extend cmirrord man page.
   Sleep before first progress check if pvmove/lvconvert interval has prefix '+'.
--- LVM2/daemons/clvmd/lvm-functions.c	2010/01/19 13:25:00	1.83
+++ LVM2/daemons/clvmd/lvm-functions.c	2010/01/26 08:00:03	1.84
@@ -373,17 +373,22 @@
 
 	/* If it's suspended then resume it */
 	if (!lv_info_by_lvid(cmd, resource, &lvi, 0, 0))
-		return EIO;
+		goto error;
 
 	if (lvi.suspended)
 		if (!lv_resume(cmd, resource))
-			return EIO;
+			goto error;
 
 	/* Now activate it */
 	if (!lv_activate(cmd, resource, exclusive))
-		return EIO;
+		goto error;
 
 	return 0;
+
+error:
+	if (oldmode == -1 || oldmode != mode)
+		(void)hold_unlock(resource);
+	return EIO;
 }
 
 /* Resume the LV if it was active */


             reply	other threads:[~2010-01-26  8:00 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-26  8:00 mbroz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-03-01  9:54 zkabelac
2012-02-23 22:50 zkabelac
2011-08-10 11:00 mbroz
2011-03-02 23:38 mbroz
2010-07-01 21:23 mbroz
2010-03-24 22:25 snitzer
2009-12-09 19:01 mbroz
2009-12-09 19:00 mbroz
2009-12-09 18:55 mbroz
2009-12-09 18:45 mbroz
2009-10-22 17:45 agk
2009-10-01 14:14 ccaulfield
2009-08-05 14:18 ccaulfield
2009-03-05 16:25 mbroz
2008-04-08 13:03 ccaulfield
2008-04-04  8:53 ccaulfield
2007-08-24  8:29 pcaulfield
2007-08-23 12:19 pcaulfield
2007-04-24 15:13 pcaulfield
2005-02-14  9:07 pcaulfield
2005-02-02 11:42 pcaulfield
2004-10-04  9:23 pcaulfield

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=20100126080004.23012.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: link
Be 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).