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/lib/activate activate.c activate.h
Date: Fri, 11 Nov 2011 15:14:00 -0000	[thread overview]
Message-ID: <20111111151407.10428.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2011-11-11 15:14:05

Modified files:
	lib/activate   : activate.c activate.h 

Log message:
	Fix function name in previous patch.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/activate.c.diff?cvsroot=lvm2&r1=1.221&r2=1.222
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/activate.h.diff?cvsroot=lvm2&r1=1.86&r2=1.87

--- LVM2/lib/activate/activate.c	2011/11/11 15:11:10	1.221
+++ LVM2/lib/activate/activate.c	2011/11/11 15:14:05	1.222
@@ -147,7 +147,7 @@
 {
 	return 0;
 }
-int dm_prefix_check(const char *sysfs_dir, int major, int minor, const char *prefix)
+int lvm_dm_prefix_check(const char *sysfs_dir, int major, int minor, const char *prefix)
 {
 	return 0;
 }
@@ -443,14 +443,14 @@
 	return r;
 }
 
-int dm_prefix_check(const char *sysfs_dir, int major, int minor, const char *prefix)
+int lvm_dm_prefix_check(const char *sysfs_dir, int major, int minor, const char *prefix)
 {
 	struct dm_task *dmt;
 	const char *uuid;
 	int r;
 
 	if (!(dmt = dm_task_create(DM_DEVICE_STATUS)))
-		return 0;
+		return_0;
 
 	if (!dm_task_set_minor(dmt, minor) ||
 	    !dm_task_set_major(dmt, major) ||
@@ -463,7 +463,7 @@
 	r = strncasecmp(uuid, prefix, strlen(prefix));
 	dm_task_destroy(dmt);
 
-	return (r == 0) ? 1 : 0;
+	return r ? 0 : 1;
 }
 
 int module_present(struct cmd_context *cmd, const char *target_name)
--- LVM2/lib/activate/activate.h	2011/11/11 15:11:10	1.86
+++ LVM2/lib/activate/activate.h	2011/11/11 15:14:05	1.87
@@ -53,7 +53,7 @@
 		   int use_modprobe);
 int target_version(const char *target_name, uint32_t *maj,
 		   uint32_t *min, uint32_t *patchlevel);
-int dm_prefix_check(const char *sysfs_dir, int major, int minor, const char *prefix);
+int lvm_dm_prefix_check(const char *sysfs_dir, int major, int minor, const char *prefix);
 int list_segment_modules(struct dm_pool *mem, const struct lv_segment *seg,
 			 struct dm_list *modules);
 int list_lv_modules(struct dm_pool *mem, const struct logical_volume *lv,


             reply	other threads:[~2011-11-11 15:14 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-11 15:14 mbroz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-12-21 13:10 zkabelac
2008-04-10 21:34 wysochanski
2004-03-26 19:52 agk
2004-03-26 15:35 agk
2004-03-08 18:54 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=20111111151407.10428.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).