From: Alasdair Kergon <agk@redhat.com>
Date: Tue, 23 Apr 2002 21:47:50 +0000 (+0000)
Subject: Commit snapshot-related changes preparing for the next beta release.
X-Git-Tag: v2_02_91~5612
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=671b6aa602936ad7f9c975800954a9fa4315de85;p=lvm2.git

Commit snapshot-related changes preparing for the next beta release.
---

diff --git a/libdm/ioctl/libdevmapper.c b/libdm/ioctl/libdevmapper.c
index 94d50ad38..1869186f7 100644
--- a/libdm/ioctl/libdevmapper.c
+++ b/libdm/ioctl/libdevmapper.c
@@ -26,16 +26,16 @@
 #define ALIGNMENT sizeof(int)
 
 static char *dm_cmd_list[] = {
-        "create",
-        "reload",
-        "remove",
-        "remove_all",
-        "suspend",
-        "resume",
-        "info",
-        "deps",
-        "rename",
-        "version"
+	"create",
+	"reload",
+	"remove",
+	"remove_all",
+	"suspend",
+	"resume",
+	"info",
+	"deps",
+	"rename",
+	"version"
 };
 
 void dm_task_destroy(struct dm_task *dmt)
@@ -358,11 +358,10 @@ int dm_task_run(struct dm_task *dmt)
 		break;
 
 	case DM_DEVICE_RENAME:
-	        rename_dev_node(dmt->dev_name, dmt->newname);
+		rename_dev_node(dmt->dev_name, dmt->newname);
 		break;
 	}
 
-
 	dmt->dmi = dmi;
 	close(fd);
 	return 1;
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 0ce5b151d..00879fe99 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -204,7 +204,7 @@ int rename_dev_node(const char *old_name, const char *new_name)
 	_build_dev_path(oldpath, sizeof(oldpath), old_name);
 	_build_dev_path(newpath, sizeof(newpath), new_name);
 
-	if (stat(newpath, &info) >= 0) {
+	if (stat(newpath, &info) == 0) {
 		if (!S_ISBLK(info.st_mode)) {
 			log_error("A non-block device file at '%s' "
 				  "is already present", newpath);
@@ -212,8 +212,9 @@ int rename_dev_node(const char *old_name, const char *new_name)
 		}
 
 		if (unlink(newpath) < 0) {
-		        if (errno == EPERM) { /* devfs, entry has already been renamed */
-			      return 1;
+			if (errno == EPERM) {	
+				/* devfs, entry has already been renamed */
+				return 1;
 			}
 			log_error("Unable to unlink device node for '%s'",
 				  new_name);
@@ -222,7 +223,8 @@ int rename_dev_node(const char *old_name, const char *new_name)
 	}
 
 	if (rename(oldpath, newpath) < 0) {
-		log_error("Unable to rename device node from '%s' to '%s'", old_name, new_name);
+		log_error("Unable to rename device node from '%s' to '%s'",
+			  old_name, new_name);
 		return 0;
 	}