From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 8 Nov 2002 17:07:21 +0000 (-0500)
Subject: Synchronize with EVMS CVS.  Add better error handling
X-Git-Tag: E2FSPROGS-1_31~16
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d5f445c603ab54deb43192e1caede941ba0af879;p=tools%2Fe2fsprogs.git

Synchronize with EVMS CVS.  Add better error handling
for child processes that die unexpectedly.
---

diff --git a/lib/evms/ChangeLog b/lib/evms/ChangeLog
index 1e7089e..307163c 100644
--- a/lib/evms/ChangeLog
+++ b/lib/evms/ChangeLog
@@ -1,5 +1,13 @@
 2002-11-08  Theodore Ts'o  <tytso@mit.edu>
 
+	* fs_ext2.c (fs_expand, fs_shrink): Synchronize with EVMS CVS rev
+		1.13 (2002/09/03).  Add better error handling for child
+		processes that die unexpectedly.
+	
+	* fsimext2.c (fsim_mkfs, fsim_fsck): Synchronize with EVMS CVS rev
+		1.6 (2002/09/03).  Add better error handling for child
+		processes that die unexpectedly.
+
 	* fs_ext2.c (fs_expand): Synchronize with EVMS CVS rev 1.12
 		(2002/08/28): Use the EVMS_IS_MOUNTED macro.
 
diff --git a/lib/evms/fs_ext2.c b/lib/evms/fs_ext2.c
index 2182add..06c4844 100644
--- a/lib/evms/fs_ext2.c
+++ b/lib/evms/fs_ext2.c
@@ -370,6 +370,8 @@ static int fs_expand( logical_volume_t * volume,
 			/* get expand exit code */
 			LOG("Expand completed with rc = %d \n",status);
 			rc = WEXITSTATUS(status);
+		} else {
+			rc = EINTR;
 		}
 	}
 	if (buffer) {
@@ -525,6 +527,8 @@ static int fs_shrink( logical_volume_t * volume,
 			/* get shrink exit code */
 			LOG("Shrink completed with rc = %d \n",status);
 			rc = WEXITSTATUS(status);
+		} else {
+			rc = EINTR;
 		}
 	}
 	if (buffer) {
diff --git a/lib/evms/fsimext2.c b/lib/evms/fsimext2.c
index 7eeeb9c..a0e7344 100644
--- a/lib/evms/fsimext2.c
+++ b/lib/evms/fsimext2.c
@@ -139,7 +139,9 @@ int fsim_mkfs(logical_volume_t * volume, option_array_t * options )
             if ( WIFEXITED(status) ) {
                 /* get mke2fs exit code */
                 rc = WEXITSTATUS(status);
-            }
+            } else {
+		    rc = EINTR;
+	    }
     }
 
     return rc;
@@ -339,6 +341,8 @@ int fsim_fsck(logical_volume_t * volume, option_array_t * options,
 			LOG("e2fsck completed with exit code %d \n",
 			    *ret_status);
 			rc = 0;
+		} else {
+			rc = EINTR;
 		}
 	}