Patchwork [10/11,RESEND] e4defrag: Fix error messages more clearly

login
register
mail settings
Submitter Kazuya Mio
Date June 15, 2011, 6:37 a.m.
Message ID <4DF8532A.4000107@sx.jp.nec.com>
Download mbox | patch
Permalink /patch/100488/
State Superseded
Headers show

Comments

Kazuya Mio - June 15, 2011, 6:37 a.m.
There are some error messages we don't really understand what happens.
This patch fixes those messages.

Signed-off-by: Kazuya Mio <k-mio@sx.jp.nec.com>
---
 misc/e4defrag.c |   39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/misc/e4defrag.c b/misc/e4defrag.c
index b87aae9..76e84a2 100644
--- a/misc/e4defrag.c
+++ b/misc/e4defrag.c
@@ -316,6 +316,7 @@  static int is_ext4(const char *file)
 
 		mnt_type = realloc(mnt_type, strlen(mnt->mnt_type) + 1);
 		if (mnt_type == NULL) {
+			perror("Failed to allocate memory");
 			endmntent(fp);
 			return -1;
 		}
@@ -726,11 +727,9 @@  static int get_file_extents(int fd, struct fiemap_extent_list **ext_list_head)
 		!(ext_buf[EXTENT_MAX_COUNT-1].fe_flags
 					& FIEMAP_EXTENT_LAST));
 
-	FREE(fiemap_buf);
-	return 0;
 out:
 	FREE(fiemap_buf);
-	return -1;
+	return errno ? -1 : 0;
 }
 
 /*
@@ -889,7 +888,7 @@  static int call_defrag(int fd, int donor_fd, const char *file,
 			if (mode_flag & DETAIL) {
 				printf("\n");
 				PRINT_ERR_MSG_WITH_ERRNO(
-					"Failed to free page");
+					"Failed to synchronize the file");
 			} else {
 				printf("\t[ NG ]\n");
 			}
@@ -987,15 +986,6 @@  static int file_defrag(const char *file, const struct stat64 *buf,
 		return 0;
 	}
 
-	/* Has no blocks */
-	if (buf->st_blocks == 0) {
-		if (mode_flag & DETAIL) {
-			PRINT_FILE_NAME(file);
-			IN_FTW_PRINT_ERR_MSG("File has no blocks");
-		}
-		return 0;
-	}
-
 	fd = open64(file, O_RDWR);
 	if (fd < 0) {
 		if (mode_flag & DETAIL) {
@@ -1013,6 +1003,12 @@  static int file_defrag(const char *file, const struct stat64 *buf,
 			PRINT_ERR_MSG_WITH_ERRNO(NGMSG_FILE_EXTENT);
 		}
 		goto out;
+	} else if (orig_list == NULL) {
+		if (mode_flag & DETAIL) {
+			PRINT_FILE_NAME(file);
+			IN_FTW_PRINT_ERR_MSG("File has no blocks");
+		}
+		goto out;
 	}
 
 	/* Count file fragments before defrag */
@@ -1112,6 +1108,12 @@  static int file_defrag(const char *file, const struct stat64 *buf,
 			PRINT_ERR_MSG_WITH_ERRNO(NGMSG_FILE_EXTENT);
 		}
 		goto out;
+	} else if (donor_list == NULL) {
+		if (mode_flag & DETAIL) {
+			PRINT_FILE_NAME(file);
+			IN_FTW_PRINT_ERR_MSG("Temporary file was removed");
+		}
+		goto out;
 	}
 
 	donor_score = get_fragment_score(donor_fd, threshold);
@@ -1156,7 +1158,7 @@  check_improvement:
 		file_frags_end = file_frag_count(fd);
 		if (file_frags_end < 0) {
 			printf("\n");
-			PRINT_ERR_MSG_WITH_ERRNO(NGMSG_FILE_INFO);
+			PRINT_ERR_MSG_WITH_ERRNO(NGMSG_FILE_EXTENT);
 			goto out;
 		}
 
@@ -1296,10 +1298,7 @@  int main(int argc, char *argv[])
 		}
 
 		switch (arg_type) {
-		case DIRNAME:
-			printf("ext4 defragmentation for directory(%s)\n",
-					argv[i]);
-
+		case DIRNAME: {
 			int mount_dir_len = 0;
 			mount_dir_len = strnlen(lost_found_dir, PATH_MAX);
 
@@ -1327,6 +1326,10 @@  int main(int argc, char *argv[])
 				/* "e4defrag mount_piont_dir/else_dir" */
 				memset(lost_found_dir, 0, PATH_MAX + 1);
 			}
+
+			printf("ext4 defragmentation for directory(%s)\n",
+					argv[i]);
+		}
 		case DEVNAME:
 			if (arg_type == DEVNAME) {
 				strncpy(lost_found_dir, dir_name,