LVM2/tools polldaemon.c

LVM2/tools polldaemon.c

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-07-01 17:05:12

Modified files:
	tools          : polldaemon.c 

Log message:
	Add lvmcache_init() to polldaemon initialization.
	
	Signed-off-by: Petr Rockai <me@mornfall.net>
	Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/polldaemon.c.diff?cvsroot=lvm2&r1=1.19&r2=1.20

--- LVM2/tools/polldaemon.c	2009/07/01 17:00:52	1.19
+++ LVM2/tools/polldaemon.c	2009/07/01 17:05:12	1.20
@@ -57,6 +57,7 @@
 	strncpy(*cmd->argv, "(lvm2copyd)", strlen(*cmd->argv));
 
 	reset_locking();
+	lvmcache_init();
 	dev_close_all();
 
 	return 1;

LVM2/tools polldaemon.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-02-18 15:05:40

Modified files:
	tools          : polldaemon.c 

Log message:
	Use return_0 to get bactrace

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/polldaemon.c.diff?cvsroot=lvm2&r1=1.43&r2=1.44

--- LVM2/tools/polldaemon.c	2011/01/19 23:11:39	1.43
+++ LVM2/tools/polldaemon.c	2011/02/18 15:05:40	1.44
@@ -148,7 +148,7 @@
 	/* Finished? Or progress to next segment? */
 	if (progress == PROGRESS_FINISHED_ALL) {
 		if (!parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed))
-			return 0;
+			return_0;
 	} else {
 		if (parms->poll_fns->update_metadata &&
 		    !parms->poll_fns->update_metadata(cmd, vg, lv, lvs_changed, 0)) {
@@ -211,7 +211,7 @@
 
 		if (!_check_lv_status(cmd, vg, lv, name, parms, &finished)) {
 			unlock_and_free_vg(cmd, vg, vg->name);
-			return 0;
+			return_0;
 		}
 
 		unlock_and_free_vg(cmd, vg, vg->name);

LVM2/tools polldaemon.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2012-03-01 23:20:46

Modified files:
	tools          : polldaemon.c 

Log message:
	Check for error from dup2
	
	Do not take correct fd as error result.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/polldaemon.c.diff?cvsroot=lvm2&r1=1.48&r2=1.49

--- LVM2/tools/polldaemon.c	2012/02/28 14:24:58	1.48
+++ LVM2/tools/polldaemon.c	2012/03/01 23:20:45	1.49
@@ -67,9 +67,9 @@
 		_exit(ECMD_FAILED);
 	}
 
-	if (dup2(null_fd, STDIN_FILENO)  || /* reopen stdin */
-	    dup2(null_fd, STDOUT_FILENO) || /* reopen stdout */
-	    dup2(null_fd, STDERR_FILENO)) { /* reopen stderr */
+	if ((dup2(null_fd, STDIN_FILENO) < 0)  || /* reopen stdin */
+	    (dup2(null_fd, STDOUT_FILENO) < 0) || /* reopen stdout */
+	    (dup2(null_fd, STDERR_FILENO) < 0)) { /* reopen stderr */
 		log_sys_error("dup2", "redirect");
 		(void) close(null_fd);
 		_exit(ECMD_FAILED);