Merge pull request #122 from hclee/for-next

For next

Author: namjaejeon

fsck/de_iter.c

@@ -45,12 +45,11 @@ static int read_ahead_first_blocks(struct exfat_de_iter *iter)
 	clus_count = iter->parent->size / exfat->clus_size;
 
 	if (clus_count > 1) {
-		iter->ra_begin_offset = MAX((int)exfat->clus_size -
-				iter->ra_partial_size, 0);
+		iter->ra_begin_offset = 0;
 		iter->ra_next_clus = 1;
 		size = exfat->clus_size;
 	} else {
-		iter->ra_begin_offset = iter->ra_partial_size;
+		iter->ra_begin_offset = 0;
 		iter->ra_next_clus = 0;
 		size = iter->ra_partial_size;
 	}
@@ -73,7 +72,7 @@ static int read_ahead_next_blocks(struct exfat_de_iter *iter,
 	struct exfat *exfat = iter->exfat;
 	off_t device_offset;
 	clus_t clus_count, ra_clus, ra_p_clus;
-	unsigned int size, ra_offset;
+	unsigned int size;
 	int ret = 0;
 
 	clus_count = iter->parent->size / exfat->clus_size;
@@ -96,18 +95,16 @@ static int read_ahead_next_blocks(struct exfat_de_iter *iter,
 			iter->ra_begin_offset = 0;
 		}
 	} else {
-		ra_offset = offset + iter->ra_partial_size;
-		if (ra_offset >= iter->ra_begin_offset &&
-				ra_offset + iter->ra_partial_size <=
+		if (offset >= iter->ra_begin_offset &&
+				offset + iter->ra_partial_size <=
 				exfat->clus_size) {
-			device_offset = exfat_c2o(exfat, p_clus) + ra_offset;
+			device_offset = exfat_c2o(exfat, p_clus) +
+				offset + iter->ra_partial_size;
 			ret = posix_fadvise(exfat->blk_dev->dev_fd,
 					device_offset, iter->ra_partial_size,
 					POSIX_FADV_WILLNEED);
-
 			iter->ra_begin_offset =
-				ra_offset + iter->ra_partial_size;
-			/* TODO: read blocks of the first child directory */
+				offset + iter->ra_partial_size;
 		}
 	}
 
@@ -117,12 +114,40 @@ static int read_ahead_next_blocks(struct exfat_de_iter *iter,
 #endif
 }
 
+static int read_ahead_next_dir_blocks(struct exfat_de_iter *iter)
+{
+#ifdef POSIX_FADV_WILLNEED
+	struct exfat *exfat = iter->exfat;
+	struct list_head *current;
+	struct exfat_inode *next_inode;
+	off_t offset;
+
+	if (list_empty(&exfat->dir_list))
+		return -EINVAL;
+
+	current = exfat->dir_list.next;
+	if (iter->parent == list_entry(current, struct exfat_inode, list) &&
+			current->next != &exfat->dir_list) {
+		next_inode = list_entry(current->next, struct exfat_inode,
+				list);
+		offset = exfat_c2o(exfat, next_inode->first_clus);
+		return posix_fadvise(exfat->blk_dev->dev_fd, offset,
+				iter->ra_partial_size,
+				POSIX_FADV_WILLNEED);
+	}
+
+	return 0;
+#else
+	return -ENOTSUP;
+#endif
+}
+
 static ssize_t read_block(struct exfat_de_iter *iter, unsigned int block)
 {
 	struct exfat *exfat = iter->exfat;
 	struct buffer_desc *desc, *prev_desc;
 	off_t device_offset;
-	int ret;
+	ssize_t ret;
 
 	desc = &iter->buffer_desc[block & 0x01];
 	if (block == 0) {
@@ -154,14 +179,24 @@ static ssize_t read_block(struct exfat_de_iter *iter, unsigned int block)
 		}
 	}
 
-	read_ahead_next_blocks(iter,
-			(block * iter->read_size) / exfat->clus_size,
-			(block * iter->read_size) % exfat->clus_size,
-			desc->p_clus);
-
 	device_offset = exfat_c2o(exfat, desc->p_clus) + desc->offset;
-	return exfat_read(exfat->blk_dev->dev_fd, desc->buffer,
+	ret = exfat_read(exfat->blk_dev->dev_fd, desc->buffer,
 			iter->read_size, device_offset);
+	if (ret <= 0)
+		return ret;
+
+	/*
+	 * if a buffer is filled with dentries, read blocks ahead of time,
+	 * otherwise read blocks of the next directory in advance.
+	 */
+	if (desc->buffer[iter->read_size - 32] != EXFAT_LAST)
+		read_ahead_next_blocks(iter,
+				(block * iter->read_size) / exfat->clus_size,
+				(block * iter->read_size) % exfat->clus_size,
+				desc->p_clus);
+	else
+		read_ahead_next_dir_blocks(iter);
+	return ret;
 }
 
 int exfat_de_iter_init(struct exfat_de_iter *iter, struct exfat *exfat,
@@ -175,10 +210,14 @@ int exfat_de_iter_init(struct exfat_de_iter *iter, struct exfat *exfat,
 		iter->ra_partial_size = MAX(4 * KB, exfat->clus_size / 2);
 	else
 		iter->ra_partial_size = exfat->clus_size / 4;
+	iter->ra_partial_size = MIN(iter->ra_partial_size, 8 * KB);
 
 	if (!iter->buffer_desc)
 		iter->buffer_desc = exfat->buffer_desc;
 
+	if (iter->parent->size == 0)
+		return EOF;
+
 	read_ahead_first_blocks(iter);
 	if (read_block(iter, 0) != (ssize_t)iter->read_size) {
 		exfat_err("failed to read directory entries.\n");

fsck/fsck.c

@@ -1090,11 +1090,8 @@ static int read_children(struct exfat *exfat, struct exfat_inode *dir)
 	struct exfat_inode *node = NULL;
 	struct exfat_dentry *dentry;
 	int dentry_count;
-	struct list_head sub_dir_list;
 	struct exfat_de_iter *de_iter;
 
-	INIT_LIST_HEAD(&sub_dir_list);
-
 	de_iter = &exfat->de_iter;
 	ret = exfat_de_iter_init(de_iter, exfat, dir);
 	if (ret == EOF)
@@ -1128,7 +1125,7 @@ static int read_children(struct exfat *exfat, struct exfat_inode *dir)
 			if ((node->attr & ATTR_SUBDIR) && node->size) {
 				node->parent = dir;
 				list_add_tail(&node->sibling, &dir->children);
-				list_add_tail(&node->list, &sub_dir_list);
+				list_add_tail(&node->list, &exfat->dir_list);
 			} else
 				free_exfat_inode(node);
 			break;
@@ -1168,7 +1165,6 @@ static int read_children(struct exfat *exfat, struct exfat_inode *dir)
 		exfat_de_iter_advance(de_iter, dentry_count);
 	}
 out:
-	list_splice(&sub_dir_list, &exfat->dir_list);
 	exfat_de_iter_flush(de_iter);
 	return 0;
 err:
@@ -1413,7 +1409,7 @@ static void exfat_show_info(struct exfat *exfat, const char *dev_name,
 			errors ? "checking stopped" : "clean",
 			exfat_stat.dir_count, exfat_stat.file_count);
 	if (errors || exfat->dirty)
-		printf("%s: errors %ld, fixed %ld\n", dev_name,
+		printf("%s: files corrupted %ld, files fixed %ld\n", dev_name,
 			exfat_stat.error_count, exfat_stat.fixed_count);
 }
 

fsck/repair.c

@@ -41,7 +41,7 @@ static struct exfat_repair_problem problems[] = {
 	{ER_FILE_SMALLER_SIZE, ERF_DEFAULT_NO, ERP_TRUNCATE},
 	{ER_FILE_LARGER_SIZE, ERF_DEFAULT_NO, ERP_TRUNCATE},
 	{ER_FILE_DUPLICATED_CLUS, ERF_DEFAULT_NO, ERP_TRUNCATE},
-	{ER_FILE_ZERO_NOFAT, ERF_DEFAULT_NO, ERP_FIX},
+	{ER_FILE_ZERO_NOFAT, ERF_DEFAULT_YES | ERF_PREEN_YES, ERP_FIX},
 };
 
 static struct exfat_repair_problem *find_problem(er_problem_code_t prcode)