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 daemons/clvmd/lvm-functions.c Date: Thu, 01 Mar 2012 09:54:00 -0000 [thread overview] Message-ID: <20120301095424.31796.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2012-03-01 09:54:24 Modified files: . : WHATS_NEW daemons/clvmd : lvm-functions.c Log message: Check for allocation error return ENOMEM when malloc fails. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2327&r2=1.2328 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.130&r2=1.131 --- LVM2/WHATS_NEW 2012/02/29 22:08:57 1.2327 +++ LVM2/WHATS_NEW 2012/03/01 09:54:23 1.2328 @@ -1,5 +1,6 @@ Version 2.02.94 - ==================================== + Check for allocation failure in hold_lock() in clvmd. Use set_lv() (wipe initial 4KiB) for non zeroed thin volume. Allow cluster mirrors to handle the absence of the checkpoint lib (libSaCkpt). Revert free of allocated segtype in init segment error path (2.02.89). --- LVM2/daemons/clvmd/lvm-functions.c 2012/02/23 22:50:50 1.130 +++ LVM2/daemons/clvmd/lvm-functions.c 2012/03/01 09:54:24 1.131 @@ -167,11 +167,15 @@ return lvi; } -static void insert_info(const char *resource, struct lv_info *lvi) +static int insert_info(const char *resource, struct lv_info *lvi) { + int ret; + pthread_mutex_lock(&lv_hash_lock); - dm_hash_insert(lv_hash, resource, lvi); + ret = dm_hash_insert(lv_hash, resource, lvi); pthread_mutex_unlock(&lv_hash_lock); + + return ret; } static void remove_info(const char *resource) @@ -277,8 +281,10 @@ errno = saved_errno; } else { lvi = malloc(sizeof(struct lv_info)); - if (!lvi) + if (!lvi) { + errno = ENOMEM; return -1; + } lvi->lock_mode = mode; status = sync_lock(resource, mode, flags & ~LCKF_CONVERT, &lvi->lock_id); @@ -288,7 +294,10 @@ DEBUGLOG("hold_lock. lock at %d failed: %s\n", mode, strerror(errno)); } else - insert_info(resource, lvi); + if (!insert_info(resource, lvi)) { + errno = ENOMEM; + return -1; + } errno = saved_errno; }
next reply other threads:[~2012-03-01 9:54 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-01 9:54 zkabelac [this message] -- strict thread matches above, loose matches on Subject: below -- 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 2010-01-26 8:00 mbroz 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=20120301095424.31796.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).