There are some error messages we don't really understand what happens.
This patch fixes those messages.
Signed-off-by: Kazuya Mio <[email protected]>
---
misc/e4defrag.c | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
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]);