From: prajnoha@sourceware.org <prajnoha@sourceware.org>
To: lvm-devel@redhat.com
Subject: LVM2/tools dmsetup.c
Date: 6 Aug 2009 15:56:51 -0000 [thread overview]
Message-ID: <20090806155651.23427.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: prajnoha at sourceware.org 2009-08-06 15:56:51
Modified files:
tools : dmsetup.c
Log message:
Fix semaphore includes in dmsetup for udev sync.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/dmsetup.c.diff?cvsroot=lvm2&r1=1.122&r2=1.123
--- LVM2/tools/dmsetup.c 2009/08/06 15:05:10 1.122
+++ LVM2/tools/dmsetup.c 2009/08/06 15:56:50 1.123
@@ -280,34 +280,6 @@
struct dm_split_name *split_name;
};
-static char _yes_no_prompt(const char *prompt, ...)
-{
- int c = 0, ret = 0;
- va_list ap;
-
- do {
- if (c == '\n' || !c) {
- va_start(ap, prompt);
- vprintf(prompt, ap);
- va_end(ap);
- }
-
- if ((c = getchar()) == EOF) {
- ret = 'n';
- break;
- }
-
- c = tolower(c);
- if ((c == 'y') || (c == 'n'))
- ret = c;
- } while (!ret || c != '\n');
-
- if (c != '\n')
- printf("\n");
-
- return ret;
-}
-
static struct dm_task *_get_deps_task(int major, int minor)
{
struct dm_task *dmt;
@@ -804,8 +776,41 @@
return 1;
}
+static int _udevcookies(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
+{
+ return 1;
+}
+
#else
+static char _yes_no_prompt(const char *prompt, ...)
+{
+ int c = 0, ret = 0;
+ va_list ap;
+
+ do {
+ if (c == '\n' || !c) {
+ va_start(ap, prompt);
+ vprintf(prompt, ap);
+ va_end(ap);
+ }
+
+ if ((c = getchar()) == EOF) {
+ ret = 'n';
+ break;
+ }
+
+ c = tolower(c);
+ if ((c == 'y') || (c == 'n'))
+ ret = c;
+ } while (!ret || c != '\n');
+
+ if (c != '\n')
+ printf("\n");
+
+ return ret;
+}
+
static int _udevcomplete_all(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
int max_id, id, sid;
@@ -852,7 +857,6 @@
return 1;
}
-#endif
static int _udevcookies(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
@@ -891,7 +895,7 @@
return 1;
}
-
+#endif
static int _version(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
next reply other threads:[~2009-08-06 15:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-06 15:56 prajnoha [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-01 21:50 LVM2/tools dmsetup.c zkabelac
2012-02-15 14:27 zkabelac
2012-02-15 14:21 prajnoha
2012-01-20 10:58 zkabelac
2011-12-01 14:57 agk
2011-03-29 21:56 zkabelac
2010-12-20 14:36 zkabelac
2010-11-30 22:53 zkabelac
2010-10-25 13:36 zkabelac
2010-07-08 13:31 zkabelac
2010-07-05 22:56 agk
2009-12-11 13:04 zkabelac
2009-08-06 15:05 prajnoha
2008-10-31 18:53 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=20090806155651.23427.qmail@sourceware.org \
--to=prajnoha@sourceware.org \
--cc=lvm-devel@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.