X-Git-Url: https://yaffs.net/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_single.c;h=1abbfd859a4217767a90d6af13d9a9862a091e19;hp=ba6f3d6eb8d9f54c6bc2e8788864eef4143c654f;hb=b4ce1bb1b46accb1619dc07164ef6945feded9db;hpb=83d99930038ef56463b6551aff5aa4d8348ce240

diff --git a/yaffs_vfs_single.c b/yaffs_vfs_single.c
index ba6f3d6..1abbfd8 100644
--- a/yaffs_vfs_single.c
+++ b/yaffs_vfs_single.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  * Acknowledgements:
@@ -450,7 +449,7 @@ static int yaffs_sync_object(struct file *file,
 
 	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, "yaffs_sync_object");
 	yaffs_gross_lock(dev);
-	yaffs_flush_file(obj, 1, datasync);
+	yaffs_flush_file(obj, 1, datasync, 0);
 	yaffs_gross_unlock(dev);
 	return 0;
 }
@@ -890,7 +889,7 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id)
 
 	yaffs_gross_lock(dev);
 
-	yaffs_flush_file(obj, 1, 0);
+	yaffs_flush_file(obj, 1, 0, 0);
 
 	yaffs_gross_unlock(dev);
 
@@ -1490,15 +1489,34 @@ static void yaffs_flush_inodes(struct super_block *sb)
 {
 	struct inode *iptr;
 	struct yaffs_obj *obj;
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
 
+	spin_lock(&sb->s_inode_list_lock);
 	list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
+		spin_lock(&inode->i_lock);
+		if (iptr->i_state & (I_FREEING|I_WILL_FREE|I_NEW)) {
+			spin_unlock(&inode->i_lock);
+			continue;
+		}
+
+		__iget(iptr);
+		spin_unlock(&inode->i_lock);
+		spin_unlock(&sb->s_inode_list_lock);
+
 		obj = yaffs_inode_to_obj(iptr);
 		if (obj) {
 			yaffs_trace(YAFFS_TRACE_OS,
 				"flushing obj %d", obj->obj_id);
-			yaffs_flush_file(obj, 1, 0);
+			yaffs_flush_file(obj, 1, 0, 0);
 		}
+
+		yaffs_gross_unlock(dev);
+		iput(iptr);
+		yaffs_gross_lock(dev);
+
+		spin_lock(&sb->s_inode_list_lock);
 	}
+	spin_unlock(&sb->s_inode_list_lock);
 }
 
 static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
@@ -1510,7 +1528,7 @@ static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
 
 	yaffs_flush_inodes(sb);
 	yaffs_update_dirty_dirs(dev);
-	yaffs_flush_whole_cache(dev);
+	yaffs_flush_whole_cache(dev, 1);
 	if (do_checkpoint)
 		yaffs_checkpoint_save(dev);
 }
@@ -1912,6 +1930,7 @@ static void yaffs_fill_inode_from_obj(struct inode *inode,
 static void yaffs_put_super(struct super_block *sb)
 {
 	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 
 	yaffs_trace(YAFFS_TRACE_OS, "yaffs_put_super");
 
@@ -1941,24 +1960,62 @@ static void yaffs_put_super(struct super_block *sb)
 	}
 
 	kfree(dev);
+
+	if (mtd && mtd->sync)
+		mtd->sync(mtd);
+
+	if (mtd)
+		put_mtd_device(mtd);
 }
 
-static void yaffs_mtd_put_super(struct super_block *sb)
+/* the function only is used to change dev->read_only when this file system
+ * is remounted.
+ */
+static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
 {
-	struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_super_to_dev(sb));
+	int read_only = 0;
+	struct mtd_info *mtd;
+	struct yaffs_dev *dev = 0;
 
-	if (mtd->sync)
-		mtd->sync(mtd);
+	/* Get the device */
+	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
+	if (!mtd) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"MTD device #%u doesn't appear to exist",
+			MINOR(sb->s_dev));
+		return 1;
+	}
+
+	/* Check it's NAND */
+	if (mtd->type != MTD_NANDFLASH) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"MTD device is not NAND it's type %d",
+			mtd->type);
+		return 1;
+	}
+
+	read_only = ((*flags & MS_RDONLY) != 0);
+	if (!read_only && !(mtd->flags & MTD_WRITEABLE)) {
+		read_only = 1;
+		printk(KERN_INFO
+			"yaffs: mtd is read only, setting superblock read only");
+		*flags |= MS_RDONLY;
+	}
+
+	dev = sb->s_fs_info;
+	dev->read_only = read_only;
 
-	put_mtd_device(mtd);
+	return 0;
 }
 
+
 static const struct super_operations yaffs_super_ops = {
 	.statfs = yaffs_statfs,
 	.put_super = yaffs_put_super,
 	.evict_inode = yaffs_evict_inode,
 	.sync_fs = yaffs_sync_fs,
 	.write_super = yaffs_write_super,
+	.remount_fs = yaffs_remount_fs,
 };
 
 static struct super_block *yaffs_internal_read_super(int yaffs_version,
@@ -2034,7 +2091,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
 	/* Get the device */
 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
-	if (!mtd) {
+	if (IS_ERR(mtd)) {
 		yaffs_trace(YAFFS_TRACE_ALWAYS,
 			"MTD device #%u doesn't appear to exist",
 			MINOR(sb->s_dev));
@@ -2128,9 +2185,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 		kfree(context);
 		dev = NULL;
 		context = NULL;
-	}
 
-	if (!dev) {
 		/* Deep shit could not allocate device structure */
 		yaffs_trace(YAFFS_TRACE_ALWAYS,
 			"yaffs_read_super failed trying to allocate yaffs_dev");
@@ -2213,7 +2268,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 	yaffs_dev_to_lc(dev)->put_super_fn = yaffs_mtd_put_super;
 
 	param->sb_dirty_fn = yaffs_touch_super;
-	param->gc_control = yaffs_gc_control_callback;
+	param->gc_control_fn = yaffs_gc_control_callback;
 
 	yaffs_dev_to_lc(dev)->super = sb;
 
@@ -2262,10 +2317,6 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
 	sb->s_maxbytes = yaffs_max_file_size(dev);
 
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_readpage_nolock at %lld, size %08x",
-		(long long)pos,
-		(unsigned)PAGE_CACHE_SIZE);
 	/* Release lock before yaffs_get_inode() */
 	yaffs_gross_unlock(dev);