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: Wed, 10 Aug 2011 11:00:00 -0000 [thread overview] Message-ID: <20110810110032.18699.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2011-08-10 11:00:32 Modified files: . : WHATS_NEW daemons/clvmd : lvm-functions.c Log message: Initialise clvmd locks before lvm context to avoid open descriptor leaks. (At least /dev/mapper/control is open after lvm context init.) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2054&r2=1.2055 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.120&r2=1.121 --- LVM2/WHATS_NEW 2011/08/09 18:11:00 1.2054 +++ LVM2/WHATS_NEW 2011/08/10 11:00:32 1.2055 @@ -1,5 +1,6 @@ Version 2.02.87 - =============================== + Initialise clvmd locks before lvm context to avoid open descriptor leaks. Remove obsoleted GULM clvmd cluster locking support. Suppress low-level locking errors and warnings while using --sysinit. Remove unused inconsistent_seqno variable in _vg_read(). --- LVM2/daemons/clvmd/lvm-functions.c 2011/08/09 18:11:00 1.120 +++ LVM2/daemons/clvmd/lvm-functions.c 2011/08/10 11:00:32 1.121 @@ -721,7 +721,7 @@ * but this may not be the case... * I suppose this also comes in handy if clvmd crashes, not that it would! */ -static void *get_initial_state(char **argv) +static int get_initial_state(char **argv) { int lock_mode; char lv[64], vg[64], flags[25], vg_flags[25]; @@ -733,7 +733,7 @@ "r"); if (!lvs) - return NULL; + return 1; while (fgets(line, sizeof(line), lvs)) { if (sscanf(line, "%s %s %s %s\n", vg, lv, flags, vg_flags) == 4) { @@ -773,7 +773,7 @@ } if (fclose(lvs)) DEBUGLOG("lvs fclose failed: %s\n", strerror(errno)); - return NULL; + return 0; } static void lvm2_log_fn(int level, const char *file, int line, int dm_errno, @@ -886,6 +886,10 @@ init_syslog(LOG_DAEMON); openlog("clvmd", LOG_PID, LOG_DAEMON); + /* Initialise already held locks */ + if (get_initial_state(argv)) + log_error("Cannot load initial lock states."); + if (!(cmd = create_toolcontext(1, NULL, 0))) { log_error("Failed to allocate command context"); return 0; @@ -902,8 +906,6 @@ check_config(); init_ignore_suspended_devices(1); - get_initial_state(argv); - /* Trap log messages so we can pass them back to the user */ init_log_fn(lvm2_log_fn); memlock_inc_daemon(cmd);
next reply other threads:[~2011-08-10 11:00 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-10 11: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-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=20110810110032.18699.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).