drop yaffs2 support

Yaffs2 is not upstream and does not work with newer 4.x Linux kernels.
We like to switch to UBIFS for any embedded devices with NAND.
Routerboards can be used with some application, which generates
a YAFFS2 image including a Linux kernel, without any YAFFS2
filesystem support in the kernel on the host or target.

9 files changed, 0 insertions, 66252 deletions

diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index 335a4547f..920cd75e3 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -77,16 +77,6 @@ config ADK_TARGET_ROOTFS_JFFS2
 	help
 	  compressed read-write filesystem for MTD flash systems.
 
-config ADK_TARGET_ROOTFS_YAFFS
-	bool "YAFFS2 root filesystem (NAND)"
-	select ADK_KERNEL_MISC_FILESYSTEMS
-	select ADK_KERNEL_YAFFS_FS
-	select ADK_KERNEL_YAFFS_YAFFS2
-	select ADK_KERNEL_YAFFS_AUTO_YAFFS2
-	depends on ADK_TARGET_WITH_NAND
-	help
-	  Root filesystem on NAND flash with YAFFS2.
-
 config ADK_TARGET_ROOTFS_UBIFS
 	bool "UBIFS root filesystem (NAND)"
 	select ADK_KERNEL_UBIFS_FS
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index f68efc97a..9c2d6701b 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -109,7 +109,6 @@ config ADK_KERNEL_DEBUG_WITH_KGDB
 	select ADK_KERNEL_FRAME_POINTER
 	depends on ADK_TARGET_ROOTFS_NFSROOT || \
 		ADK_TARGET_ROOTFS_ARCHIVE || \
-		ADK_TARGET_ROOTFS_YAFFS || \
 		ADK_TARGET_ROOTFS_INITRAMFS || \
 		ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	default n
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index b6226fc19..36422c1e9 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -39,15 +39,6 @@ config ADK_KERNEL_JBD2
 	select ADK_KERNEL_CRYPTO
 	select ADK_KERNEL_CRYPTO_CRC32C
 
-config ADK_KERNEL_YAFFS_YAFFS1
-	bool
-
-config ADK_KERNEL_YAFFS_YAFFS2
-	bool
-
-config ADK_KERNEL_YAFFS_AUTO_YAFFS2
-	bool
-
 config ADK_KERNEL_EXT3_FS_XATTR
 	bool
 
@@ -254,18 +245,6 @@ config ADK_KERNEL_SQUASHFS
 	help
 	  Squashfs compressed read-only filesystem
 
-config ADK_KERNEL_YAFFS_FS
-	tristate "YAFFS2 filesystem"
-	select ADK_KERNEL_MISC_FILESYSTEMS
-	select ADK_KERNEL_MTD
-	select ADK_KERNEL_MTD_BLOCK
-	select ADK_KERNEL_YAFFS_YAFFS1
-	select ADK_KERNEL_YAFFS_YAFFS2
-	select ADK_KERNEL_YAFFS_AUTO_YAFFS2
-	depends on ADK_TARGET_WITH_NAND
-	help
-	  YAFFS2 filesystem for NAND devices
-
 config ADK_KERNEL_MTD_UBI_GLUEBI
 	bool
 
