From: Charles Manning <cdhmanning@gmail.com>
Date: Fri, 15 May 2020 02:36:57 +0000 (+1200)
Subject: Merge branch 'sizeofsizeof'
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=5af18695480b470eea2a2447a1c5211073b9c59b;hp=be9d4bef4a2cdd8abfed4c36fbaa1cc6584e2edd

Merge branch 'sizeofsizeof'

Fix two bugs:

sizeof(sizeof(hdr)) used instaed of sizeof(hr)

remounting a read-only fs in rw did not clean up defered operations
properly.
---

diff --git a/direct/test-framework/basic-tests/dtest.c b/direct/test-framework/basic-tests/dtest.c
index 8d1b991..1a98bcb 100644
--- a/direct/test-framework/basic-tests/dtest.c
+++ b/direct/test-framework/basic-tests/dtest.c
@@ -519,7 +519,7 @@ void dumpDirFollow(const char *dname)
 	yaffs_DIR *d;
 	struct yaffs_dirent *de;
 	struct yaffs_stat s;
-	char str[100];
+	char str[300];
 
 	d = yaffs_opendir(dname);
 
@@ -970,7 +970,7 @@ int huge_directory_test_on_path(char *path)
 	int total = 0;
 	int lastTotal = 0;
 
-	char str[100];
+	char str[300];
 
 
 	yaffs_start_up();
diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index af8c82b..d1e4e4e 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -3050,6 +3050,7 @@ int yaffs_remount_common(struct yaffs_dev *dev, const YCHAR *path,
 		       int force, int read_only)
 {
 	int retVal = -1;
+	int was_read_only;
 
 	if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
 		yaffsfs_SetError(-EFAULT);
@@ -3072,7 +3073,11 @@ int yaffs_remount_common(struct yaffs_dev *dev, const YCHAR *path,
 			if (force || !yaffsfs_IsDevBusy(dev)) {
 				if (read_only)
 					yaffs_checkpoint_save(dev);
+				was_read_only = dev->read_only;
 				dev->read_only = read_only ? 1 : 0;
+				if (was_read_only && !read_only) {
+					yaffs_guts_cleanup(dev);
+				}
 				retVal = 0;
 			} else
 				yaffsfs_SetError(-EBUSY);
diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index 53688b5..f5c3be8 100644
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -438,7 +438,7 @@ int yaffs_checkpt_close(struct yaffs_dev *dev)
 
 	if (dev->checkpt_open_write) {
 		if (dev->checkpt_byte_offs !=
-			sizeof(sizeof(struct yaffs_checkpt_chunk_hdr)))
+			sizeof(struct yaffs_checkpt_chunk_hdr))
 			yaffs2_checkpt_flush_buffer(dev);
 	} else if (dev->checkpt_block_list) {
 		for (i = 0;
diff --git a/yaffs_guts.c b/yaffs_guts.c
index 40a5b46..c52ff84 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -4799,6 +4799,18 @@ int yaffs_guts_format_dev(struct yaffs_dev *dev)
 	return YAFFS_OK;
 }
 
+/*
+ * If the dev is mounted r/w then the cleanup will happen during
+ * yaffs_guts_initialise. However if the dev is mounted ro then
+ * the cleanup will be dfered until yaffs is remounted r/w.
+ */
+void yaffs_guts_cleanup(struct yaffs_dev *dev)
+{
+	yaffs_strip_deleted_objs(dev);
+	yaffs_fix_hanging_objs(dev);
+	if (dev->param.empty_lost_n_found)
+			yaffs_empty_l_n_f(dev);
+}
 
 int yaffs_guts_initialise(struct yaffs_dev *dev)
 {
@@ -5012,10 +5024,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev)
 			init_failed = 1;
 		}
 
-		yaffs_strip_deleted_objs(dev);
-		yaffs_fix_hanging_objs(dev);
-		if (dev->param.empty_lost_n_found)
-			yaffs_empty_l_n_f(dev);
+		yaffs_guts_cleanup(dev);
 	}
 
 	if (init_failed) {
diff --git a/yaffs_guts.h b/yaffs_guts.h
index 5ebc378..124e4c9 100644
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -885,6 +885,7 @@ struct yaffs_xattr_mod {
 
 int yaffs_guts_initialise(struct yaffs_dev *dev);
 void yaffs_deinitialise(struct yaffs_dev *dev);
+void yaffs_guts_cleanup(struct yaffs_dev *dev);
 
 int yaffs_get_n_free_chunks(struct yaffs_dev *dev);
 
diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c
index e4edb2c..3044db7 100644
--- a/yaffs_vfs_multi.c
+++ b/yaffs_vfs_multi.c
@@ -2718,6 +2718,7 @@ static int yaffs_sync_fs(struct super_block *sb)
 static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
 {
 	int read_only = 0;
+	int was_read_only = 0;
 	struct mtd_info *mtd;
 	struct yaffs_dev *dev = 0;
 
@@ -2747,8 +2748,18 @@ static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
 	}
 
 	dev = sb->s_fs_info;
+	was_read_only = dev->read_only;
 	dev->read_only = read_only;
 
+	if (was_read_only && !read_only) {
+		yaffs_gross_lock(dev);
+		yaffs_guts_cleanup(dev);
+		yaffs_gross_unlock(dev);
+		yaffs_bg_start(dev);
+	} else if (!was_read_only && read_only) {
+		yaffs_bg_stop(dev);
+	}
+
 	return 0;
 }