diff --git a/target/linux/patches/3.10.104/yaffs2.patch b/target/linux/patches/3.10.104/yaffs2.patch
deleted file mode 100644
index 172629530..000000000
--- a/target/linux/patches/3.10.104/yaffs2.patch
+++ /dev/null
@@ -1,16547 +0,0 @@
-diff -Nur linux-3.10.40.orig/fs/Kconfig linux-3.10.40/fs/Kconfig
---- linux-3.10.40.orig/fs/Kconfig	2014-05-13 14:00:04.000000000 +0200
-+++ linux-3.10.40/fs/Kconfig	2014-05-17 12:48:10.000000000 +0200
-@@ -193,6 +193,7 @@
- source "fs/befs/Kconfig"
- source "fs/bfs/Kconfig"
- source "fs/efs/Kconfig"
-+source "fs/yaffs2/Kconfig"
- source "fs/jffs2/Kconfig"
- # UBIFS File system configuration
- source "fs/ubifs/Kconfig"
-diff -Nur linux-3.10.40.orig/fs/Makefile linux-3.10.40/fs/Makefile
---- linux-3.10.40.orig/fs/Makefile	2014-05-13 14:00:04.000000000 +0200
-+++ linux-3.10.40/fs/Makefile	2014-05-17 12:48:10.000000000 +0200
-@@ -126,3 +126,4 @@
- obj-$(CONFIG_CEPH_FS)		+= ceph/
- obj-$(CONFIG_PSTORE)		+= pstore/
- obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
-diff -Nur linux-3.10.40.orig/fs/yaffs2/Kconfig linux-3.10.40/fs/yaffs2/Kconfig
---- linux-3.10.40.orig/fs/yaffs2/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/Kconfig	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,171 @@
-+#
-+# yaffs file system configurations
-+#
-+
-+config YAFFS_FS
-+	tristate "yaffs2 file system support"
-+	default n
-+	depends on MTD_BLOCK
-+	select YAFFS_YAFFS1
-+	select YAFFS_YAFFS2
-+	help
-+	  yaffs2, or Yet Another Flash File System, is a file system
-+	  optimised for NAND Flash chips.
-+
-+	  To compile the yaffs2 file system support as a module, choose M
-+	  here: the module will be called yaffs2.
-+
-+	  If unsure, say N.
-+
-+	  Further information on yaffs2 is available at
-+	  <http://www.aleph1.co.uk/yaffs/>.
-+
-+config YAFFS_YAFFS1
-+	bool "512 byte / page devices"
-+	depends on YAFFS_FS
-+	default y
-+	help
-+	  Enable yaffs1 support -- yaffs for 512 byte / page devices
-+
-+	  Not needed for 2K-page devices.
-+
-+	  If unsure, say Y.
-+
-+config YAFFS_9BYTE_TAGS
-+	bool "Use older-style on-NAND data format with pageStatus byte"
-+	depends on YAFFS_YAFFS1
-+	default n
-+	help
-+
-+	  Older-style on-NAND data format has a "pageStatus" byte to record
-+	  chunk/page state.  This byte is zero when the page is discarded.
-+	  Choose this option if you have existing on-NAND data using this
-+	  format that you need to continue to support.  New data written
-+	  also uses the older-style format.  Note: Use of this option
-+	  generally requires that MTD's oob layout be adjusted to use the
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
-+
-+	  If unsure, say N.
-+
-+config YAFFS_DOES_ECC
-+	bool "Lets yaffs do its own ECC"
-+	depends on YAFFS_FS && YAFFS_YAFFS1 && !YAFFS_9BYTE_TAGS
-+	default n
-+	help
-+	  This enables yaffs to use its own ECC functions instead of using
-+	  the ones from the generic MTD-NAND driver.
-+
-+	  If unsure, say N.
-+
-+config YAFFS_ECC_WRONG_ORDER
-+	bool "Use the same ecc byte order as Steven Hill's nand_ecc.c"
-+	depends on YAFFS_FS && YAFFS_DOES_ECC && !YAFFS_9BYTE_TAGS
-+	default n
-+	help
-+	  This makes yaffs_ecc.c use the same ecc byte order as Steven
-+	  Hill's nand_ecc.c. If not set, then you get the same ecc byte
-+	  order as SmartMedia.
-+
-+	  If unsure, say N.
-+
-+config YAFFS_YAFFS2
-+	bool "2048 byte (or larger) / page devices"
-+	depends on YAFFS_FS
-+	default y
-+	help
-+	  Enable yaffs2 support -- yaffs for >= 2K bytes per page devices
-+
-+	  If unsure, say Y.
-+
-+config YAFFS_AUTO_YAFFS2
-+	bool "Autoselect yaffs2 format"
-+	depends on YAFFS_YAFFS2
-+	default y
-+	help
-+	  Without this, you need to explicitely use yaffs2 as the file
-+	  system type. With this, you can say "yaffs" and yaffs or yaffs2
-+	  will be used depending on the device page size (yaffs on
-+	  512-byte page devices, yaffs2 on 2K page devices).
-+
-+	  If unsure, say Y.
-+
-+config YAFFS_DISABLE_TAGS_ECC
-+	bool "Disable yaffs from doing ECC on tags by default"
-+	depends on YAFFS_FS && YAFFS_YAFFS2
-+	default n
-+	help
-+	  This defaults yaffs to using its own ECC calculations on tags instead of
-+	  just relying on the MTD.
-+	  This behavior can also be overridden with tags_ecc_on and
-+	  tags_ecc_off mount options.
-+
-+	  If unsure, say N.
-+
-+config YAFFS_ALWAYS_CHECK_CHUNK_ERASED
-+	bool "Force chunk erase check"
-+	depends on YAFFS_FS
-+	default n
-+	help
-+          Normally yaffs only checks chunks before writing until an erased
-+	  chunk is found. This helps to detect any partially written
-+	  chunks that might have happened due to power loss.
-+
-+	  Enabling this forces on the test that chunks are erased in flash
-+	  before writing to them. This takes more time but is potentially
-+	  a bit more secure.
-+
-+	  Suggest setting Y during development and ironing out driver
-+	  issues etc. Suggest setting to N if you want faster writing.
-+
-+	  If unsure, say Y.
-+
-+config YAFFS_EMPTY_LOST_AND_FOUND
-+	bool "Empty lost and found on boot"
-+	depends on YAFFS_FS
-+	default n
-+	help
-+	  If this is enabled then the contents of lost and found is
-+	  automatically dumped at mount.
-+
-+	  If unsure, say N.
-+
-+config YAFFS_DISABLE_BLOCK_REFRESHING
-+	bool "Disable yaffs2 block refreshing"
-+	depends on YAFFS_FS
-+	default n
-+	help
-+	 If this is set, then block refreshing is disabled.
-+	 Block refreshing infrequently refreshes the oldest block in
-+	 a yaffs2 file system. This mechanism helps to refresh flash to
-+	 mitigate against data loss. This is particularly useful for MLC.
-+
-+	  If unsure, say N.
-+
-+config YAFFS_DISABLE_BACKGROUND
-+	bool "Disable yaffs2 background processing"
-+	depends on YAFFS_FS
-+	default n
-+	help
-+	 If this is set, then background processing is disabled.
-+	 Background processing makes many foreground activities faster.
-+
-+	 If unsure, say N.
-+
-+config YAFFS_DISABLE_BAD_BLOCK_MARKING
-+	bool "Disable yaffs2 bad block marking"
-+	depends on YAFFS_FS
-+	default n
-+	help
-+	 Useful during early flash bring up to prevent problems causing
-+	 lots of bad block marking.
-+
-+	 If unsure, say N.
-+
-+config YAFFS_XATTR
-+	bool "Enable yaffs2 xattr support"
-+	depends on YAFFS_FS
-+	default y
-+	help
-+	 If this is set then yaffs2 will provide xattr support.
-+	 If unsure, say Y.
-diff -Nur linux-3.10.40.orig/fs/yaffs2/Makefile linux-3.10.40/fs/yaffs2/Makefile
---- linux-3.10.40.orig/fs/yaffs2/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/Makefile	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,18 @@
-+#
-+# Makefile for the linux YAFFS filesystem routines.
-+#
-+
-+obj-$(CONFIG_YAFFS_FS) += yaffs.o
-+
-+yaffs-y := yaffs_ecc.o yaffs_vfs.o yaffs_guts.o yaffs_checkptrw.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o
-+yaffs-y += yaffs_tagscompat.o yaffs_tagsmarshall.o
-+yaffs-y += yaffs_mtdif.o
-+yaffs-y += yaffs_nameval.o yaffs_attribs.o
-+yaffs-y += yaffs_allocator.o
-+yaffs-y += yaffs_yaffs1.o
-+yaffs-y += yaffs_yaffs2.o
-+yaffs-y += yaffs_bitmap.o
-+yaffs-y += yaffs_summary.o
-+yaffs-y += yaffs_verify.o
-+
-diff -Nur linux-3.10.40.orig/fs/yaffs2/yaffs_allocator.c linux-3.10.40/fs/yaffs2/yaffs_allocator.c
---- linux-3.10.40.orig/fs/yaffs2/yaffs_allocator.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/yaffs_allocator.c	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,357 @@
-+/*
-+ * 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
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include "yaffs_allocator.h"
-+#include "yaffs_guts.h"
-+#include "yaffs_trace.h"
-+#include "yportenv.h"
-+
-+/*
-+ * Each entry in yaffs_tnode_list and yaffs_obj_list hold blocks
-+ * of approx 100 objects that are themn allocated singly.
-+ * This is basically a simplified slab allocator.
-+ *
-+ * We don't use the Linux slab allocator because slab does not allow
-+ * us to dump all the objects in one hit when we do a umount and tear
-+ * down  all the tnodes and objects. slab requires that we first free
-+ * the individual objects.
-+ *
-+ * Once yaffs has been mainlined I shall try to motivate for a change
-+ * to slab to provide the extra features we need here.
-+ */
-+
-+struct yaffs_tnode_list {
-+	struct yaffs_tnode_list *next;
-+	struct yaffs_tnode *tnodes;
-+};
-+
-+struct yaffs_obj_list {
-+	struct yaffs_obj_list *next;
-+	struct yaffs_obj *objects;
-+};
-+
-+struct yaffs_allocator {
-+	int n_tnodes_created;
-+	struct yaffs_tnode *free_tnodes;
-+	int n_free_tnodes;
-+	struct yaffs_tnode_list *alloc_tnode_list;
-+
-+	int n_obj_created;
-+	struct list_head free_objs;
-+	int n_free_objects;
-+
-+	struct yaffs_obj_list *allocated_obj_list;
-+};
-+
-+static void yaffs_deinit_raw_tnodes(struct yaffs_dev *dev)
-+{
-+	struct yaffs_allocator *allocator =
-+	    (struct yaffs_allocator *)dev->allocator;
-+	struct yaffs_tnode_list *tmp;
-+
-+	if (!allocator) {
-+		BUG();
-+		return;
-+	}
-+
-+	while (allocator->alloc_tnode_list) {
-+		tmp = allocator->alloc_tnode_list->next;
-+
-+		kfree(allocator->alloc_tnode_list->tnodes);
-+		kfree(allocator->alloc_tnode_list);
-+		allocator->alloc_tnode_list = tmp;
-+	}
-+
-+	allocator->free_tnodes = NULL;
-+	allocator->n_free_tnodes = 0;
-+	allocator->n_tnodes_created = 0;
-+}
-+
-+static void yaffs_init_raw_tnodes(struct yaffs_dev *dev)
-+{
-+	struct yaffs_allocator *allocator = dev->allocator;
-+
-+	if (!allocator) {
-+		BUG();
-+		return;
-+	}
-+
-+	allocator->alloc_tnode_list = NULL;
-+	allocator->free_tnodes = NULL;
-+	allocator->n_free_tnodes = 0;
-+	allocator->n_tnodes_created = 0;
-+}
-+
-+static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
-+{
-+	struct yaffs_allocator *allocator =
-+	    (struct yaffs_allocator *)dev->allocator;
-+	int i;
-+	struct yaffs_tnode *new_tnodes;
-+	u8 *mem;
-+	struct yaffs_tnode *curr;
-+	struct yaffs_tnode *next;
-+	struct yaffs_tnode_list *tnl;
-+
-+	if (!allocator) {
-+		BUG();
-+		return YAFFS_FAIL;
-+	}
-+
-+	if (n_tnodes < 1)
-+		return YAFFS_OK;
-+
-+	/* make these things */
-+	new_tnodes = kmalloc(n_tnodes * dev->tnode_size, GFP_NOFS);
-+	mem = (u8 *) new_tnodes;
-+
-+	if (!new_tnodes) {
-+		yaffs_trace(YAFFS_TRACE_ERROR,
-+			"yaffs: Could not allocate Tnodes");
-+		return YAFFS_FAIL;
-+	}
-+
-+	/* New hookup for wide tnodes */
-+	for (i = 0; i < n_tnodes - 1; i++) {
-+		curr = (struct yaffs_tnode *)&mem[i * dev->tnode_size];
-+		next = (struct yaffs_tnode *)&mem[(i + 1) * dev->tnode_size];
-+		curr->internal[0] = next;
-+	}
-+
-+	curr = (struct yaffs_tnode *)&mem[(n_tnodes - 1) * dev->tnode_size];
-+	curr->internal[0] = allocator->free_tnodes;
-+	allocator->free_tnodes = (struct yaffs_tnode *)mem;
-+
-+	allocator->n_free_tnodes += n_tnodes;
-+	allocator->n_tnodes_created += n_tnodes;
-+
-+	/* Now add this bunch of tnodes to a list for freeing up.
-+	 * NB If we can't add this to the management list it isn't fatal
-+	 * but it just means we can't free this bunch of tnodes later.
-+	 */
-+	tnl = kmalloc(sizeof(struct yaffs_tnode_list), GFP_NOFS);
-+	if (!tnl) {
-+		yaffs_trace(YAFFS_TRACE_ERROR,
-+			"Could not add tnodes to management list");
-+		return YAFFS_FAIL;
-+	} else {
-+		tnl->tnodes = new_tnodes;
-+		tnl->next = allocator->alloc_tnode_list;
-+		allocator->alloc_tnode_list = tnl;
-+	}
-+
-+	yaffs_trace(YAFFS_TRACE_ALLOCATE, "Tnodes added");
-+
-+	return YAFFS_OK;
-+}
-+
-+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
-+{
-+	struct yaffs_allocator *allocator =
-+	    (struct yaffs_allocator *)dev->allocator;
-+	struct yaffs_tnode *tn = NULL;
-+
-+	if (!allocator) {
-+		BUG();
-+		return NULL;
-+	}
-+
-+	/* If there are none left make more */
-+	if (!allocator->free_tnodes)
-+		yaffs_create_tnodes(dev, YAFFS_ALLOCATION_NTNODES);
-+
-+	if (allocator->free_tnodes) {
-+		tn = allocator->free_tnodes;
-+		allocator->free_tnodes = allocator->free_tnodes->internal[0];
-+		allocator->n_free_tnodes--;
-+	}
-+
-+	return tn;
-+}
-+
-+/* FreeTnode frees up a tnode and puts it back on the free list */
-+void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
-+{
-+	struct yaffs_allocator *allocator = dev->allocator;
-+
-+	if (!allocator) {
-+		BUG();
-+		return;
-+	}
-+
-+	if (tn) {
-+		tn->internal[0] = allocator->free_tnodes;
-+		allocator->free_tnodes = tn;
-+		allocator->n_free_tnodes++;
-+	}
-+	dev->checkpoint_blocks_required = 0;	/* force recalculation */
-+}
-+
-+/*--------------- yaffs_obj alloaction ------------------------
-+ *
-+ * Free yaffs_objs are stored in a list using obj->siblings.
-+ * The blocks of allocated objects are stored in a linked list.
-+ */
-+
-+static void yaffs_init_raw_objs(struct yaffs_dev *dev)
-+{
-+	struct yaffs_allocator *allocator = dev->allocator;
-+
-+	if (!allocator) {
-+		BUG();
-+		return;
-+	}
-+
-+	allocator->allocated_obj_list = NULL;
-+	INIT_LIST_HEAD(&allocator->free_objs);
-+	allocator->n_free_objects = 0;
-+}
-+
-+static void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
-+{
-+	struct yaffs_allocator *allocator = dev->allocator;
-+	struct yaffs_obj_list *tmp;
-+
-+	if (!allocator) {
-+		BUG();
-+		return;
-+	}
-+
-+	while (allocator->allocated_obj_list) {
-+		tmp = allocator->allocated_obj_list->next;
-+		kfree(allocator->allocated_obj_list->objects);
-+		kfree(allocator->allocated_obj_list);
-+		allocator->allocated_obj_list = tmp;
-+	}
-+
-+	INIT_LIST_HEAD(&allocator->free_objs);
-+	allocator->n_free_objects = 0;
-+	allocator->n_obj_created = 0;
-+}
-+
-+static int yaffs_create_free_objs(struct yaffs_dev *dev, int n_obj)
-+{
-+	struct yaffs_allocator *allocator = dev->allocator;
-+	int i;
-+	struct yaffs_obj *new_objs;
-+	struct yaffs_obj_list *list;
-+
-+	if (!allocator) {
-+		BUG();
-+		return YAFFS_FAIL;
-+	}
-+
-+	if (n_obj < 1)
-+		return YAFFS_OK;
-+
-+	/* make these things */
-+	new_objs = kmalloc(n_obj * sizeof(struct yaffs_obj), GFP_NOFS);
-+	list = kmalloc(sizeof(struct yaffs_obj_list), GFP_NOFS);
-+
-+	if (!new_objs || !list) {
-+		kfree(new_objs);
-+		new_objs = NULL;
-+		kfree(list);
-+		list = NULL;
-+		yaffs_trace(YAFFS_TRACE_ALLOCATE,
-+			"Could not allocate more objects");
-+		return YAFFS_FAIL;
-+	}
-+
-+	/* Hook them into the free list */
-+	for (i = 0; i < n_obj; i++)
-+		list_add(&new_objs[i].siblings, &allocator->free_objs);
-+
-+	allocator->n_free_objects += n_obj;
-+	allocator->n_obj_created += n_obj;
-+
-+	/* Now add this bunch of Objects to a list for freeing up. */
-+
-+	list->objects = new_objs;
-+	list->next = allocator->allocated_obj_list;
-+	allocator->allocated_obj_list = list;
-+
-+	return YAFFS_OK;
-+}
-+
-+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
-+{
-+	struct yaffs_obj *obj = NULL;
-+	struct list_head *lh;
-+	struct yaffs_allocator *allocator = dev->allocator;
-+
-+	if (!allocator) {
-+		BUG();
-+		return obj;
-+	}
-+
-+	/* If there are none left make more */
-+	if (list_empty(&allocator->free_objs))
-+		yaffs_create_free_objs(dev, YAFFS_ALLOCATION_NOBJECTS);
-+
-+	if (!list_empty(&allocator->free_objs)) {
-+		lh = allocator->free_objs.next;
-+		obj = list_entry(lh, struct yaffs_obj, siblings);
-+		list_del_init(lh);
-+		allocator->n_free_objects--;
-+	}
-+
-+	return obj;
-+}
-+
-+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
-+{
-+
-+	struct yaffs_allocator *allocator = dev->allocator;
-+
-+	if (!allocator) {
-+		BUG();
-+		return;
-+	}
-+
-+	/* Link into the free list. */
-+	list_add(&obj->siblings, &allocator->free_objs);
-+	allocator->n_free_objects++;
-+}
-+
-+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
-+{
-+
-+	if (!dev->allocator) {
-+		BUG();
-+		return;
-+	}
-+
-+	yaffs_deinit_raw_tnodes(dev);
-+	yaffs_deinit_raw_objs(dev);
-+	kfree(dev->allocator);
-+	dev->allocator = NULL;
-+}
-+
-+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
-+{
-+	struct yaffs_allocator *allocator;
-+
-+	if (dev->allocator) {
-+		BUG();
-+		return;
-+	}
-+
-+	allocator = kmalloc(sizeof(struct yaffs_allocator), GFP_NOFS);
-+	if (allocator) {
-+		dev->allocator = allocator;
-+		yaffs_init_raw_tnodes(dev);
-+		yaffs_init_raw_objs(dev);
-+	}
-+}
-+
-diff -Nur linux-3.10.40.orig/fs/yaffs2/yaffs_allocator.h linux-3.10.40/fs/yaffs2/yaffs_allocator.h
---- linux-3.10.40.orig/fs/yaffs2/yaffs_allocator.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/yaffs_allocator.h	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,30 @@
-+/*
-+ * 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
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_ALLOCATOR_H__
-+#define __YAFFS_ALLOCATOR_H__
-+
-+#include "yaffs_guts.h"
-+
-+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev);
-+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev);
-+
-+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev);
-+void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn);
-+
-+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev);
-+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj);
-+
-+#endif
-diff -Nur linux-3.10.40.orig/fs/yaffs2/yaffs_attribs.c linux-3.10.40/fs/yaffs2/yaffs_attribs.c
---- linux-3.10.40.orig/fs/yaffs2/yaffs_attribs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/yaffs_attribs.c	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,166 @@
-+/*
-+ * 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
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include "yaffs_guts.h"
-+#include "yaffs_attribs.h"
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
-+static inline uid_t ia_uid_read(const struct iattr *iattr)
-+{
-+	return from_kuid(&init_user_ns, iattr->ia_uid);
-+}
-+
-+static inline gid_t ia_gid_read(const struct iattr *iattr)
-+{
-+	return from_kgid(&init_user_ns, iattr->ia_gid);
-+}
-+
-+static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
-+{
-+	iattr->ia_uid = make_kuid(&init_user_ns, uid);
-+}
-+
-+static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
-+{
-+	iattr->ia_gid = make_kgid(&init_user_ns, gid);
-+}
-+#else
-+static inline uid_t ia_uid_read(const struct iattr *iattr)
-+{
-+	return iattr->ia_uid;
-+}
-+
-+static inline gid_t ia_gid_read(const struct iattr *inode)
-+{
-+	return iattr->ia_gid;
-+}
-+
-+static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
-+{
-+	iattr->ia_uid = uid;
-+}
-+
-+static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
-+{
-+	iattr->ia_gid = gid;
-+}
-+#endif
-+
-+void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
-+{
-+	obj->yst_uid = oh->yst_uid;
-+	obj->yst_gid = oh->yst_gid;
-+	obj->yst_atime = oh->yst_atime;
-+	obj->yst_mtime = oh->yst_mtime;
-+	obj->yst_ctime = oh->yst_ctime;
-+	obj->yst_rdev = oh->yst_rdev;
-+}
-+
-+void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj)
-+{
-+	oh->yst_uid = obj->yst_uid;
-+	oh->yst_gid = obj->yst_gid;
-+	oh->yst_atime = obj->yst_atime;
-+	oh->yst_mtime = obj->yst_mtime;
-+	oh->yst_ctime = obj->yst_ctime;
-+	oh->yst_rdev = obj->yst_rdev;
-+
-+}
-+
-+void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
-+{
-+	obj->yst_mtime = Y_CURRENT_TIME;
-+	if (do_a)
-+		obj->yst_atime = obj->yst_mtime;
-+	if (do_c)
-+		obj->yst_ctime = obj->yst_mtime;
-+}
-+
-+void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
-+{
-+	yaffs_load_current_time(obj, 1, 1);
-+	obj->yst_rdev = rdev;
-+	obj->yst_uid = uid;
-+	obj->yst_gid = gid;
-+}
-+
-+static loff_t yaffs_get_file_size(struct yaffs_obj *obj)
-+{
-+	YCHAR *alias = NULL;
-+	obj = yaffs_get_equivalent_obj(obj);
-+
-+	switch (obj->variant_type) {
-+	case YAFFS_OBJECT_TYPE_FILE:
-+		return obj->variant.file_variant.file_size;
-+	case YAFFS_OBJECT_TYPE_SYMLINK:
-+		alias = obj->variant.symlink_variant.alias;
-+		if (!alias)
-+			return 0;
-+		return strnlen(alias, YAFFS_MAX_ALIAS_LENGTH);
-+	default:
-+		return 0;
-+	}
-+}
-+
-+int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr)
-+{
-+	unsigned int valid = attr->ia_valid;
-+
-+	if (valid & ATTR_MODE)
-+		obj->yst_mode = attr->ia_mode;
-+	if (valid & ATTR_UID)
-+		obj->yst_uid =  ia_uid_read(attr);
-+	if (valid & ATTR_GID)
-+		obj->yst_gid =  ia_gid_read(attr);
-+
-+	if (valid & ATTR_ATIME)
-+		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
-+	if (valid & ATTR_CTIME)
-+		obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime);
-+	if (valid & ATTR_MTIME)
-+		obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime);
-+
-+	if (valid & ATTR_SIZE)
-+		yaffs_resize_file(obj, attr->ia_size);
-+
-+	yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
-+
-+	return YAFFS_OK;
-+
-+}
-+
-+int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr)
-+{
-+	unsigned int valid = 0;
-+
-+	attr->ia_mode = obj->yst_mode;
-+	valid |= ATTR_MODE;
-+	ia_uid_write(attr, obj->yst_uid);
-+	valid |= ATTR_UID;
-+	ia_gid_write(attr, obj->yst_gid);
-+	valid |= ATTR_GID;
-+
-+	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
-+	valid |= ATTR_ATIME;
-+	Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime;
-+	valid |= ATTR_CTIME;
-+	Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime;
-+	valid |= ATTR_MTIME;
-+
-+	attr->ia_size = yaffs_get_file_size(obj);
-+	valid |= ATTR_SIZE;
-+
-+	attr->ia_valid = valid;
-+
-+	return YAFFS_OK;
-+}
-diff -Nur linux-3.10.40.orig/fs/yaffs2/yaffs_attribs.h linux-3.10.40/fs/yaffs2/yaffs_attribs.h
---- linux-3.10.40.orig/fs/yaffs2/yaffs_attribs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/yaffs_attribs.h	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,28 @@
-+/*
-+ * 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
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_ATTRIBS_H__
-+#define __YAFFS_ATTRIBS_H__
-+
-+#include "yaffs_guts.h"
-+
-+void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh);
-+void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj);
-+void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev);
-+void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c);
-+int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr);
-+int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr);
-+
-+#endif
-diff -Nur linux-3.10.40.orig/fs/yaffs2/yaffs_bitmap.c linux-3.10.40/fs/yaffs2/yaffs_bitmap.c
---- linux-3.10.40.orig/fs/yaffs2/yaffs_bitmap.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/yaffs_bitmap.c	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,97 @@
-+/*
-+ * 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
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include "yaffs_bitmap.h"
-+#include "yaffs_trace.h"
-+/*
-+ * Chunk bitmap manipulations
-+ */
-+
-+static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk)
-+{
-+	if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
-+		yaffs_trace(YAFFS_TRACE_ERROR,
-+			"BlockBits block %d is not valid",
-+			blk);
-+		BUG();
-+	}
-+	return dev->chunk_bits +
-+	    (dev->chunk_bit_stride * (blk - dev->internal_start_block));
-+}
-+
-+void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk)
-+{
-+	if (blk < dev->internal_start_block || blk > dev->internal_end_block ||
-+	    chunk < 0 || chunk >= dev->param.chunks_per_block) {
-+		yaffs_trace(YAFFS_TRACE_ERROR,
-+			"Chunk Id (%d:%d) invalid",
-+			blk, chunk);
-+		BUG();
-+	}
-+}
-+
-+void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk)
-+{
-+	u8 *blk_bits = yaffs_block_bits(dev, blk);
-+
-+	memset(blk_bits, 0, dev->chunk_bit_stride);
-+}
-+
-+void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
-+{
-+	u8 *blk_bits = yaffs_block_bits(dev, blk);
-+
-+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
-+	blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
-+}
-+
-+void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
-+{
-+	u8 *blk_bits = yaffs_block_bits(dev, blk);
-+
-+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
-+	blk_bits[chunk / 8] |= (1 << (chunk & 7));
-+}
-+
-+int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
-+{
-+	u8 *blk_bits = yaffs_block_bits(dev, blk);
-+
-+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
-+	return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
-+}
-+
-+int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk)
-+{
-+	u8 *blk_bits = yaffs_block_bits(dev, blk);
-+	int i;
-+
-+	for (i = 0; i < dev->chunk_bit_stride; i++) {
-+		if (*blk_bits)
-+			return 1;
-+		blk_bits++;
-+	}
-+	return 0;
-+}
-+
-+int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk)
-+{
-+	u8 *blk_bits = yaffs_block_bits(dev, blk);
-+	int i;
-+	int n = 0;
-+
-+	for (i = 0; i < dev->chunk_bit_stride; i++, blk_bits++)
-+		n += hweight8(*blk_bits);
-+
-+	return n;
-+}
-diff -Nur linux-3.10.40.orig/fs/yaffs2/yaffs_bitmap.h linux-3.10.40/fs/yaffs2/yaffs_bitmap.h
---- linux-3.10.40.orig/fs/yaffs2/yaffs_bitmap.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/yaffs_bitmap.h	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,33 @@
-+/*
-+ * 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
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+/*
-+ * Chunk bitmap manipulations
-+ */
-+
-+#ifndef __YAFFS_BITMAP_H__
-+#define __YAFFS_BITMAP_H__
-+
-+#include "yaffs_guts.h"
-+
-+void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk);
-+void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk);
-+void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
-+void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
-+int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
-+int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk);
-+int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk);
-+
-+#endif
-diff -Nur linux-3.10.40.orig/fs/yaffs2/yaffs_checkptrw.c linux-3.10.40/fs/yaffs2/yaffs_checkptrw.c
---- linux-3.10.40.orig/fs/yaffs2/yaffs_checkptrw.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.40/fs/yaffs2/yaffs_checkptrw.c	2014-05-17 12:48:10.000000000 +0200
-@@ -0,0 +1,474 @@
-+/*
-+ * 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
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include "yaffs_checkptrw.h"
-+#include "yaffs_getblockinfo.h"
-+
-+struct yaffs_checkpt_chunk_hdr {
-+	int version;
-+	int seq;