summaryrefslogtreecommitdiff
path: root/target/linux/patches/3.15-rc7
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/patches/3.15-rc7')
-rw-r--r--target/linux/patches/3.15-rc7/bsd-compatibility.patch2538
-rw-r--r--target/linux/patches/3.15-rc7/cleankernel.patch11
-rw-r--r--target/linux/patches/3.15-rc7/defaults.patch46
-rw-r--r--target/linux/patches/3.15-rc7/disable-netfilter.patch160
-rw-r--r--target/linux/patches/3.15-rc7/export-symbol-for-exmap.patch11
-rw-r--r--target/linux/patches/3.15-rc7/gemalto.patch11
-rw-r--r--target/linux/patches/3.15-rc7/initramfs-nosizelimit.patch57
-rw-r--r--target/linux/patches/3.15-rc7/lemote-rfkill.patch21
-rw-r--r--target/linux/patches/3.15-rc7/microblaze-axi.patch11
-rw-r--r--target/linux/patches/3.15-rc7/microblaze-ethernet.patch11
-rw-r--r--target/linux/patches/3.15-rc7/mkpiggy.patch28
-rw-r--r--target/linux/patches/3.15-rc7/mtd-rootfs.patch26
-rw-r--r--target/linux/patches/3.15-rc7/nfsv3-tcp.patch12
-rw-r--r--target/linux/patches/3.15-rc7/non-static.patch33
-rw-r--r--target/linux/patches/3.15-rc7/patch-yaffs216551
-rw-r--r--target/linux/patches/3.15-rc7/ppc64-missing-zlib.patch11
-rw-r--r--target/linux/patches/3.15-rc7/relocs.patch2709
-rw-r--r--target/linux/patches/3.15-rc7/sgidefs.patch18
-rw-r--r--target/linux/patches/3.15-rc7/sortext.patch33
-rw-r--r--target/linux/patches/3.15-rc7/startup.patch37
-rw-r--r--target/linux/patches/3.15-rc7/tcp-fastopen.patch2082
-rw-r--r--target/linux/patches/3.15-rc7/uuid.patch263
-rw-r--r--target/linux/patches/3.15-rc7/wlan-cf.patch11
-rw-r--r--target/linux/patches/3.15-rc7/xargs.patch12
24 files changed, 0 insertions, 24703 deletions
diff --git a/target/linux/patches/3.15-rc7/bsd-compatibility.patch b/target/linux/patches/3.15-rc7/bsd-compatibility.patch
deleted file mode 100644
index b954b658f..000000000
--- a/target/linux/patches/3.15-rc7/bsd-compatibility.patch
+++ /dev/null
@@ -1,2538 +0,0 @@
-diff -Nur linux-3.11.5.orig/scripts/Makefile.lib linux-3.11.5/scripts/Makefile.lib
---- linux-3.11.5.orig/scripts/Makefile.lib 2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/scripts/Makefile.lib 2013-10-16 18:09:31.000000000 +0200
-@@ -281,7 +281,12 @@
- size_append = printf $(shell \
- dec_size=0; \
- for F in $1; do \
-- fsize=$$(stat -c "%s" $$F); \
-+ if stat -qs .>/dev/null 2>&1; then \
-+ statcmd='stat -f %z'; \
-+ else \
-+ statcmd='stat -c %s'; \
-+ fi; \
-+ fsize=$$($$statcmd $$F); \
- dec_size=$$(expr $$dec_size + $$fsize); \
- done; \
- printf "%08x\n" $$dec_size | \
-diff -Nur linux-3.11.5.orig/scripts/mod/mk_elfconfig.c linux-3.11.5/scripts/mod/mk_elfconfig.c
---- linux-3.11.5.orig/scripts/mod/mk_elfconfig.c 2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/scripts/mod/mk_elfconfig.c 2013-10-16 18:09:31.000000000 +0200
-@@ -1,7 +1,18 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <elf.h>
-+
-+#define EI_NIDENT (16)
-+#define ELFMAG "\177ELF"
-+
-+#define SELFMAG 4
-+#define EI_CLASS 4
-+#define ELFCLASS32 1 /* 32-bit objects */
-+#define ELFCLASS64 2 /* 64-bit objects */
-+
-+#define EI_DATA 5 /* Data encoding byte index */
-+#define ELFDATA2LSB 1 /* 2's complement, little endian */
-+#define ELFDATA2MSB 2 /* 2's complement, big endian */
-
- int
- main(int argc, char **argv)
-diff -Nur linux-3.11.5.orig/scripts/mod/modpost.h linux-3.11.5/scripts/mod/modpost.h
---- linux-3.11.5.orig/scripts/mod/modpost.h 2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/scripts/mod/modpost.h 2013-10-16 18:09:31.000000000 +0200
-@@ -7,7 +7,2453 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
--#include <elf.h>
-+
-+
-+/* This file defines standard ELF types, structures, and macros.
-+ Copyright (C) 1995-1999,2000,2001,2002,2003 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#ifndef _ELF_H
-+#define _ELF_H 1
-+
-+__BEGIN_DECLS
-+
-+/* Standard ELF types. */
-+
-+#include <stdint.h>
-+
-+/* Type for a 16-bit quantity. */
-+typedef uint16_t Elf32_Half;
-+typedef uint16_t Elf64_Half;
-+
-+/* Types for signed and unsigned 32-bit quantities. */
-+typedef uint32_t Elf32_Word;
-+typedef int32_t Elf32_Sword;
-+typedef uint32_t Elf64_Word;
-+typedef int32_t Elf64_Sword;
-+
-+/* Types for signed and unsigned 64-bit quantities. */
-+typedef uint64_t Elf32_Xword;
-+typedef int64_t Elf32_Sxword;
-+typedef uint64_t Elf64_Xword;
-+typedef int64_t Elf64_Sxword;
-+
-+/* Type of addresses. */
-+typedef uint32_t Elf32_Addr;
-+typedef uint64_t Elf64_Addr;
-+
-+/* Type of file offsets. */
-+typedef uint32_t Elf32_Off;
-+typedef uint64_t Elf64_Off;
-+
-+/* Type for section indices, which are 16-bit quantities. */
-+typedef uint16_t Elf32_Section;
-+typedef uint16_t Elf64_Section;
-+
-+/* Type for version symbol information. */
-+typedef Elf32_Half Elf32_Versym;
-+typedef Elf64_Half Elf64_Versym;
-+
-+
-+/* The ELF file header. This appears at the start of every ELF file. */
-+
-+#define EI_NIDENT (16)
-+
-+typedef struct
-+{
-+ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */
-+ Elf32_Half e_type; /* Object file type */
-+ Elf32_Half e_machine; /* Architecture */
-+ Elf32_Word e_version; /* Object file version */
-+ Elf32_Addr e_entry; /* Entry point virtual address */
-+ Elf32_Off e_phoff; /* Program header table file offset */
-+ Elf32_Off e_shoff; /* Section header table file offset */
-+ Elf32_Word e_flags; /* Processor-specific flags */
-+ Elf32_Half e_ehsize; /* ELF header size in bytes */
-+ Elf32_Half e_phentsize; /* Program header table entry size */
-+ Elf32_Half e_phnum; /* Program header table entry count */
-+ Elf32_Half e_shentsize; /* Section header table entry size */
-+ Elf32_Half e_shnum; /* Section header table entry count */
-+ Elf32_Half e_shstrndx; /* Section header string table index */
-+} Elf32_Ehdr;
-+
-+typedef struct
-+{
-+ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */
-+ Elf64_Half e_type; /* Object file type */
-+ Elf64_Half e_machine; /* Architecture */
-+ Elf64_Word e_version; /* Object file version */
-+ Elf64_Addr e_entry; /* Entry point virtual address */
-+ Elf64_Off e_phoff; /* Program header table file offset */
-+ Elf64_Off e_shoff; /* Section header table file offset */
-+ Elf64_Word e_flags; /* Processor-specific flags */
-+ Elf64_Half e_ehsize; /* ELF header size in bytes */
-+ Elf64_Half e_phentsize; /* Program header table entry size */
-+ Elf64_Half e_phnum; /* Program header table entry count */
-+ Elf64_Half e_shentsize; /* Section header table entry size */
-+ Elf64_Half e_shnum; /* Section header table entry count */
-+ Elf64_Half e_shstrndx; /* Section header string table index */
-+} Elf64_Ehdr;
-+
-+/* Fields in the e_ident array. The EI_* macros are indices into the
-+ array. The macros under each EI_* macro are the values the byte
-+ may have. */
-+
-+#define EI_MAG0 0 /* File identification byte 0 index */
-+#define ELFMAG0 0x7f /* Magic number byte 0 */
-+
-+#define EI_MAG1 1 /* File identification byte 1 index */
-+#define ELFMAG1 'E' /* Magic number byte 1 */
-+
-+#define EI_MAG2 2 /* File identification byte 2 index */
-+#define ELFMAG2 'L' /* Magic number byte 2 */
-+
-+#define EI_MAG3 3 /* File identification byte 3 index */
-+#define ELFMAG3 'F' /* Magic number byte 3 */
-+
-+/* Conglomeration of the identification bytes, for easy testing as a word. */
-+#define ELFMAG "\177ELF"
-+#define SELFMAG 4
-+
-+#define EI_CLASS 4 /* File class byte index */
-+#define ELFCLASSNONE 0 /* Invalid class */
-+#define ELFCLASS32 1 /* 32-bit objects */
-+#define ELFCLASS64 2 /* 64-bit objects */
-+#define ELFCLASSNUM 3
-+
-+#define EI_DATA 5 /* Data encoding byte index */
-+#define ELFDATANONE 0 /* Invalid data encoding */
-+#define ELFDATA2LSB 1 /* 2's complement, little endian */
-+#define ELFDATA2MSB 2 /* 2's complement, big endian */
-+#define ELFDATANUM 3
-+
-+#define EI_VERSION 6 /* File version byte index */
-+ /* Value must be EV_CURRENT */
-+
-+#define EI_OSABI 7 /* OS ABI identification */
-+#define ELFOSABI_NONE 0 /* UNIX System V ABI */
-+#define ELFOSABI_SYSV 0 /* Alias. */
-+#define ELFOSABI_HPUX 1 /* HP-UX */
-+#define ELFOSABI_NETBSD 2 /* NetBSD. */
-+#define ELFOSABI_LINUX 3 /* Linux. */
-+#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */
-+#define ELFOSABI_AIX 7 /* IBM AIX. */
-+#define ELFOSABI_IRIX 8 /* SGI Irix. */
-+#define ELFOSABI_FREEBSD 9 /* FreeBSD. */
-+#define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */
-+#define ELFOSABI_MODESTO 11 /* Novell Modesto. */
-+#define ELFOSABI_OPENBSD 12 /* OpenBSD. */
-+#define ELFOSABI_ARM 97 /* ARM */
-+#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */
-+
-+#define EI_ABIVERSION 8 /* ABI version */
-+
-+#define EI_PAD 9 /* Byte index of padding bytes */
-+
-+/* Legal values for e_type (object file type). */
-+
-+#define ET_NONE 0 /* No file type */
-+#define ET_REL 1 /* Relocatable file */
-+#define ET_EXEC 2 /* Executable file */
-+#define ET_DYN 3 /* Shared object file */
-+#define ET_CORE 4 /* Core file */
-+#define ET_NUM 5 /* Number of defined types */
-+#define ET_LOOS 0xfe00 /* OS-specific range start */
-+#define ET_HIOS 0xfeff /* OS-specific range end */
-+#define ET_LOPROC 0xff00 /* Processor-specific range start */
-+#define ET_HIPROC 0xffff /* Processor-specific range end */
-+
-+/* Legal values for e_machine (architecture). */
-+
-+#define EM_NONE 0 /* No machine */
-+#define EM_M32 1 /* AT&T WE 32100 */
-+#define EM_SPARC 2 /* SUN SPARC */
-+#define EM_386 3 /* Intel 80386 */
-+#define EM_68K 4 /* Motorola m68k family */
-+#define EM_88K 5 /* Motorola m88k family */
-+#define EM_860 7 /* Intel 80860 */
-+#define EM_MIPS 8 /* MIPS R3000 big-endian */
-+#define EM_S370 9 /* IBM System/370 */
-+#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */
-+
-+#define EM_PARISC 15 /* HPPA */
-+#define EM_VPP500 17 /* Fujitsu VPP500 */
-+#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
-+#define EM_960 19 /* Intel 80960 */
-+#define EM_PPC 20 /* PowerPC */
-+#define EM_PPC64 21 /* PowerPC 64-bit */
-+#define EM_S390 22 /* IBM S390 */
-+
-+#define EM_V800 36 /* NEC V800 series */
-+#define EM_FR20 37 /* Fujitsu FR20 */
-+#define EM_RH32 38 /* TRW RH-32 */
-+#define EM_RCE 39 /* Motorola RCE */
-+#define EM_ARM 40 /* ARM */
-+#define EM_FAKE_ALPHA 41 /* Digital Alpha */
-+#define EM_SH 42 /* Hitachi SH */
-+#define EM_SPARCV9 43 /* SPARC v9 64-bit */
-+#define EM_TRICORE 44 /* Siemens Tricore */
-+#define EM_ARC 45 /* Argonaut RISC Core */
-+#define EM_H8_300 46 /* Hitachi H8/300 */
-+#define EM_H8_300H 47 /* Hitachi H8/300H */
-+#define EM_H8S 48 /* Hitachi H8S */
-+#define EM_H8_500 49 /* Hitachi H8/500 */
-+#define EM_IA_64 50 /* Intel Merced */
-+#define EM_MIPS_X 51 /* Stanford MIPS-X */
-+#define EM_COLDFIRE 52 /* Motorola Coldfire */
-+#define EM_68HC12 53 /* Motorola M68HC12 */
-+#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/
-+#define EM_PCP 55 /* Siemens PCP */
-+#define EM_NCPU 56 /* Sony nCPU embeeded RISC */
-+#define EM_NDR1 57 /* Denso NDR1 microprocessor */
-+#define EM_STARCORE 58 /* Motorola Start*Core processor */
-+#define EM_ME16 59 /* Toyota ME16 processor */
-+#define EM_ST100 60 /* STMicroelectronic ST100 processor */
-+#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/
-+#define EM_X86_64 62 /* AMD x86-64 architecture */
-+#define EM_PDSP 63 /* Sony DSP Processor */
-+
-+#define EM_FX66 66 /* Siemens FX66 microcontroller */
-+#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */
-+#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */
-+#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */
-+#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */
-+#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */
-+#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */
-+#define EM_SVX 73 /* Silicon Graphics SVx */
-+#define EM_ST19 74 /* STMicroelectronics ST19 8 bit mc */
-+#define EM_VAX 75 /* Digital VAX */
-+#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
-+#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */
-+#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */
-+#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */
-+#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */
-+#define EM_HUANY 81 /* Harvard University machine-independent object files */
-+#define EM_PRISM 82 /* SiTera Prism */
-+#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */
-+#define EM_FR30 84 /* Fujitsu FR30 */
-+#define EM_D10V 85 /* Mitsubishi D10V */
-+#define EM_D30V 86 /* Mitsubishi D30V */
-+#define EM_V850 87 /* NEC v850 */
-+#define EM_M32R 88 /* Mitsubishi M32R */
-+#define EM_MN10300 89 /* Matsushita MN10300 */
-+#define EM_MN10200 90 /* Matsushita MN10200 */
-+#define EM_PJ 91 /* picoJava */
-+#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
-+#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */
-+#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */
-+#define EM_NUM 95
-+
-+/* If it is necessary to assign new unofficial EM_* values, please
-+ pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
-+ chances of collision with official or non-GNU unofficial values. */
-+
-+#define EM_ALPHA 0x9026
-+
-+/* Legal values for e_version (version). */
-+
-+#define EV_NONE 0 /* Invalid ELF version */
-+#define EV_CURRENT 1 /* Current version */
-+#define EV_NUM 2
-+
-+/* Section header. */
-+
-+typedef struct
-+{
-+ Elf32_Word sh_name; /* Section name (string tbl index) */
-+ Elf32_Word sh_type; /* Section type */
-+ Elf32_Word sh_flags; /* Section flags */
-+ Elf32_Addr sh_addr; /* Section virtual addr at execution */
-+ Elf32_Off sh_offset; /* Section file offset */
-+ Elf32_Word sh_size; /* Section size in bytes */
-+ Elf32_Word sh_link; /* Link to another section */
-+ Elf32_Word sh_info; /* Additional section information */
-+ Elf32_Word sh_addralign; /* Section alignment */
-+ Elf32_Word sh_entsize; /* Entry size if section holds table */
-+} Elf32_Shdr;
-+
-+typedef struct
-+{
-+ Elf64_Word sh_name; /* Section name (string tbl index) */
-+ Elf64_Word sh_type; /* Section type */
-+ Elf64_Xword sh_flags; /* Section flags */
-+ Elf64_Addr sh_addr; /* Section virtual addr at execution */
-+ Elf64_Off sh_offset; /* Section file offset */
-+ Elf64_Xword sh_size; /* Section size in bytes */
-+ Elf64_Word sh_link; /* Link to another section */
-+ Elf64_Word sh_info; /* Additional section information */
-+ Elf64_Xword sh_addralign; /* Section alignment */
-+ Elf64_Xword sh_entsize; /* Entry size if section holds table */
-+} Elf64_Shdr;
-+
-+/* Special section indices. */
-+
-+#define SHN_UNDEF 0 /* Undefined section */
-+#define SHN_LORESERVE 0xff00 /* Start of reserved indices */
-+#define SHN_LOPROC 0xff00 /* Start of processor-specific */
-+#define SHN_HIPROC 0xff1f /* End of processor-specific */
-+#define SHN_LOOS 0xff20 /* Start of OS-specific */
-+#define SHN_HIOS 0xff3f /* End of OS-specific */
-+#define SHN_ABS 0xfff1 /* Associated symbol is absolute */
-+#define SHN_COMMON 0xfff2 /* Associated symbol is common */
-+#define SHN_XINDEX 0xffff /* Index is in extra table. */
-+#define SHN_HIRESERVE 0xffff /* End of reserved indices */
-+
-+/* Legal values for sh_type (section type). */
-+
-+#define SHT_NULL 0 /* Section header table entry unused */
-+#define SHT_PROGBITS 1 /* Program data */
-+#define SHT_SYMTAB 2 /* Symbol table */
-+#define SHT_STRTAB 3 /* String table */
-+#define SHT_RELA 4 /* Relocation entries with addends */
-+#define SHT_HASH 5 /* Symbol hash table */
-+#define SHT_DYNAMIC 6 /* Dynamic linking information */
-+#define SHT_NOTE 7 /* Notes */
-+#define SHT_NOBITS 8 /* Program space with no data (bss) */
-+#define SHT_REL 9 /* Relocation entries, no addends */
-+#define SHT_SHLIB 10 /* Reserved */
-+#define SHT_DYNSYM 11 /* Dynamic linker symbol table */
-+#define SHT_INIT_ARRAY 14 /* Array of constructors */
-+#define SHT_FINI_ARRAY 15 /* Array of destructors */
-+#define SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */
-+#define SHT_GROUP 17 /* Section group */
-+#define SHT_SYMTAB_SHNDX 18 /* Extended section indeces */
-+#define SHT_NUM 19 /* Number of defined types. */
-+#define SHT_LOOS 0x60000000 /* Start OS-specific */
-+#define SHT_GNU_LIBLIST 0x6ffffff7 /* Prelink library list */
-+#define SHT_CHECKSUM 0x6ffffff8 /* Checksum for DSO content. */
-+#define SHT_LOSUNW 0x6ffffffa /* Sun-specific low bound. */
-+#define SHT_SUNW_move 0x6ffffffa
-+#define SHT_SUNW_COMDAT 0x6ffffffb
-+#define SHT_SUNW_syminfo 0x6ffffffc
-+#define SHT_GNU_verdef 0x6ffffffd /* Version definition section. */
-+#define SHT_GNU_verneed 0x6ffffffe /* Version needs section. */
-+#define SHT_GNU_versym 0x6fffffff /* Version symbol table. */
-+#define SHT_HISUNW 0x6fffffff /* Sun-specific high bound. */
-+#define SHT_HIOS 0x6fffffff /* End OS-specific type */
-+#define SHT_LOPROC 0x70000000 /* Start of processor-specific */
-+#define SHT_HIPROC 0x7fffffff /* End of processor-specific */
-+#define SHT_LOUSER 0x80000000 /* Start of application-specific */
-+#define SHT_HIUSER 0x8fffffff /* End of application-specific */
-+
-+/* Legal values for sh_flags (section flags). */
-+
-+#define SHF_WRITE (1 << 0) /* Writable */
-+#define SHF_ALLOC (1 << 1) /* Occupies memory during execution */
-+#define SHF_EXECINSTR (1 << 2) /* Executable */
-+#define SHF_MERGE (1 << 4) /* Might be merged */
-+#define SHF_STRINGS (1 << 5) /* Contains nul-terminated strings */
-+#define SHF_INFO_LINK (1 << 6) /* `sh_info' contains SHT index */
-+#define SHF_LINK_ORDER (1 << 7) /* Preserve order after combining */
-+#define SHF_OS_NONCONFORMING (1 << 8) /* Non-standard OS specific handling
-+ required */
-+#define SHF_GROUP (1 << 9) /* Section is member of a group. */
-+#define SHF_TLS (1 << 10) /* Section hold thread-local data. */
-+#define SHF_MASKOS 0x0ff00000 /* OS-specific. */
-+#define SHF_MASKPROC 0xf0000000 /* Processor-specific */
-+
-+/* Section group handling. */
-+#define GRP_COMDAT 0x1 /* Mark group as COMDAT. */
-+
-+/* Symbol table entry. */
-+
-+typedef struct
-+{
-+ Elf32_Word st_name; /* Symbol name (string tbl index) */
-+ Elf32_Addr st_value; /* Symbol value */
-+ Elf32_Word st_size; /* Symbol size */
-+ unsigned char st_info; /* Symbol type and binding */
-+ unsigned char st_other; /* Symbol visibility */
-+ Elf32_Section st_shndx; /* Section index */
-+} Elf32_Sym;
-+
-+typedef struct
-+{
-+ Elf64_Word st_name; /* Symbol name (string tbl index) */
-+ unsigned char st_info; /* Symbol type and binding */
-+ unsigned char st_other; /* Symbol visibility */
-+ Elf64_Section st_shndx; /* Section index */
-+ Elf64_Addr st_value; /* Symbol value */
-+ Elf64_Xword st_size; /* Symbol size */
-+} Elf64_Sym;
-+
-+/* The syminfo section if available contains additional information about
-+ every dynamic symbol. */
-+
-+typedef struct
-+{
-+ Elf32_Half si_boundto; /* Direct bindings, symbol bound to */
-+ Elf32_Half si_flags; /* Per symbol flags */
-+} Elf32_Syminfo;
-+
-+typedef struct
-+{
-+ Elf64_Half si_boundto; /* Direct bindings, symbol bound to */
-+ Elf64_Half si_flags; /* Per symbol flags */
-+} Elf64_Syminfo;
-+
-+/* Possible values for si_boundto. */
-+#define SYMINFO_BT_SELF 0xffff /* Symbol bound to self */
-+#define SYMINFO_BT_PARENT 0xfffe /* Symbol bound to parent */
-+#define SYMINFO_BT_LOWRESERVE 0xff00 /* Beginning of reserved entries */
-+
-+/* Possible bitmasks for si_flags. */
-+#define SYMINFO_FLG_DIRECT 0x0001 /* Direct bound symbol */
-+#define SYMINFO_FLG_PASSTHRU 0x0002 /* Pass-thru symbol for translator */
-+#define SYMINFO_FLG_COPY 0x0004 /* Symbol is a copy-reloc */
-+#define SYMINFO_FLG_LAZYLOAD 0x0008 /* Symbol bound to object to be lazy
-+ loaded */
-+/* Syminfo version values. */
-+#define SYMINFO_NONE 0
-+#define SYMINFO_CURRENT 1
-+#define SYMINFO_NUM 2
-+
-+
-+/* How to extract and insert information held in the st_info field. */
-+
-+#define ELF32_ST_BIND(val) (((unsigned char) (val)) >> 4)
-+#define ELF32_ST_TYPE(val) ((val) & 0xf)
-+#define ELF32_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf))
-+
-+/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field. */
-+#define ELF64_ST_BIND(val) ELF32_ST_BIND (val)
-+#define ELF64_ST_TYPE(val) ELF32_ST_TYPE (val)
-+#define ELF64_ST_INFO(bind, type) ELF32_ST_INFO ((bind), (type))
-+
-+/* Legal values for ST_BIND subfield of st_info (symbol binding). */
-+
-+#define STB_LOCAL 0 /* Local symbol */
-+#define STB_GLOBAL 1 /* Global symbol */
-+#define STB_WEAK 2 /* Weak symbol */
-+#define STB_NUM 3 /* Number of defined types. */
-+#define STB_LOOS 10 /* Start of OS-specific */
-+#define STB_HIOS 12 /* End of OS-specific */
-+#define STB_LOPROC 13 /* Start of processor-specific */
-+#define STB_HIPROC 15 /* End of processor-specific */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type). */
-+
-+#define STT_NOTYPE 0 /* Symbol type is unspecified */
-+#define STT_OBJECT 1 /* Symbol is a data object */
-+#define STT_FUNC 2 /* Symbol is a code object */
-+#define STT_SECTION 3 /* Symbol associated with a section */
-+#define STT_FILE 4 /* Symbol's name is file name */
-+#define STT_COMMON 5 /* Symbol is a common data object */
-+#define STT_TLS 6 /* Symbol is thread-local data object*/
-+#define STT_NUM 7 /* Number of defined types. */
-+#define STT_LOOS 10 /* Start of OS-specific */
-+#define STT_HIOS 12 /* End of OS-specific */
-+#define STT_LOPROC 13 /* Start of processor-specific */
-+#define STT_HIPROC 15 /* End of processor-specific */
-+
-+
-+/* Symbol table indices are found in the hash buckets and chain table
-+ of a symbol hash table section. This special index value indicates
-+ the end of a chain, meaning no further symbols are found in that bucket. */
-+
-+#define STN_UNDEF 0 /* End of a chain. */
-+
-+
-+/* How to extract and insert information held in the st_other field. */
-+
-+#define ELF32_ST_VISIBILITY(o) ((o) & 0x03)
-+
-+/* For ELF64 the definitions are the same. */
-+#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o)
-+
-+/* Symbol visibility specification encoded in the st_other field. */
-+#define STV_DEFAULT 0 /* Default symbol visibility rules */
-+#define STV_INTERNAL 1 /* Processor specific hidden class */
-+#define STV_HIDDEN 2 /* Sym unavailable in other modules */
-+#define STV_PROTECTED 3 /* Not preemptible, not exported */
-+
-+
-+/* Relocation table entry without addend (in section of type SHT_REL). */
-+
-+typedef struct
-+{
-+ Elf32_Addr r_offset; /* Address */
-+ Elf32_Word r_info; /* Relocation type and symbol index */
-+} Elf32_Rel;
-+
-+/* I have seen two different definitions of the Elf64_Rel and
-+ Elf64_Rela structures, so we'll leave them out until Novell (or
-+ whoever) gets their act together. */
-+/* The following, at least, is used on Sparc v9, MIPS, and Alpha. */
-+
-+typedef struct
-+{
-+ Elf64_Addr r_offset; /* Address */
-+ Elf64_Xword r_info; /* Relocation type and symbol index */
-+} Elf64_Rel;
-+
-+/* Relocation table entry with addend (in section of type SHT_RELA). */
-+
-+typedef struct
-+{
-+ Elf32_Addr r_offset; /* Address */
-+ Elf32_Word r_info; /* Relocation type and symbol index */
-+ Elf32_Sword r_addend; /* Addend */
-+} Elf32_Rela;
-+
-+typedef struct
-+{
-+ Elf64_Addr r_offset; /* Address */
-+ Elf64_Xword r_info; /* Relocation type and symbol index */
-+ Elf64_Sxword r_addend; /* Addend */
-+} Elf64_Rela;
-+
-+/* How to extract and insert information held in the r_info field. */
-+
-+#define ELF32_R_SYM(val) ((val) >> 8)
-+#define ELF32_R_TYPE(val) ((val) & 0xff)
-+#define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type) & 0xff))
-+
-+#define ELF64_R_SYM(i) ((i) >> 32)
-+#define ELF64_R_TYPE(i) ((i) & 0xffffffff)
-+#define ELF64_R_INFO(sym,type) ((((Elf64_Xword) (sym)) << 32) + (type))
-+
-+/* Program segment header. */
-+
-+typedef struct
-+{
-+ Elf32_Word p_type; /* Segment type */
-+ Elf32_Off p_offset; /* Segment file offset */
-+ Elf32_Addr p_vaddr; /* Segment virtual address */
-+ Elf32_Addr p_paddr; /* Segment physical address */
-+ Elf32_Word p_filesz; /* Segment size in file */
-+ Elf32_Word p_memsz; /* Segment size in memory */
-+ Elf32_Word p_flags; /* Segment flags */
-+ Elf32_Word p_align; /* Segment alignment */
-+} Elf32_Phdr;
-+
-+typedef struct
-+{
-+ Elf64_Word p_type; /* Segment type */
-+ Elf64_Word p_flags; /* Segment flags */
-+ Elf64_Off p_offset; /* Segment file offset */
-+ Elf64_Addr p_vaddr; /* Segment virtual address */
-+ Elf64_Addr p_paddr; /* Segment physical address */
-+ Elf64_Xword p_filesz; /* Segment size in file */
-+ Elf64_Xword p_memsz; /* Segment size in memory */
-+ Elf64_Xword p_align; /* Segment alignment */
-+} Elf64_Phdr;
-+
-+/* Legal values for p_type (segment type). */
-+
-+#define PT_NULL 0 /* Program header table entry unused */
-+#define PT_LOAD 1 /* Loadable program segment */
-+#define PT_DYNAMIC 2 /* Dynamic linking information */
-+#define PT_INTERP 3 /* Program interpreter */
-+#define PT_NOTE 4 /* Auxiliary information */
-+#define PT_SHLIB 5 /* Reserved */
-+#define PT_PHDR 6 /* Entry for header table itself */
-+#define PT_TLS 7 /* Thread-local storage segment */
-+#define PT_NUM 8 /* Number of defined types */
-+#define PT_LOOS 0x60000000 /* Start of OS-specific */
-+#define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */
-+#define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */
-+#define PT_LOSUNW 0x6ffffffa
-+#define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */
-+#define PT_SUNWSTACK 0x6ffffffb /* Stack segment */
-+#define PT_HISUNW 0x6fffffff
-+#define PT_HIOS 0x6fffffff /* End of OS-specific */
-+#define PT_LOPROC 0x70000000 /* Start of processor-specific */
-+#define PT_HIPROC 0x7fffffff /* End of processor-specific */
-+
-+/* Legal values for p_flags (segment flags). */
-+
-+#define PF_X (1 << 0) /* Segment is executable */
-+#define PF_W (1 << 1) /* Segment is writable */
-+#define PF_R (1 << 2) /* Segment is readable */
-+#define PF_MASKOS 0x0ff00000 /* OS-specific */
-+#define PF_MASKPROC 0xf0000000 /* Processor-specific */
-+
-+/* Legal values for note segment descriptor types for core files. */
-+
-+#define NT_PRSTATUS 1 /* Contains copy of prstatus struct */
-+#define NT_FPREGSET 2 /* Contains copy of fpregset struct */
-+#define NT_PRPSINFO 3 /* Contains copy of prpsinfo struct */
-+#define NT_PRXREG 4 /* Contains copy of prxregset struct */
-+#define NT_TASKSTRUCT 4 /* Contains copy of task structure */
-+#define NT_PLATFORM 5 /* String from sysinfo(SI_PLATFORM) */
-+#define NT_AUXV 6 /* Contains copy of auxv array */
-+#define NT_GWINDOWS 7 /* Contains copy of gwindows struct */
-+#define NT_ASRS 8 /* Contains copy of asrset struct */
-+#define NT_PSTATUS 10 /* Contains copy of pstatus struct */
-+#define NT_PSINFO 13 /* Contains copy of psinfo struct */
-+#define NT_PRCRED 14 /* Contains copy of prcred struct */
-+#define NT_UTSNAME 15 /* Contains copy of utsname struct */
-+#define NT_LWPSTATUS 16 /* Contains copy of lwpstatus struct */
-+#define NT_LWPSINFO 17 /* Contains copy of lwpinfo struct */
-+#define NT_PRFPXREG 20 /* Contains copy of fprxregset struct*/
-+
-+/* Legal values for the note segment descriptor types for object files. */
-+
-+#define NT_VERSION 1 /* Contains a version string. */
-+
-+
-+/* Dynamic section entry. */
-+
-+typedef struct
-+{
-+ Elf32_Sword d_tag; /* Dynamic entry type */
-+ union
-+ {
-+ Elf32_Word d_val; /* Integer value */
-+ Elf32_Addr d_ptr; /* Address value */
-+ } d_un;
-+} Elf32_Dyn;
-+
-+typedef struct
-+{
-+ Elf64_Sxword d_tag; /* Dynamic entry type */
-+ union
-+ {
-+ Elf64_Xword d_val; /* Integer value */
-+ Elf64_Addr d_ptr; /* Address value */
-+ } d_un;
-+} Elf64_Dyn;
-+
-+/* Legal values for d_tag (dynamic entry type). */
-+
-+#define DT_NULL 0 /* Marks end of dynamic section */
-+#define DT_NEEDED 1 /* Name of needed library */
-+#define DT_PLTRELSZ 2 /* Size in bytes of PLT relocs */
-+#define DT_PLTGOT 3 /* Processor defined value */
-+#define DT_HASH 4 /* Address of symbol hash table */
-+#define DT_STRTAB 5 /* Address of string table */
-+#define DT_SYMTAB 6 /* Address of symbol table */
-+#define DT_RELA 7 /* Address of Rela relocs */
-+#define DT_RELASZ 8 /* Total size of Rela relocs */
-+#define DT_RELAENT 9 /* Size of one Rela reloc */
-+#define DT_STRSZ 10 /* Size of string table */
-+#define DT_SYMENT 11 /* Size of one symbol table entry */
-+#define DT_INIT 12 /* Address of init function */
-+#define DT_FINI 13 /* Address of termination function */
-+#define DT_SONAME 14 /* Name of shared object */
-+#define DT_RPATH 15 /* Library search path (deprecated) */
-+#define DT_SYMBOLIC 16 /* Start symbol search here */
-+#define DT_REL 17 /* Address of Rel relocs */
-+#define DT_RELSZ 18 /* Total size of Rel relocs */
-+#define DT_RELENT 19 /* Size of one Rel reloc */
-+#define DT_PLTREL 20 /* Type of reloc in PLT */
-+#define DT_DEBUG 21 /* For debugging; unspecified */
-+#define DT_TEXTREL 22 /* Reloc might modify .text */
-+#define DT_JMPREL 23 /* Address of PLT relocs */
-+#define DT_BIND_NOW 24 /* Process relocations of object */
-+#define DT_INIT_ARRAY 25 /* Array with addresses of init fct */
-+#define DT_FINI_ARRAY 26 /* Array with addresses of fini fct */
-+#define DT_INIT_ARRAYSZ 27 /* Size in bytes of DT_INIT_ARRAY */
-+#define DT_FINI_ARRAYSZ 28 /* Size in bytes of DT_FINI_ARRAY */
-+#define DT_RUNPATH 29 /* Library search path */
-+#define DT_FLAGS 30 /* Flags for the object being loaded */
-+#define DT_ENCODING 32 /* Start of encoded range */
-+#define DT_PREINIT_ARRAY 32 /* Array with addresses of preinit fct*/
-+#define DT_PREINIT_ARRAYSZ 33 /* size in bytes of DT_PREINIT_ARRAY */
-+#define DT_NUM 34 /* Number used */
-+#define DT_LOOS 0x6000000d /* Start of OS-specific */
-+#define DT_HIOS 0x6ffff000 /* End of OS-specific */
-+#define DT_LOPROC 0x70000000 /* Start of processor-specific */
-+#define DT_HIPROC 0x7fffffff /* End of processor-specific */
-+#define DT_PROCNUM DT_MIPS_NUM /* Most used by any processor */
-+
-+/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
-+ Dyn.d_un.d_val field of the Elf*_Dyn structure. This follows Sun's
-+ approach. */
-+#define DT_VALRNGLO 0x6ffffd00
-+#define DT_GNU_PRELINKED 0x6ffffdf5 /* Prelinking timestamp */
-+#define DT_GNU_CONFLICTSZ 0x6ffffdf6 /* Size of conflict section */
-+#define DT_GNU_LIBLISTSZ 0x6ffffdf7 /* Size of library list */
-+#define DT_CHECKSUM 0x6ffffdf8
-+#define DT_PLTPADSZ 0x6ffffdf9
-+#define DT_MOVEENT 0x6ffffdfa
-+#define DT_MOVESZ 0x6ffffdfb
-+#define DT_FEATURE_1 0x6ffffdfc /* Feature selection (DTF_*). */
-+#define DT_POSFLAG_1 0x6ffffdfd /* Flags for DT_* entries, effecting
-+ the following DT_* entry. */
-+#define DT_SYMINSZ 0x6ffffdfe /* Size of syminfo table (in bytes) */
-+#define DT_SYMINENT 0x6ffffdff /* Entry size of syminfo */
-+#define DT_VALRNGHI 0x6ffffdff
-+#define DT_VALTAGIDX(tag) (DT_VALRNGHI - (tag)) /* Reverse order! */
-+#define DT_VALNUM 12
-+
-+/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
-+ Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
-+
-+ If any adjustment is made to the ELF object after it has been
-+ built these entries will need to be adjusted. */
-+#define DT_ADDRRNGLO 0x6ffffe00
-+#define DT_GNU_CONFLICT 0x6ffffef8 /* Start of conflict section */
-+#define DT_GNU_LIBLIST 0x6ffffef9 /* Library list */
-+#define DT_CONFIG 0x6ffffefa /* Configuration information. */
-+#define DT_DEPAUDIT 0x6ffffefb /* Dependency auditing. */
-+#define DT_AUDIT 0x6ffffefc /* Object auditing. */
-+#define DT_PLTPAD 0x6ffffefd /* PLT padding. */
-+#define DT_MOVETAB 0x6ffffefe /* Move table. */
-+#define DT_SYMINFO 0x6ffffeff /* Syminfo table. */
-+#define DT_ADDRRNGHI 0x6ffffeff
-+#define DT_ADDRTAGIDX(tag) (DT_ADDRRNGHI - (tag)) /* Reverse order! */
-+#define DT_ADDRNUM 10
-+
-+/* The versioning entry types. The next are defined as part of the
-+ GNU extension. */
-+#define DT_VERSYM 0x6ffffff0
-+
-+#define DT_RELACOUNT 0x6ffffff9
-+#define DT_RELCOUNT 0x6ffffffa
-+
-+/* These were chosen by Sun. */
-+#define DT_FLAGS_1 0x6ffffffb /* State flags, see DF_1_* below. */
-+#define DT_VERDEF 0x6ffffffc /* Address of version definition
-+ table */
-+#define DT_VERDEFNUM 0x6ffffffd /* Number of version definitions */
-+#define DT_VERNEED 0x6ffffffe /* Address of table with needed
-+ versions */
-+#define DT_VERNEEDNUM 0x6fffffff /* Number of needed versions */
-+#define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag)) /* Reverse order! */
-+#define DT_VERSIONTAGNUM 16
-+
-+/* Sun added these machine-independent extensions in the "processor-specific"
-+ range. Be compatible. */
-+#define DT_AUXILIARY 0x7ffffffd /* Shared object to load before self */
-+#define DT_FILTER 0x7fffffff /* Shared object to get values from */
-+#define DT_EXTRATAGIDX(tag) ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-+#define DT_EXTRANUM 3
-+
-+/* Values of `d_un.d_val' in the DT_FLAGS entry. */
-+#define DF_ORIGIN 0x00000001 /* Object may use DF_ORIGIN */
-+#define DF_SYMBOLIC 0x00000002 /* Symbol resolutions starts here */
-+#define DF_TEXTREL 0x00000004 /* Object contains text relocations */
-+#define DF_BIND_NOW 0x00000008 /* No lazy binding for this object */
-+#define DF_STATIC_TLS 0x00000010 /* Module uses the static TLS model */
-+
-+/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
-+ entry in the dynamic section. */
-+#define DF_1_NOW 0x00000001 /* Set RTLD_NOW for this object. */
-+#define DF_1_GLOBAL 0x00000002 /* Set RTLD_GLOBAL for this object. */
-+#define DF_1_GROUP 0x00000004 /* Set RTLD_GROUP for this object. */
-+#define DF_1_NODELETE 0x00000008 /* Set RTLD_NODELETE for this object.*/
-+#define DF_1_LOADFLTR 0x00000010 /* Trigger filtee loading at runtime.*/
-+#define DF_1_INITFIRST 0x00000020 /* Set RTLD_INITFIRST for this object*/
-+#define DF_1_NOOPEN 0x00000040 /* Set RTLD_NOOPEN for this object. */
-+#define DF_1_ORIGIN 0x00000080 /* $ORIGIN must be handled. */
-+#define DF_1_DIRECT 0x00000100 /* Direct binding enabled. */
-+#define DF_1_TRANS 0x00000200
-+#define DF_1_INTERPOSE 0x00000400 /* Object is used to interpose. */
-+#define DF_1_NODEFLIB 0x00000800 /* Ignore default lib search path. */
-+#define DF_1_NODUMP 0x00001000 /* Object can't be dldump'ed. */
-+#define DF_1_CONFALT 0x00002000 /* Configuration alternative created.*/
-+#define DF_1_ENDFILTEE 0x00004000 /* Filtee terminates filters search. */
-+#define DF_1_DISPRELDNE 0x00008000 /* Disp reloc applied at build time. */
-+#define DF_1_DISPRELPND 0x00010000 /* Disp reloc applied at run-time. */
-+
-+/* Flags for the feature selection in DT_FEATURE_1. */
-+#define DTF_1_PARINIT 0x00000001
-+#define DTF_1_CONFEXP 0x00000002
-+
-+/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry. */
-+#define DF_P1_LAZYLOAD 0x00000001 /* Lazyload following object. */
-+#define DF_P1_GROUPPERM 0x00000002 /* Symbols from next object are not
-+ generally available. */
-+
-+/* Version definition sections. */
-+
-+typedef struct
-+{
-+ Elf32_Half vd_version; /* Version revision */
-+ Elf32_Half vd_flags; /* Version information */
-+ Elf32_Half vd_ndx; /* Version Index */
-+ Elf32_Half vd_cnt; /* Number of associated aux entries */
-+ Elf32_Word vd_hash; /* Version name hash value */
-+ Elf32_Word vd_aux; /* Offset in bytes to verdaux array */
-+ Elf32_Word vd_next; /* Offset in bytes to next verdef
-+ entry */
-+} Elf32_Verdef;
-+
-+typedef struct
-+{
-+ Elf64_Half vd_version; /* Version revision */
-+ Elf64_Half vd_flags; /* Version information */
-+ Elf64_Half vd_ndx; /* Version Index */
-+ Elf64_Half vd_cnt; /* Number of associated aux entries */
-+ Elf64_Word vd_hash; /* Version name hash value */
-+ Elf64_Word vd_aux; /* Offset in bytes to verdaux array */
-+ Elf64_Word vd_next; /* Offset in bytes to next verdef
-+ entry */
-+} Elf64_Verdef;
-+
-+
-+/* Legal values for vd_version (version revision). */
-+#define VER_DEF_NONE 0 /* No version */
-+#define VER_DEF_CURRENT 1 /* Current version */
-+#define VER_DEF_NUM 2 /* Given version number */
-+
-+/* Legal values for vd_flags (version information flags). */
-+#define VER_FLG_BASE 0x1 /* Version definition of file itself */
-+#define VER_FLG_WEAK 0x2 /* Weak version identifier */
-+
-+/* Versym symbol index values. */
-+#define VER_NDX_LOCAL 0 /* Symbol is local. */
-+#define VER_NDX_GLOBAL 1 /* Symbol is global. */
-+#define VER_NDX_LORESERVE 0xff00 /* Beginning of reserved entries. */
-+#define VER_NDX_ELIMINATE 0xff01 /* Symbol is to be eliminated. */
-+
-+/* Auxialiary version information. */
-+
-+typedef struct
-+{
-+ Elf32_Word vda_name; /* Version or dependency names */
-+ Elf32_Word vda_next; /* Offset in bytes to next verdaux
-+ entry */
-+} Elf32_Verdaux;
-+
-+typedef struct
-+{
-+ Elf64_Word vda_name; /* Version or dependency names */
-+ Elf64_Word vda_next; /* Offset in bytes to next verdaux
-+ entry */
-+} Elf64_Verdaux;
-+
-+
-+/* Version dependency section. */
-+
-+typedef struct
-+{
-+ Elf32_Half vn_version; /* Version of structure */
-+ Elf32_Half vn_cnt; /* Number of associated aux entries */
-+ Elf32_Word vn_file; /* Offset of filename for this
-+ dependency */
-+ Elf32_Word vn_aux; /* Offset in bytes to vernaux array */
-+ Elf32_Word vn_next; /* Offset in bytes to next verneed
-+ entry */
-+} Elf32_Verneed;
-+
-+typedef struct
-+{
-+ Elf64_Half vn_version; /* Version of structure */
-+ Elf64_Half vn_cnt; /* Number of associated aux entries */
-+ Elf64_Word vn_file; /* Offset of filename for this
-+ dependency */
-+ Elf64_Word vn_aux; /* Offset in bytes to vernaux array */
-+ Elf64_Word vn_next; /* Offset in bytes to next verneed
-+ entry */
-+} Elf64_Verneed;
-+
-+
-+/* Legal values for vn_version (version revision). */
-+#define VER_NEED_NONE 0 /* No version */
-+#define VER_NEED_CURRENT 1 /* Current version */
-+#define VER_NEED_NUM 2 /* Given version number */
-+
-+/* Auxiliary needed version information. */
-+
-+typedef struct
-+{
-+ Elf32_Word vna_hash; /* Hash value of dependency name */
-+ Elf32_Half vna_flags; /* Dependency specific information */
-+ Elf32_Half vna_other; /* Unused */
-+ Elf32_Word vna_name; /* Dependency name string offset */
-+ Elf32_Word vna_next; /* Offset in bytes to next vernaux
-+ entry */
-+} Elf32_Vernaux;
-+
-+typedef struct
-+{
-+ Elf64_Word vna_hash; /* Hash value of dependency name */
-+ Elf64_Half vna_flags; /* Dependency specific information */
-+ Elf64_Half vna_other; /* Unused */
-+ Elf64_Word vna_name; /* Dependency name string offset */
-+ Elf64_Word vna_next; /* Offset in bytes to next vernaux
-+ entry */
-+} Elf64_Vernaux;
-+
-+
-+/* Legal values for vna_flags. */
-+#define VER_FLG_WEAK 0x2 /* Weak version identifier */
-+
-+
-+/* Auxiliary vector. */
-+
-+/* This vector is normally only used by the program interpreter. The
-+ usual definition in an ABI supplement uses the name auxv_t. The
-+ vector is not usually defined in a standard <elf.h> file, but it
-+ can't hurt. We rename it to avoid conflicts. The sizes of these
-+ types are an arrangement between the exec server and the program
-+ interpreter, so we don't fully specify them here. */
-+
-+typedef struct
-+{
-+ int a_type; /* Entry type */
-+ union
-+ {
-+ long int a_val; /* Integer value */
-+ void *a_ptr; /* Pointer value */
-+ void (*a_fcn) (void); /* Function pointer value */
-+ } a_un;
-+} Elf32_auxv_t;
-+
-+typedef struct
-+{
-+ long int a_type; /* Entry type */
-+ union
-+ {
-+ long int a_val; /* Integer value */
-+ void *a_ptr; /* Pointer value */
-+ void (*a_fcn) (void); /* Function pointer value */
-+ } a_un;
-+} Elf64_auxv_t;
-+
-+/* Legal values for a_type (entry type). */
-+
-+#define AT_NULL 0 /* End of vector */
-+#define AT_IGNORE 1 /* Entry should be ignored */
-+#define AT_EXECFD 2 /* File descriptor of program */
-+#define AT_PHDR 3 /* Program headers for program */
-+#define AT_PHENT 4 /* Size of program header entry */
-+#define AT_PHNUM 5 /* Number of program headers */
-+#define AT_PAGESZ 6 /* System page size */
-+#define AT_BASE 7 /* Base address of interpreter */
-+#define AT_FLAGS 8 /* Flags */
-+#define AT_ENTRY 9 /* Entry point of program */
-+#define AT_NOTELF 10 /* Program is not ELF */
-+#define AT_UID 11 /* Real uid */
-+#define AT_EUID 12 /* Effective uid */
-+#define AT_GID 13 /* Real gid */
-+#define AT_EGID 14 /* Effective gid */
-+#define AT_CLKTCK 17 /* Frequency of times() */
-+
-+/* Some more special a_type values describing the hardware. */
-+#define AT_PLATFORM 15 /* String identifying platform. */
-+#define AT_HWCAP 16 /* Machine dependent hints about
-+ processor capabilities. */
-+
-+/* This entry gives some information about the FPU initialization
-+ performed by the kernel. */
-+#define AT_FPUCW 18 /* Used FPU control word. */
-+
-+/* Cache block sizes. */
-+#define AT_DCACHEBSIZE 19 /* Data cache block size. */
-+#define AT_ICACHEBSIZE 20 /* Instruction cache block size. */
-+#define AT_UCACHEBSIZE 21 /* Unified cache block size. */
-+
-+/* A special ignored value for PPC, used by the kernel to control the
-+ interpretation of the AUXV. Must be > 16. */
-+#define AT_IGNOREPPC 22 /* Entry should be ignored. */
-+
-+#define AT_SECURE 23 /* Boolean, was exec setuid-like? */
-+
-+/* Pointer to the global system page used for system calls and other
-+ nice things. */
-+#define AT_SYSINFO 32
-+#define AT_SYSINFO_EHDR 33
-+
-+
-+/* Note section contents. Each entry in the note section begins with
-+ a header of a fixed form. */
-+
-+typedef struct
-+{
-+ Elf32_Word n_namesz; /* Length of the note's name. */
-+ Elf32_Word n_descsz; /* Length of the note's descriptor. */
-+ Elf32_Word n_type; /* Type of the note. */
-+} Elf32_Nhdr;
-+
-+typedef struct
-+{
-+ Elf64_Word n_namesz; /* Length of the note's name. */
-+ Elf64_Word n_descsz; /* Length of the note's descriptor. */
-+ Elf64_Word n_type; /* Type of the note. */
-+} Elf64_Nhdr;
-+
-+/* Known names of notes. */
-+
-+/* Solaris entries in the note section have this name. */
-+#define ELF_NOTE_SOLARIS "SUNW Solaris"
-+
-+/* Note entries for GNU systems have this name. */
-+#define ELF_NOTE_GNU "GNU"
-+
-+
-+/* Defined types of notes for Solaris. */
-+
-+/* Value of descriptor (one word) is desired pagesize for the binary. */
-+#define ELF_NOTE_PAGESIZE_HINT 1
-+
-+
-+/* Defined note types for GNU systems. */
-+
-+/* ABI information. The descriptor consists of words:
-+ word 0: OS descriptor
-+ word 1: major version of the ABI
-+ word 2: minor version of the ABI
-+ word 3: subminor version of the ABI
-+*/
-+#define ELF_NOTE_ABI 1
-+
-+/* Known OSes. These value can appear in word 0 of an ELF_NOTE_ABI
-+ note section entry. */
-+#define ELF_NOTE_OS_LINUX 0
-+#define ELF_NOTE_OS_GNU 1
-+#define ELF_NOTE_OS_SOLARIS2 2
-+#define ELF_NOTE_OS_FREEBSD 3
-+
-+
-+/* Move records. */
-+typedef struct
-+{
-+ Elf32_Xword m_value; /* Symbol value. */
-+ Elf32_Word m_info; /* Size and index. */
-+ Elf32_Word m_poffset; /* Symbol offset. */
-+ Elf32_Half m_repeat; /* Repeat count. */
-+ Elf32_Half m_stride; /* Stride info. */
-+} Elf32_Move;
-+
-+typedef struct
-+{
-+ Elf64_Xword m_value; /* Symbol value. */
-+ Elf64_Xword m_info; /* Size and index. */
-+ Elf64_Xword m_poffset; /* Symbol offset. */
-+ Elf64_Half m_repeat; /* Repeat count. */
-+ Elf64_Half m_stride; /* Stride info. */
-+} Elf64_Move;
-+
-+/* Macro to construct move records. */
-+#define ELF32_M_SYM(info) ((info) >> 8)
-+#define ELF32_M_SIZE(info) ((unsigned char) (info))
-+#define ELF32_M_INFO(sym, size) (((sym) << 8) + (unsigned char) (size))
-+
-+#define ELF64_M_SYM(info) ELF32_M_SYM (info)
-+#define ELF64_M_SIZE(info) ELF32_M_SIZE (info)
-+#define ELF64_M_INFO(sym, size) ELF32_M_INFO (sym, size)
-+
-+
-+/* Motorola 68k specific definitions. */
-+
-+/* Values for Elf32_Ehdr.e_flags. */
-+#define EF_CPU32 0x00810000
-+
-+/* m68k relocs. */
-+
-+#define R_68K_NONE 0 /* No reloc */
-+#define R_68K_32 1 /* Direct 32 bit */
-+#define R_68K_16 2 /* Direct 16 bit */
-+#define R_68K_8 3 /* Direct 8 bit */
-+#define R_68K_PC32 4 /* PC relative 32 bit */
-+#define R_68K_PC16 5 /* PC relative 16 bit */
-+#define R_68K_PC8 6 /* PC relative 8 bit */
-+#define R_68K_GOT32 7 /* 32 bit PC relative GOT entry */
-+#define R_68K_GOT16 8 /* 16 bit PC relative GOT entry */
-+#define R_68K_GOT8 9 /* 8 bit PC relative GOT entry */
-+#define R_68K_GOT32O 10 /* 32 bit GOT offset */
-+#define R_68K_GOT16O 11 /* 16 bit GOT offset */
-+#define R_68K_GOT8O 12 /* 8 bit GOT offset */
-+#define R_68K_PLT32 13 /* 32 bit PC relative PLT address */
-+#define R_68K_PLT16 14 /* 16 bit PC relative PLT address */
-+#define R_68K_PLT8 15 /* 8 bit PC relative PLT address */
-+#define R_68K_PLT32O 16 /* 32 bit PLT offset */
-+#define R_68K_PLT16O 17 /* 16 bit PLT offset */
-+#define R_68K_PLT8O 18 /* 8 bit PLT offset */
-+#define R_68K_COPY 19 /* Copy symbol at runtime */
-+#define R_68K_GLOB_DAT 20 /* Create GOT entry */
-+#define R_68K_JMP_SLOT 21 /* Create PLT entry */
-+#define R_68K_RELATIVE 22 /* Adjust by program base */
-+/* Keep this the last entry. */
-+#define R_68K_NUM 23
-+
-+/* Intel 80386 specific definitions. */
-+
-+/* i386 relocs. */
-+
-+#define R_386_NONE 0 /* No reloc */
-+#define R_386_32 1 /* Direct 32 bit */
-+#define R_386_PC32 2 /* PC relative 32 bit */
-+#define R_386_GOT32 3 /* 32 bit GOT entry */
-+#define R_386_PLT32 4 /* 32 bit PLT address */
-+#define R_386_COPY 5 /* Copy symbol at runtime */
-+#define R_386_GLOB_DAT 6 /* Create GOT entry */
-+#define R_386_JMP_SLOT 7 /* Create PLT entry */
-+#define R_386_RELATIVE 8 /* Adjust by program base */
-+#define R_386_GOTOFF 9 /* 32 bit offset to GOT */
-+#define R_386_GOTPC 10 /* 32 bit PC relative offset to GOT */
-+#define R_386_32PLT 11
-+#define R_386_TLS_TPOFF 14 /* Offset in static TLS block */
-+#define R_386_TLS_IE 15 /* Address of GOT entry for static TLS
-+ block offset */
-+#define R_386_TLS_GOTIE 16 /* GOT entry for static TLS block
-+ offset */
-+#define R_386_TLS_LE 17 /* Offset relative to static TLS
-+ block */
-+#define R_386_TLS_GD 18 /* Direct 32 bit for GNU version of
-+ general dynamic thread local data */
-+#define R_386_TLS_LDM 19 /* Direct 32 bit for GNU version of
-+ local dynamic thread local data
-+ in LE code */
-+#define R_386_16 20
-+#define R_386_PC16 21
-+#define R_386_8 22
-+#define R_386_PC8 23
-+#define R_386_TLS_GD_32 24 /* Direct 32 bit for general dynamic
-+ thread local data */
-+#define R_386_TLS_GD_PUSH 25 /* Tag for pushl in GD TLS code */
-+#define R_386_TLS_GD_CALL 26 /* Relocation for call to
-+ __tls_get_addr() */
-+#define R_386_TLS_GD_POP 27 /* Tag for popl in GD TLS code */
-+#define R_386_TLS_LDM_32 28 /* Direct 32 bit for local dynamic
-+ thread local data in LE code */
-+#define R_386_TLS_LDM_PUSH 29 /* Tag for pushl in LDM TLS code */
-+#define R_386_TLS_LDM_CALL 30 /* Relocation for call to
-+ __tls_get_addr() in LDM code */
-+#define R_386_TLS_LDM_POP 31 /* Tag for popl in LDM TLS code */
-+#define R_386_TLS_LDO_32 32 /* Offset relative to TLS block */
-+#define R_386_TLS_IE_32 33 /* GOT entry for negated static TLS
-+ block offset */
-+#define R_386_TLS_LE_32 34 /* Negated offset relative to static
-+ TLS block */
-+#define R_386_TLS_DTPMOD32 35 /* ID of module containing symbol */
-+#define R_386_TLS_DTPOFF32 36 /* Offset in TLS block */
-+#define R_386_TLS_TPOFF32 37 /* Negated offset in static TLS block */
-+/* Keep this the last entry. */
-+#define R_386_NUM 38
-+
-+/* SUN SPARC specific definitions. */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type). */
-+
-+#define STT_REGISTER 13 /* Global register reserved to app. */
-+
-+/* Values for Elf64_Ehdr.e_flags. */
-+
-+#define EF_SPARCV9_MM 3
-+#define EF_SPARCV9_TSO 0
-+#define EF_SPARCV9_PSO 1
-+#define EF_SPARCV9_RMO 2
-+#define EF_SPARC_LEDATA 0x800000 /* little endian data */
-+#define EF_SPARC_EXT_MASK 0xFFFF00
-+#define EF_SPARC_32PLUS 0x000100 /* generic V8+ features */
-+#define EF_SPARC_SUN_US1 0x000200 /* Sun UltraSPARC1 extensions */
-+#define EF_SPARC_HAL_R1 0x000400 /* HAL R1 extensions */
-+#define EF_SPARC_SUN_US3 0x000800 /* Sun UltraSPARCIII extensions */
-+
-+/* SPARC relocs. */
-+
-+#define R_SPARC_NONE 0 /* No reloc */
-+#define R_SPARC_8 1 /* Direct 8 bit */
-+#define R_SPARC_16 2 /* Direct 16 bit */
-+#define R_SPARC_32 3 /* Direct 32 bit */
-+#define R_SPARC_DISP8 4 /* PC relative 8 bit */
-+#define R_SPARC_DISP16 5 /* PC relative 16 bit */
-+#define R_SPARC_DISP32 6 /* PC relative 32 bit */
-+#define R_SPARC_WDISP30 7 /* PC relative 30 bit shifted */
-+#define R_SPARC_WDISP22 8 /* PC relative 22 bit shifted */
-+#define R_SPARC_HI22 9 /* High 22 bit */
-+#define R_SPARC_22 10 /* Direct 22 bit */
-+#define R_SPARC_13 11 /* Direct 13 bit */
-+#define R_SPARC_LO10 12 /* Truncated 10 bit */
-+#define R_SPARC_GOT10 13 /* Truncated 10 bit GOT entry */
-+#define R_SPARC_GOT13 14 /* 13 bit GOT entry */
-+#define R_SPARC_GOT22 15 /* 22 bit GOT entry shifted */
-+#define R_SPARC_PC10 16 /* PC relative 10 bit truncated */
-+#define R_SPARC_PC22 17 /* PC relative 22 bit shifted */
-+#define R_SPARC_WPLT30 18 /* 30 bit PC relative PLT address */
-+#define R_SPARC_COPY 19 /* Copy symbol at runtime */
-+#define R_SPARC_GLOB_DAT 20 /* Create GOT entry */
-+#define R_SPARC_JMP_SLOT 21 /* Create PLT entry */
-+#define R_SPARC_RELATIVE 22 /* Adjust by program base */
-+#define R_SPARC_UA32 23 /* Direct 32 bit unaligned */
-+
-+/* Additional Sparc64 relocs. */
-+
-+#define R_SPARC_PLT32 24 /* Direct 32 bit ref to PLT entry */
-+#define R_SPARC_HIPLT22 25 /* High 22 bit PLT entry */
-+#define R_SPARC_LOPLT10 26 /* Truncated 10 bit PLT entry */
-+#define R_SPARC_PCPLT32 27 /* PC rel 32 bit ref to PLT entry */
-+#define R_SPARC_PCPLT22 28 /* PC rel high 22 bit PLT entry */
-+#define R_SPARC_PCPLT10 29 /* PC rel trunc 10 bit PLT entry */
-+#define R_SPARC_10 30 /* Direct 10 bit */
-+#define R_SPARC_11 31 /* Direct 11 bit */
-+#define R_SPARC_64 32 /* Direct 64 bit */
-+#define R_SPARC_OLO10 33 /* 10bit with secondary 13bit addend */
-+#define R_SPARC_HH22 34 /* Top 22 bits of direct 64 bit */
-+#define R_SPARC_HM10 35 /* High middle 10 bits of ... */
-+#define R_SPARC_LM22 36 /* Low middle 22 bits of ... */
-+#define R_SPARC_PC_HH22 37 /* Top 22 bits of pc rel 64 bit */
-+#define R_SPARC_PC_HM10 38 /* High middle 10 bit of ... */
-+#define R_SPARC_PC_LM22 39 /* Low miggle 22 bits of ... */
-+#define R_SPARC_WDISP16 40 /* PC relative 16 bit shifted */
-+#define R_SPARC_WDISP19 41 /* PC relative 19 bit shifted */
-+#define R_SPARC_7 43 /* Direct 7 bit */
-+#define R_SPARC_5 44 /* Direct 5 bit */
-+#define R_SPARC_6 45 /* Direct 6 bit */
-+#define R_SPARC_DISP64 46 /* PC relative 64 bit */
-+#define R_SPARC_PLT64 47 /* Direct 64 bit ref to PLT entry */
-+#define R_SPARC_HIX22 48 /* High 22 bit complemented */
-+#define R_SPARC_LOX10 49 /* Truncated 11 bit complemented */
-+#define R_SPARC_H44 50 /* Direct high 12 of 44 bit */
-+#define R_SPARC_M44 51 /* Direct mid 22 of 44 bit */
-+#define R_SPARC_L44 52 /* Direct low 10 of 44 bit */
-+#define R_SPARC_REGISTER 53 /* Global register usage */
-+#define R_SPARC_UA64 54 /* Direct 64 bit unaligned */
-+#define R_SPARC_UA16 55 /* Direct 16 bit unaligned */
-+#define R_SPARC_TLS_GD_HI22 56
-+#define R_SPARC_TLS_GD_LO10 57
-+#define R_SPARC_TLS_GD_ADD 58
-+#define R_SPARC_TLS_GD_CALL 59
-+#define R_SPARC_TLS_LDM_HI22 60
-+#define R_SPARC_TLS_LDM_LO10 61
-+#define R_SPARC_TLS_LDM_ADD 62
-+#define R_SPARC_TLS_LDM_CALL 63
-+#define R_SPARC_TLS_LDO_HIX22 64
-+#define R_SPARC_TLS_LDO_LOX10 65
-+#define R_SPARC_TLS_LDO_ADD 66
-+#define R_SPARC_TLS_IE_HI22 67
-+#define R_SPARC_TLS_IE_LO10 68
-+#define R_SPARC_TLS_IE_LD 69
-+#define R_SPARC_TLS_IE_LDX 70
-+#define R_SPARC_TLS_IE_ADD 71
-+#define R_SPARC_TLS_LE_HIX22 72
-+#define R_SPARC_TLS_LE_LOX10 73
-+#define R_SPARC_TLS_DTPMOD32 74
-+#define R_SPARC_TLS_DTPMOD64 75
-+#define R_SPARC_TLS_DTPOFF32 76
-+#define R_SPARC_TLS_DTPOFF64 77
-+#define R_SPARC_TLS_TPOFF32 78
-+#define R_SPARC_TLS_TPOFF64 79
-+/* Keep this the last entry. */
-+#define R_SPARC_NUM 80
-+
-+/* For Sparc64, legal values for d_tag of Elf64_Dyn. */
-+
-+#define DT_SPARC_REGISTER 0x70000001
-+#define DT_SPARC_NUM 2
-+
-+/* Bits present in AT_HWCAP, primarily for Sparc32. */
-+
-+#define HWCAP_SPARC_FLUSH 1 /* The cpu supports flush insn. */
-+#define HWCAP_SPARC_STBAR 2
-+#define HWCAP_SPARC_SWAP 4
-+#define HWCAP_SPARC_MULDIV 8
-+#define HWCAP_SPARC_V9 16 /* The cpu is v9, so v8plus is ok. */
-+#define HWCAP_SPARC_ULTRA3 32
-+
-+/* MIPS R3000 specific definitions. */
-+
-+/* Legal values for e_flags field of Elf32_Ehdr. */
-+
-+#define EF_MIPS_NOREORDER 1 /* A .noreorder directive was used */
-+#define EF_MIPS_PIC 2 /* Contains PIC code */
-+#define EF_MIPS_CPIC 4 /* Uses PIC calling sequence */
-+#define EF_MIPS_XGOT 8
-+#define EF_MIPS_64BIT_WHIRL 16
-+#define EF_MIPS_ABI2 32
-+#define EF_MIPS_ABI_ON32 64
-+#define EF_MIPS_ARCH 0xf0000000 /* MIPS architecture level */
-+
-+/* Legal values for MIPS architecture level. */
-+
-+#define EF_MIPS_ARCH_1 0x00000000 /* -mips1 code. */
-+#define EF_MIPS_ARCH_2 0x10000000 /* -mips2 code. */
-+#define EF_MIPS_ARCH_3 0x20000000 /* -mips3 code. */
-+#define EF_MIPS_ARCH_4 0x30000000 /* -mips4 code. */
-+#define EF_MIPS_ARCH_5 0x40000000 /* -mips5 code. */
-+#define EF_MIPS_ARCH_32 0x60000000 /* MIPS32 code. */
-+#define EF_MIPS_ARCH_64 0x70000000 /* MIPS64 code. */
-+
-+/* The following are non-official names and should not be used. */
-+
-+#define E_MIPS_ARCH_1 0x00000000 /* -mips1 code. */
-+#define E_MIPS_ARCH_2 0x10000000 /* -mips2 code. */
-+#define E_MIPS_ARCH_3 0x20000000 /* -mips3 code. */
-+#define E_MIPS_ARCH_4 0x30000000 /* -mips4 code. */
-+#define E_MIPS_ARCH_5 0x40000000 /* -mips5 code. */
-+#define E_MIPS_ARCH_32 0x60000000 /* MIPS32 code. */
-+#define E_MIPS_ARCH_64 0x70000000 /* MIPS64 code. */
-+
-+/* Special section indices. */
-+
-+#define SHN_MIPS_ACOMMON 0xff00 /* Allocated common symbols */
-+#define SHN_MIPS_TEXT 0xff01 /* Allocated test symbols. */
-+#define SHN_MIPS_DATA 0xff02 /* Allocated data symbols. */
-+#define SHN_MIPS_SCOMMON 0xff03 /* Small common symbols */
-+#define SHN_MIPS_SUNDEFINED 0xff04 /* Small undefined symbols */
-+
-+/* Legal values for sh_type field of Elf32_Shdr. */
-+
-+#define SHT_MIPS_LIBLIST 0x70000000 /* Shared objects used in link */
-+#define SHT_MIPS_MSYM 0x70000001
-+#define SHT_MIPS_CONFLICT 0x70000002 /* Conflicting symbols */
-+#define SHT_MIPS_GPTAB 0x70000003 /* Global data area sizes */
-+#define SHT_MIPS_UCODE 0x70000004 /* Reserved for SGI/MIPS compilers */
-+#define SHT_MIPS_DEBUG 0x70000005 /* MIPS ECOFF debugging information*/
-+#define SHT_MIPS_REGINFO 0x70000006 /* Register usage information */
-+#define SHT_MIPS_PACKAGE 0x70000007
-+#define SHT_MIPS_PACKSYM 0x70000008
-+#define SHT_MIPS_RELD 0x70000009
-+#define SHT_MIPS_IFACE 0x7000000b
-+#define SHT_MIPS_CONTENT 0x7000000c
-+#define SHT_MIPS_OPTIONS 0x7000000d /* Miscellaneous options. */
-+#define SHT_MIPS_SHDR 0x70000010
-+#define SHT_MIPS_FDESC 0x70000011
-+#define SHT_MIPS_EXTSYM 0x70000012
-+#define SHT_MIPS_DENSE 0x70000013
-+#define SHT_MIPS_PDESC 0x70000014
-+#define SHT_MIPS_LOCSYM 0x70000015
-+#define SHT_MIPS_AUXSYM 0x70000016
-+#define SHT_MIPS_OPTSYM 0x70000017
-+#define SHT_MIPS_LOCSTR 0x70000018
-+#define SHT_MIPS_LINE 0x70000019
-+#define SHT_MIPS_RFDESC 0x7000001a
-+#define SHT_MIPS_DELTASYM 0x7000001b
-+#define SHT_MIPS_DELTAINST 0x7000001c
-+#define SHT_MIPS_DELTACLASS 0x7000001d
-+#define SHT_MIPS_DWARF 0x7000001e /* DWARF debugging information. */
-+#define SHT_MIPS_DELTADECL 0x7000001f
-+#define SHT_MIPS_SYMBOL_LIB 0x70000020
-+#define SHT_MIPS_EVENTS 0x70000021 /* Event section. */
-+#define SHT_MIPS_TRANSLATE 0x70000022
-+#define SHT_MIPS_PIXIE 0x70000023
-+#define SHT_MIPS_XLATE 0x70000024
-+#define SHT_MIPS_XLATE_DEBUG 0x70000025
-+#define SHT_MIPS_WHIRL 0x70000026
-+#define SHT_MIPS_EH_REGION 0x70000027
-+#define SHT_MIPS_XLATE_OLD 0x70000028
-+#define SHT_MIPS_PDR_EXCEPTION 0x70000029
-+
-+/* Legal values for sh_flags field of Elf32_Shdr. */
-+
-+#define SHF_MIPS_GPREL 0x10000000 /* Must be part of global data area */
-+#define SHF_MIPS_MERGE 0x20000000
-+#define SHF_MIPS_ADDR 0x40000000
-+#define SHF_MIPS_STRINGS 0x80000000
-+#define SHF_MIPS_NOSTRIP 0x08000000
-+#define SHF_MIPS_LOCAL 0x04000000
-+#define SHF_MIPS_NAMES 0x02000000
-+#define SHF_MIPS_NODUPE 0x01000000
-+
-+
-+/* Symbol tables. */
-+
-+/* MIPS specific values for `st_other'. */
-+#define STO_MIPS_DEFAULT 0x0
-+#define STO_MIPS_INTERNAL 0x1
-+#define STO_MIPS_HIDDEN 0x2
-+#define STO_MIPS_PROTECTED 0x3
-+#define STO_MIPS_SC_ALIGN_UNUSED 0xff
-+
-+/* MIPS specific values for `st_info'. */
-+#define STB_MIPS_SPLIT_COMMON 13
-+
-+/* Entries found in sections of type SHT_MIPS_GPTAB. */
-+
-+typedef union
-+{
-+ struct
-+ {
-+ Elf32_Word gt_current_g_value; /* -G value used for compilation */
-+ Elf32_Word gt_unused; /* Not used */
-+ } gt_header; /* First entry in section */
-+ struct
-+ {
-+ Elf32_Word gt_g_value; /* If this value were used for -G */
-+ Elf32_Word gt_bytes; /* This many bytes would be used */
-+ } gt_entry; /* Subsequent entries in section */
-+} Elf32_gptab;
-+
-+/* Entry found in sections of type SHT_MIPS_REGINFO. */
-+
-+typedef struct
-+{
-+ Elf32_Word ri_gprmask; /* General registers used */
-+ Elf32_Word ri_cprmask[4]; /* Coprocessor registers used */
-+ Elf32_Sword ri_gp_value; /* $gp register value */
-+} Elf32_RegInfo;
-+
-+/* Entries found in sections of type SHT_MIPS_OPTIONS. */
-+
-+typedef struct
-+{
-+ unsigned char kind; /* Determines interpretation of the
-+ variable part of descriptor. */
-+ unsigned char size; /* Size of descriptor, including header. */
-+ Elf32_Section section; /* Section header index of section affected,
-+ 0 for global options. */
-+ Elf32_Word info; /* Kind-specific information. */
-+} Elf_Options;
-+
-+/* Values for `kind' field in Elf_Options. */
-+
-+#define ODK_NULL 0 /* Undefined. */
-+#define ODK_REGINFO 1 /* Register usage information. */
-+#define ODK_EXCEPTIONS 2 /* Exception processing options. */
-+#define ODK_PAD 3 /* Section padding options. */
-+#define ODK_HWPATCH 4 /* Hardware workarounds performed */
-+#define ODK_FILL 5 /* record the fill value used by the linker. */
-+#define ODK_TAGS 6 /* reserve space for desktop tools to write. */
-+#define ODK_HWAND 7 /* HW workarounds. 'AND' bits when merging. */
-+#define ODK_HWOR 8 /* HW workarounds. 'OR' bits when merging. */
-+
-+/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries. */
-+
-+#define OEX_FPU_MIN 0x1f /* FPE's which MUST be enabled. */
-+#define OEX_FPU_MAX 0x1f00 /* FPE's which MAY be enabled. */
-+#define OEX_PAGE0 0x10000 /* page zero must be mapped. */
-+#define OEX_SMM 0x20000 /* Force sequential memory mode? */
-+#define OEX_FPDBUG 0x40000 /* Force floating point debug mode? */
-+#define OEX_PRECISEFP OEX_FPDBUG
-+#define OEX_DISMISS 0x80000 /* Dismiss invalid address faults? */
-+
-+#define OEX_FPU_INVAL 0x10
-+#define OEX_FPU_DIV0 0x08
-+#define OEX_FPU_OFLO 0x04
-+#define OEX_FPU_UFLO 0x02
-+#define OEX_FPU_INEX 0x01
-+
-+/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry. */
-+
-+#define OHW_R4KEOP 0x1 /* R4000 end-of-page patch. */
-+#define OHW_R8KPFETCH 0x2 /* may need R8000 prefetch patch. */
-+#define OHW_R5KEOP 0x4 /* R5000 end-of-page patch. */
-+#define OHW_R5KCVTL 0x8 /* R5000 cvt.[ds].l bug. clean=1. */
-+
-+#define OPAD_PREFIX 0x1
-+#define OPAD_POSTFIX 0x2
-+#define OPAD_SYMBOL 0x4
-+
-+/* Entry found in `.options' section. */
-+
-+typedef struct
-+{
-+ Elf32_Word hwp_flags1; /* Extra flags. */
-+ Elf32_Word hwp_flags2; /* Extra flags. */
-+} Elf_Options_Hw;
-+
-+/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries. */
-+
-+#define OHWA0_R4KEOP_CHECKED 0x00000001
-+#define OHWA1_R4KEOP_CLEAN 0x00000002
-+
-+/* MIPS relocs. */
-+
-+#define R_MIPS_NONE 0 /* No reloc */
-+#define R_MIPS_16 1 /* Direct 16 bit */
-+#define R_MIPS_32 2 /* Direct 32 bit */
-+#define R_MIPS_REL32 3 /* PC relative 32 bit */
-+#define R_MIPS_26 4 /* Direct 26 bit shifted */
-+#define R_MIPS_HI16 5 /* High 16 bit */
-+#define R_MIPS_LO16 6 /* Low 16 bit */
-+#define R_MIPS_GPREL16 7 /* GP relative 16 bit */
-+#define R_MIPS_LITERAL 8 /* 16 bit literal entry */
-+#define R_MIPS_GOT16 9 /* 16 bit GOT entry */
-+#define R_MIPS_PC16 10 /* PC relative 16 bit */
-+#define R_MIPS_CALL16 11 /* 16 bit GOT entry for function */
-+#define R_MIPS_GPREL32 12 /* GP relative 32 bit */
-+
-+#define R_MIPS_SHIFT5 16
-+#define R_MIPS_SHIFT6 17
-+#define R_MIPS_64 18
-+#define R_MIPS_GOT_DISP 19
-+#define R_MIPS_GOT_PAGE 20
-+#define R_MIPS_GOT_OFST 21
-+#define R_MIPS_GOT_HI16 22
-+#define R_MIPS_GOT_LO16 23
-+#define R_MIPS_SUB 24
-+#define R_MIPS_INSERT_A 25
-+#define R_MIPS_INSERT_B 26
-+#define R_MIPS_DELETE 27
-+#define R_MIPS_HIGHER 28
-+#define R_MIPS_HIGHEST 29
-+#define R_MIPS_CALL_HI16 30
-+#define R_MIPS_CALL_LO16 31
-+#define R_MIPS_SCN_DISP 32
-+#define R_MIPS_REL16 33
-+#define R_MIPS_ADD_IMMEDIATE 34
-+#define R_MIPS_PJUMP 35
-+#define R_MIPS_RELGOT 36
-+#define R_MIPS_JALR 37
-+/* Keep this the last entry. */
-+#define R_MIPS_NUM 38
-+
-+/* Legal values for p_type field of Elf32_Phdr. */
-+
-+#define PT_MIPS_REGINFO 0x70000000 /* Register usage information */
-+#define PT_MIPS_RTPROC 0x70000001 /* Runtime procedure table. */
-+#define PT_MIPS_OPTIONS 0x70000002
-+
-+/* Special program header types. */
-+
-+#define PF_MIPS_LOCAL 0x10000000
-+
-+/* Legal values for d_tag field of Elf32_Dyn. */
-+
-+#define DT_MIPS_RLD_VERSION 0x70000001 /* Runtime linker interface version */
-+#define DT_MIPS_TIME_STAMP 0x70000002 /* Timestamp */
-+#define DT_MIPS_ICHECKSUM 0x70000003 /* Checksum */
-+#define DT_MIPS_IVERSION 0x70000004 /* Version string (string tbl index) */
-+#define DT_MIPS_FLAGS 0x70000005 /* Flags */
-+#define DT_MIPS_BASE_ADDRESS 0x70000006 /* Base address */
-+#define DT_MIPS_MSYM 0x70000007
-+#define DT_MIPS_CONFLICT 0x70000008 /* Address of CONFLICT section */
-+#define DT_MIPS_LIBLIST 0x70000009 /* Address of LIBLIST section */
-+#define DT_MIPS_LOCAL_GOTNO 0x7000000a /* Number of local GOT entries */
-+#define DT_MIPS_CONFLICTNO 0x7000000b /* Number of CONFLICT entries */
-+#define DT_MIPS_LIBLISTNO 0x70000010 /* Number of LIBLIST entries */
-+#define DT_MIPS_SYMTABNO 0x70000011 /* Number of DYNSYM entries */
-+#define DT_MIPS_UNREFEXTNO 0x70000012 /* First external DYNSYM */
-+#define DT_MIPS_GOTSYM 0x70000013 /* First GOT entry in DYNSYM */
-+#define DT_MIPS_HIPAGENO 0x70000014 /* Number of GOT page table entries */
-+#define DT_MIPS_RLD_MAP 0x70000016 /* Address of run time loader map. */
-+#define DT_MIPS_DELTA_CLASS 0x70000017 /* Delta C++ class definition. */
-+#define DT_MIPS_DELTA_CLASS_NO 0x70000018 /* Number of entries in
-+ DT_MIPS_DELTA_CLASS. */
-+#define DT_MIPS_DELTA_INSTANCE 0x70000019 /* Delta C++ class instances. */
-+#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
-+ DT_MIPS_DELTA_INSTANCE. */
-+#define DT_MIPS_DELTA_RELOC 0x7000001b /* Delta relocations. */
-+#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
-+ DT_MIPS_DELTA_RELOC. */
-+#define DT_MIPS_DELTA_SYM 0x7000001d /* Delta symbols that Delta
-+ relocations refer to. */
-+#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
-+ DT_MIPS_DELTA_SYM. */
-+#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
-+ class declaration. */
-+#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
-+ DT_MIPS_DELTA_CLASSSYM. */
-+#define DT_MIPS_CXX_FLAGS 0x70000022 /* Flags indicating for C++ flavor. */
-+#define DT_MIPS_PIXIE_INIT 0x70000023
-+#define DT_MIPS_SYMBOL_LIB 0x70000024
-+#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
-+#define DT_MIPS_LOCAL_GOTIDX 0x70000026
-+#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
-+#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
-+#define DT_MIPS_OPTIONS 0x70000029 /* Address of .options. */
-+#define DT_MIPS_INTERFACE 0x7000002a /* Address of .interface. */
-+#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
-+#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
-+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
-+ function stored in GOT. */
-+#define DT_MIPS_PERF_SUFFIX 0x7000002e /* Default suffix of dso to be added
-+ by rld on dlopen() calls. */
-+#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
-+#define DT_MIPS_GP_VALUE 0x70000030 /* GP value for aux GOTs. */
-+#define DT_MIPS_AUX_DYNAMIC 0x70000031 /* Address of aux .dynamic. */
-+#define DT_MIPS_NUM 0x32
-+
-+/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */
-+
-+#define RHF_NONE 0 /* No flags */
-+#define RHF_QUICKSTART (1 << 0) /* Use quickstart */
-+#define RHF_NOTPOT (1 << 1) /* Hash size not power of 2 */
-+#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2) /* Ignore LD_LIBRARY_PATH */
-+#define RHF_NO_MOVE (1 << 3)
-+#define RHF_SGI_ONLY (1 << 4)
-+#define RHF_GUARANTEE_INIT (1 << 5)
-+#define RHF_DELTA_C_PLUS_PLUS (1 << 6)
-+#define RHF_GUARANTEE_START_INIT (1 << 7)
-+#define RHF_PIXIE (1 << 8)
-+#define RHF_DEFAULT_DELAY_LOAD (1 << 9)
-+#define RHF_REQUICKSTART (1 << 10)
-+#define RHF_REQUICKSTARTED (1 << 11)
-+#define RHF_CORD (1 << 12)
-+#define RHF_NO_UNRES_UNDEF (1 << 13)
-+#define RHF_RLD_ORDER_SAFE (1 << 14)
-+
-+/* Entries found in sections of type SHT_MIPS_LIBLIST. */
-+
-+typedef struct
-+{
-+ Elf32_Word l_name; /* Name (string table index) */
-+ Elf32_Word l_time_stamp; /* Timestamp */
-+ Elf32_Word l_checksum; /* Checksum */
-+ Elf32_Word l_version; /* Interface version */
-+ Elf32_Word l_flags; /* Flags */
-+} Elf32_Lib;
-+
-+typedef struct
-+{
-+ Elf64_Word l_name; /* Name (string table index) */
-+ Elf64_Word l_time_stamp; /* Timestamp */
-+ Elf64_Word l_checksum; /* Checksum */
-+ Elf64_Word l_version; /* Interface version */
-+ Elf64_Word l_flags; /* Flags */
-+} Elf64_Lib;
-+
-+
-+/* Legal values for l_flags. */
-+
-+#define LL_NONE 0
-+#define LL_EXACT_MATCH (1 << 0) /* Require exact match */
-+#define LL_IGNORE_INT_VER (1 << 1) /* Ignore interface version */
-+#define LL_REQUIRE_MINOR (1 << 2)
-+#define LL_EXPORTS (1 << 3)
-+#define LL_DELAY_LOAD (1 << 4)
-+#define LL_DELTA (1 << 5)
-+
-+/* Entries found in sections of type SHT_MIPS_CONFLICT. */
-+
-+typedef Elf32_Addr Elf32_Conflict;
-+
-+
-+/* HPPA specific definitions. */
-+
-+/* Legal values for e_flags field of Elf32_Ehdr. */
-+
-+#define EF_PARISC_TRAPNIL 0x00010000 /* Trap nil pointer dereference. */
-+#define EF_PARISC_EXT 0x00020000 /* Program uses arch. extensions. */
-+#define EF_PARISC_LSB 0x00040000 /* Program expects little endian. */
-+#define EF_PARISC_WIDE 0x00080000 /* Program expects wide mode. */
-+#define EF_PARISC_NO_KABP 0x00100000 /* No kernel assisted branch
-+ prediction. */
-+#define EF_PARISC_LAZYSWAP 0x00400000 /* Allow lazy swapping. */
-+#define EF_PARISC_ARCH 0x0000ffff /* Architecture version. */
-+
-+/* Defined values for `e_flags & EF_PARISC_ARCH' are: */
-+
-+#define EFA_PARISC_1_0 0x020b /* PA-RISC 1.0 big-endian. */
-+#define EFA_PARISC_1_1 0x0210 /* PA-RISC 1.1 big-endian. */
-+#define EFA_PARISC_2_0 0x0214 /* PA-RISC 2.0 big-endian. */
-+
-+/* Additional section indeces. */
-+
-+#define SHN_PARISC_ANSI_COMMON 0xff00 /* Section for tenatively declared
-+ symbols in ANSI C. */
-+#define SHN_PARISC_HUGE_COMMON 0xff01 /* Common blocks in huge model. */
-+
-+/* Legal values for sh_type field of Elf32_Shdr. */
-+
-+#define SHT_PARISC_EXT 0x70000000 /* Contains product specific ext. */
-+#define SHT_PARISC_UNWIND 0x70000001 /* Unwind information. */
-+#define SHT_PARISC_DOC 0x70000002 /* Debug info for optimized code. */
-+
-+/* Legal values for sh_flags field of Elf32_Shdr. */
-+
-+#define SHF_PARISC_SHORT 0x20000000 /* Section with short addressing. */
-+#define SHF_PARISC_HUGE 0x40000000 /* Section far from gp. */
-+#define SHF_PARISC_SBP 0x80000000 /* Static branch prediction code. */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type). */
-+
-+#define STT_PARISC_MILLICODE 13 /* Millicode function entry point. */
-+
-+#define STT_HP_OPAQUE (STT_LOOS + 0x1)
-+#define STT_HP_STUB (STT_LOOS + 0x2)
-+
-+/* HPPA relocs. */
-+
-+#define R_PARISC_NONE 0 /* No reloc. */
-+#define R_PARISC_DIR32 1 /* Direct 32-bit reference. */
-+#define R_PARISC_DIR21L 2 /* Left 21 bits of eff. address. */
-+#define R_PARISC_DIR17R 3 /* Right 17 bits of eff. address. */
-+#define R_PARISC_DIR17F 4 /* 17 bits of eff. address. */
-+#define R_PARISC_DIR14R 6 /* Right 14 bits of eff. address. */
-+#define R_PARISC_PCREL32 9 /* 32-bit rel. address. */
-+#define R_PARISC_PCREL21L 10 /* Left 21 bits of rel. address. */
-+#define R_PARISC_PCREL17R 11 /* Right 17 bits of rel. address. */
-+#define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */
-+#define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */
-+#define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */
-+#define R_PARISC_DPREL14R 22 /* Right 14 bits of rel. address. */
-+#define R_PARISC_GPREL21L 26 /* GP-relative, left 21 bits. */
-+#define R_PARISC_GPREL14R 30 /* GP-relative, right 14 bits. */
-+#define R_PARISC_LTOFF21L 34 /* LT-relative, left 21 bits. */
-+#define R_PARISC_LTOFF14R 38 /* LT-relative, right 14 bits. */
-+#define R_PARISC_SECREL32 41 /* 32 bits section rel. address. */
-+#define R_PARISC_SEGBASE 48 /* No relocation, set segment base. */
-+#define R_PARISC_SEGREL32 49 /* 32 bits segment rel. address. */
-+#define R_PARISC_PLTOFF21L 50 /* PLT rel. address, left 21 bits. */
-+#define R_PARISC_PLTOFF14R 54 /* PLT rel. address, right 14 bits. */
-+#define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */
-+#define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */
-+#define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */
-+#define R_PARISC_FPTR64 64 /* 64 bits function address. */
-+#define R_PARISC_PLABEL32 65 /* 32 bits function address. */
-+#define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
-+#define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */
-+#define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */
-+#define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */
-+#define R_PARISC_PCREL16F 77 /* 16 bits PC-rel. address. */
-+#define R_PARISC_PCREL16WF 78 /* 16 bits PC-rel. address. */
-+#define R_PARISC_PCREL16DF 79 /* 16 bits PC-rel. address. */
-+#define R_PARISC_DIR64 80 /* 64 bits of eff. address. */
-+#define R_PARISC_DIR14WR 83 /* 14 bits of eff. address. */
-+#define R_PARISC_DIR14DR 84 /* 14 bits of eff. address. */
-+#define R_PARISC_DIR16F 85 /* 16 bits of eff. address. */
-+#define R_PARISC_DIR16WF 86 /* 16 bits of eff. address. */
-+#define R_PARISC_DIR16DF 87 /* 16 bits of eff. address. */
-+#define R_PARISC_GPREL64 88 /* 64 bits of GP-rel. address. */
-+#define R_PARISC_GPREL14WR 91 /* GP-rel. address, right 14 bits. */
-+#define R_PARISC_GPREL14DR 92 /* GP-rel. address, right 14 bits. */
-+#define R_PARISC_GPREL16F 93 /* 16 bits GP-rel. address. */
-+#define R_PARISC_GPREL16WF 94 /* 16 bits GP-rel. address. */
-+#define R_PARISC_GPREL16DF 95 /* 16 bits GP-rel. address. */
-+#define R_PARISC_LTOFF64 96 /* 64 bits LT-rel. address. */
-+#define R_PARISC_LTOFF14WR 99 /* LT-rel. address, right 14 bits. */
-+#define R_PARISC_LTOFF14DR 100 /* LT-rel. address, right 14 bits. */
-+#define R_PARISC_LTOFF16F 101 /* 16 bits LT-rel. address. */
-+#define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */
-+#define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */
-+#define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */
-+#define R_PARISC_SEGREL64 112 /* 64 bits segment rel. address. */
-+#define R_PARISC_PLTOFF14WR 115 /* PLT-rel. address, right 14 bits. */
-+#define R_PARISC_PLTOFF14DR 116 /* PLT-rel. address, right 14 bits. */
-+#define R_PARISC_PLTOFF16F 117 /* 16 bits LT-rel. address. */
-+#define R_PARISC_PLTOFF16WF 118 /* 16 bits PLT-rel. address. */
-+#define R_PARISC_PLTOFF16DF 119 /* 16 bits PLT-rel. address. */
-+#define R_PARISC_LTOFF_FPTR64 120 /* 64 bits LT-rel. function ptr. */
-+#define R_PARISC_LTOFF_FPTR14WR 123 /* LT-rel. fct. ptr., right 14 bits. */
-+#define R_PARISC_LTOFF_FPTR14DR 124 /* LT-rel. fct. ptr., right 14 bits. */
-+#define R_PARISC_LTOFF_FPTR16F 125 /* 16 bits LT-rel. function ptr. */
-+#define R_PARISC_LTOFF_FPTR16WF 126 /* 16 bits LT-rel. function ptr. */
-+#define R_PARISC_LTOFF_FPTR16DF 127 /* 16 bits LT-rel. function ptr. */
-+#define R_PARISC_LORESERVE 128
-+#define R_PARISC_COPY 128 /* Copy relocation. */
-+#define R_PARISC_IPLT 129 /* Dynamic reloc, imported PLT */
-+#define R_PARISC_EPLT 130 /* Dynamic reloc, exported PLT */
-+#define R_PARISC_TPREL32 153 /* 32 bits TP-rel. address. */
-+#define R_PARISC_TPREL21L 154 /* TP-rel. address, left 21 bits. */
-+#define R_PARISC_TPREL14R 158 /* TP-rel. address, right 14 bits. */
-+#define R_PARISC_LTOFF_TP21L 162 /* LT-TP-rel. address, left 21 bits. */
-+#define R_PARISC_LTOFF_TP14R 166 /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP14F 167 /* 14 bits LT-TP-rel. address. */
-+#define R_PARISC_TPREL64 216 /* 64 bits TP-rel. address. */
-+#define R_PARISC_TPREL14WR 219 /* TP-rel. address, right 14 bits. */
-+#define R_PARISC_TPREL14DR 220 /* TP-rel. address, right 14 bits. */
-+#define R_PARISC_TPREL16F 221 /* 16 bits TP-rel. address. */
-+#define R_PARISC_TPREL16WF 222 /* 16 bits TP-rel. address. */
-+#define R_PARISC_TPREL16DF 223 /* 16 bits TP-rel. address. */
-+#define R_PARISC_LTOFF_TP64 224 /* 64 bits LT-TP-rel. address. */
-+#define R_PARISC_LTOFF_TP14WR 227 /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP14DR 228 /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP16F 229 /* 16 bits LT-TP-rel. address. */
-+#define R_PARISC_LTOFF_TP16WF 230 /* 16 bits LT-TP-rel. address. */
-+#define R_PARISC_LTOFF_TP16DF 231 /* 16 bits LT-TP-rel. address. */
-+#define R_PARISC_HIRESERVE 255
-+
-+/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */
-+
-+#define PT_HP_TLS (PT_LOOS + 0x0)
-+#define PT_HP_CORE_NONE (PT_LOOS + 0x1)
-+#define PT_HP_CORE_VERSION (PT_LOOS + 0x2)
-+#define PT_HP_CORE_KERNEL (PT_LOOS + 0x3)
-+#define PT_HP_CORE_COMM (PT_LOOS + 0x4)
-+#define PT_HP_CORE_PROC (PT_LOOS + 0x5)
-+#define PT_HP_CORE_LOADABLE (PT_LOOS + 0x6)
-+#define PT_HP_CORE_STACK (PT_LOOS + 0x7)
-+#define PT_HP_CORE_SHM (PT_LOOS + 0x8)
-+#define PT_HP_CORE_MMF (PT_LOOS + 0x9)
-+#define PT_HP_PARALLEL (PT_LOOS + 0x10)
-+#define PT_HP_FASTBIND (PT_LOOS + 0x11)
-+#define PT_HP_OPT_ANNOT (PT_LOOS + 0x12)
-+#define PT_HP_HSL_ANNOT (PT_LOOS + 0x13)
-+#define PT_HP_STACK (PT_LOOS + 0x14)
-+
-+#define PT_PARISC_ARCHEXT 0x70000000
-+#define PT_PARISC_UNWIND 0x70000001
-+
-+/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr. */
-+
-+#define PF_PARISC_SBP 0x08000000
-+
-+#define PF_HP_PAGE_SIZE 0x00100000
-+#define PF_HP_FAR_SHARED 0x00200000
-+#define PF_HP_NEAR_SHARED 0x00400000
-+#define PF_HP_CODE 0x01000000
-+#define PF_HP_MODIFY 0x02000000
-+#define PF_HP_LAZYSWAP 0x04000000
-+#define PF_HP_SBP 0x08000000
-+
-+
-+/* Alpha specific definitions. */
-+
-+/* Legal values for e_flags field of Elf64_Ehdr. */
-+
-+#define EF_ALPHA_32BIT 1 /* All addresses must be < 2GB. */
-+#define EF_ALPHA_CANRELAX 2 /* Relocations for relaxing exist. */
-+
-+/* Legal values for sh_type field of Elf64_Shdr. */
-+
-+/* These two are primerily concerned with ECOFF debugging info. */
-+#define SHT_ALPHA_DEBUG 0x70000001
-+#define SHT_ALPHA_REGINFO 0x70000002
-+
-+/* Legal values for sh_flags field of Elf64_Shdr. */
-+
-+#define SHF_ALPHA_GPREL 0x10000000
-+
-+/* Legal values for st_other field of Elf64_Sym. */
-+#define STO_ALPHA_NOPV 0x80 /* No PV required. */
-+#define STO_ALPHA_STD_GPLOAD 0x88 /* PV only used for initial ldgp. */
-+
-+/* Alpha relocs. */
-+
-+#define R_ALPHA_NONE 0 /* No reloc */
-+#define R_ALPHA_REFLONG 1 /* Direct 32 bit */
-+#define R_ALPHA_REFQUAD 2 /* Direct 64 bit */
-+#define R_ALPHA_GPREL32 3 /* GP relative 32 bit */
-+#define R_ALPHA_LITERAL 4 /* GP relative 16 bit w/optimization */
-+#define R_ALPHA_LITUSE 5 /* Optimization hint for LITERAL */
-+#define R_ALPHA_GPDISP 6 /* Add displacement to GP */
-+#define R_ALPHA_BRADDR 7 /* PC+4 relative 23 bit shifted */
-+#define R_ALPHA_HINT 8 /* PC+4 relative 16 bit shifted */
-+#define R_ALPHA_SREL16 9 /* PC relative 16 bit */
-+#define R_ALPHA_SREL32 10 /* PC relative 32 bit */
-+#define R_ALPHA_SREL64 11 /* PC relative 64 bit */
-+#define R_ALPHA_GPRELHIGH 17 /* GP relative 32 bit, high 16 bits */
-+#define R_ALPHA_GPRELLOW 18 /* GP relative 32 bit, low 16 bits */
-+#define R_ALPHA_GPREL16 19 /* GP relative 16 bit */
-+#define R_ALPHA_COPY 24 /* Copy symbol at runtime */
-+#define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */
-+#define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */
-+#define R_ALPHA_RELATIVE 27 /* Adjust by program base */
-+#define R_ALPHA_TLS_GD_HI 28
-+#define R_ALPHA_TLSGD 29
-+#define R_ALPHA_TLS_LDM 30
-+#define R_ALPHA_DTPMOD64 31
-+#define R_ALPHA_GOTDTPREL 32
-+#define R_ALPHA_DTPREL64 33
-+#define R_ALPHA_DTPRELHI 34
-+#define R_ALPHA_DTPRELLO 35
-+#define R_ALPHA_DTPREL16 36
-+#define R_ALPHA_GOTTPREL 37
-+#define R_ALPHA_TPREL64 38
-+#define R_ALPHA_TPRELHI 39
-+#define R_ALPHA_TPRELLO 40
-+#define R_ALPHA_TPREL16 41
-+/* Keep this the last entry. */
-+#define R_ALPHA_NUM 46
-+
-+/* Magic values of the LITUSE relocation addend. */
-+#define LITUSE_ALPHA_ADDR 0
-+#define LITUSE_ALPHA_BASE 1
-+#define LITUSE_ALPHA_BYTOFF 2
-+#define LITUSE_ALPHA_JSR 3
-+#define LITUSE_ALPHA_TLS_GD 4
-+#define LITUSE_ALPHA_TLS_LDM 5
-+
-+
-+/* PowerPC specific declarations */
-+
-+/* Values for Elf32/64_Ehdr.e_flags. */
-+#define EF_PPC_EMB 0x80000000 /* PowerPC embedded flag */
-+
-+/* Cygnus local bits below */
-+#define EF_PPC_RELOCATABLE 0x00010000 /* PowerPC -mrelocatable flag*/
-+#define EF_PPC_RELOCATABLE_LIB 0x00008000 /* PowerPC -mrelocatable-lib
-+ flag */
-+
-+/* PowerPC relocations defined by the ABIs */
-+#define R_PPC_NONE 0
-+#define R_PPC_ADDR32 1 /* 32bit absolute address */
-+#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
-+#define R_PPC_ADDR16 3 /* 16bit absolute address */
-+#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
-+#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
-+#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
-+#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
-+#define R_PPC_ADDR14_BRTAKEN 8
-+#define R_PPC_ADDR14_BRNTAKEN 9
-+#define R_PPC_REL24 10 /* PC relative 26 bit */
-+#define R_PPC_REL14 11 /* PC relative 16 bit */
-+#define R_PPC_REL14_BRTAKEN 12
-+#define R_PPC_REL14_BRNTAKEN 13
-+#define R_PPC_GOT16 14
-+#define R_PPC_GOT16_LO 15
-+#define R_PPC_GOT16_HI 16
-+#define R_PPC_GOT16_HA 17
-+#define R_PPC_PLTREL24 18
-+#define R_PPC_COPY 19
-+#define R_PPC_GLOB_DAT 20
-+#define R_PPC_JMP_SLOT 21
-+#define R_PPC_RELATIVE 22
-+#define R_PPC_LOCAL24PC 23
-+#define R_PPC_UADDR32 24
-+#define R_PPC_UADDR16 25
-+#define R_PPC_REL32 26
-+#define R_PPC_PLT32 27
-+#define R_PPC_PLTREL32 28
-+#define R_PPC_PLT16_LO 29
-+#define R_PPC_PLT16_HI 30
-+#define R_PPC_PLT16_HA 31
-+#define R_PPC_SDAREL16 32
-+#define R_PPC_SECTOFF 33
-+#define R_PPC_SECTOFF_LO 34
-+#define R_PPC_SECTOFF_HI 35
-+#define R_PPC_SECTOFF_HA 36
-+
-+/* PowerPC relocations defined for the TLS access ABI. */
-+#define R_PPC_TLS 67 /* none (sym+add)@tls */
-+#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
-+#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
-+#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
-+#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
-+#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
-+#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
-+#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
-+#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
-+#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
-+#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
-+#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
-+#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
-+#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
-+#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
-+#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
-+#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
-+#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
-+#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
-+#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
-+#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
-+#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
-+#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
-+#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
-+#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
-+#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
-+#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
-+#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
-+
-+/* Keep this the last entry. */
-+#define R_PPC_NUM 95
-+
-+/* The remaining relocs are from the Embedded ELF ABI, and are not
-+ in the SVR4 ELF ABI. */
-+#define R_PPC_EMB_NADDR32 101
-+#define R_PPC_EMB_NADDR16 102
-+#define R_PPC_EMB_NADDR16_LO 103
-+#define R_PPC_EMB_NADDR16_HI 104
-+#define R_PPC_EMB_NADDR16_HA 105
-+#define R_PPC_EMB_SDAI16 106
-+#define R_PPC_EMB_SDA2I16 107
-+#define R_PPC_EMB_SDA2REL 108
-+#define R_PPC_EMB_SDA21 109 /* 16 bit offset in SDA */
-+#define R_PPC_EMB_MRKREF 110
-+#define R_PPC_EMB_RELSEC16 111
-+#define R_PPC_EMB_RELST_LO 112
-+#define R_PPC_EMB_RELST_HI 113
-+#define R_PPC_EMB_RELST_HA 114
-+#define R_PPC_EMB_BIT_FLD 115
-+#define R_PPC_EMB_RELSDA 116 /* 16 bit relative offset in SDA */
-+
-+/* Diab tool relocations. */
-+#define R_PPC_DIAB_SDA21_LO 180 /* like EMB_SDA21, but lower 16 bit */
-+#define R_PPC_DIAB_SDA21_HI 181 /* like EMB_SDA21, but high 16 bit */
-+#define R_PPC_DIAB_SDA21_HA 182 /* like EMB_SDA21, adjusted high 16 */
-+#define R_PPC_DIAB_RELSDA_LO 183 /* like EMB_RELSDA, but lower 16 bit */
-+#define R_PPC_DIAB_RELSDA_HI 184 /* like EMB_RELSDA, but high 16 bit */
-+#define R_PPC_DIAB_RELSDA_HA 185 /* like EMB_RELSDA, adjusted high 16 */
-+
-+/* This is a phony reloc to handle any old fashioned TOC16 references
-+ that may still be in object files. */
-+#define R_PPC_TOC16 255
-+
-+
-+/* PowerPC64 relocations defined by the ABIs */
-+#define R_PPC64_NONE R_PPC_NONE
-+#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address */
-+#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned */
-+#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address */
-+#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of address */
-+#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of address. */
-+#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
-+#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned */
-+#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
-+#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
-+#define R_PPC64_REL24 R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
-+#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit */
-+#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
-+#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
-+#define R_PPC64_GOT16 R_PPC_GOT16
-+#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
-+#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
-+#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
-+
-+#define R_PPC64_COPY R_PPC_COPY
-+#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
-+#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
-+#define R_PPC64_RELATIVE R_PPC_RELATIVE
-+
-+#define R_PPC64_UADDR32 R_PPC_UADDR32
-+#define R_PPC64_UADDR16 R_PPC_UADDR16
-+#define R_PPC64_REL32 R_PPC_REL32
-+#define R_PPC64_PLT32 R_PPC_PLT32
-+#define R_PPC64_PLTREL32 R_PPC_PLTREL32
-+#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
-+#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
-+#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
-+
-+#define R_PPC64_SECTOFF R_PPC_SECTOFF
-+#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
-+#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
-+#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
-+#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2 */
-+#define R_PPC64_ADDR64 38 /* doubleword64 S + A */
-+#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A) */
-+#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A) */
-+#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A) */
-+#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A) */
-+#define R_PPC64_UADDR64 43 /* doubleword64 S + A */
-+#define R_PPC64_REL64 44 /* doubleword64 S + A - P */
-+#define R_PPC64_PLT64 45 /* doubleword64 L + A */
-+#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P */
-+#define R_PPC64_TOC16 47 /* half16* S + A - .TOC */
-+#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.) */
-+#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.) */
-+#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.) */
-+#define R_PPC64_TOC 51 /* doubleword64 .TOC */
-+#define R_PPC64_PLTGOT16 52 /* half16* M + A */
-+#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A) */
-+#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A) */
-+#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A) */
-+
-+#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2 */
-+#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2 */
-+#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2 */
-+#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2 */
-+#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2 */
-+#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2 */
-+#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2 */
-+#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2 */
-+#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2 */
-+#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2 */
-+#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2 */
-+
-+/* PowerPC64 relocations defined for the TLS access ABI. */
-+#define R_PPC64_TLS 67 /* none (sym+add)@tls */
-+#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
-+#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
-+#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
-+#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
-+#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
-+#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
-+#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
-+#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
-+#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
-+#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
-+#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
-+#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
-+#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
-+#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
-+#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
-+#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
-+#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
-+#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
-+#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
-+#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
-+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
-+#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
-+#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
-+#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
-+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
-+#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
-+#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
-+#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
-+#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
-+#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
-+#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
-+#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
-+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
-+#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
-+#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
-+#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
-+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
-+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
-+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
-+
-+/* Keep this the last entry. */
-+#define R_PPC64_NUM 107
-+
-+/* PowerPC64 specific values for the Dyn d_tag field. */
-+#define DT_PPC64_GLINK (DT_LOPROC + 0)
-+#define DT_PPC64_NUM 1
-+
-+
-+/* ARM specific declarations */
-+
-+/* Processor specific flags for the ELF header e_flags field. */
-+#define EF_ARM_RELEXEC 0x01
-+#define EF_ARM_HASENTRY 0x02
-+#define EF_ARM_INTERWORK 0x04
-+#define EF_ARM_APCS_26 0x08
-+#define EF_ARM_APCS_FLOAT 0x10
-+#define EF_ARM_PIC 0x20
-+#define EF_ARM_ALIGN8 0x40 /* 8-bit structure alignment is in use */
-+#define EF_ARM_NEW_ABI 0x80
-+#define EF_ARM_OLD_ABI 0x100
-+
-+/* Other constants defined in the ARM ELF spec. version B-01. */
-+/* NB. These conflict with values defined above. */
-+#define EF_ARM_SYMSARESORTED 0x04
-+#define EF_ARM_DYNSYMSUSESEGIDX 0x08
-+#define EF_ARM_MAPSYMSFIRST 0x10
-+#define EF_ARM_EABIMASK 0XFF000000
-+
-+#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK)
-+#define EF_ARM_EABI_UNKNOWN 0x00000000
-+#define EF_ARM_EABI_VER1 0x01000000
-+#define EF_ARM_EABI_VER2 0x02000000
-+
-+/* Additional symbol types for Thumb */
-+#define STT_ARM_TFUNC 0xd
-+
-+/* ARM-specific values for sh_flags */
-+#define SHF_ARM_ENTRYSECT 0x10000000 /* Section contains an entry point */
-+#define SHF_ARM_COMDEF 0x80000000 /* Section may be multiply defined
-+ in the input to a link step */
-+
-+/* ARM-specific program header flags */
-+#define PF_ARM_SB 0x10000000 /* Segment contains the location
-+ addressed by the static base */
-+
-+/* ARM relocs. */
-+#define R_ARM_NONE 0 /* No reloc */
-+#define R_ARM_PC24 1 /* PC relative 26 bit branch */
-+#define R_ARM_ABS32 2 /* Direct 32 bit */
-+#define R_ARM_REL32 3 /* PC relative 32 bit */
-+#define R_ARM_PC13 4
-+#define R_ARM_ABS16 5 /* Direct 16 bit */
-+#define R_ARM_ABS12 6 /* Direct 12 bit */
-+#define R_ARM_THM_ABS5 7
-+#define R_ARM_ABS8 8 /* Direct 8 bit */
-+#define R_ARM_SBREL32 9
-+#define R_ARM_THM_PC22 10
-+#define R_ARM_THM_PC8 11
-+#define R_ARM_AMP_VCALL9 12
-+#define R_ARM_SWI24 13
-+#define R_ARM_THM_SWI8 14
-+#define R_ARM_XPC25 15
-+#define R_ARM_THM_XPC22 16
-+#define R_ARM_COPY 20 /* Copy symbol at runtime */
-+#define R_ARM_GLOB_DAT 21 /* Create GOT entry */
-+#define R_ARM_JUMP_SLOT 22 /* Create PLT entry */
-+#define R_ARM_RELATIVE 23 /* Adjust by program base */
-+#define R_ARM_GOTOFF 24 /* 32 bit offset to GOT */
-+#define R_ARM_GOTPC 25 /* 32 bit PC relative offset to GOT */
-+#define R_ARM_GOT32 26 /* 32 bit GOT entry */
-+#define R_ARM_PLT32 27 /* 32 bit PLT address */
-+#define R_ARM_ALU_PCREL_7_0 32
-+#define R_ARM_ALU_PCREL_15_8 33
-+#define R_ARM_ALU_PCREL_23_15 34
-+#define R_ARM_LDR_SBREL_11_0 35
-+#define R_ARM_ALU_SBREL_19_12 36
-+#define R_ARM_ALU_SBREL_27_20 37
-+#define R_ARM_GNU_VTENTRY 100
-+#define R_ARM_GNU_VTINHERIT 101
-+#define R_ARM_THM_PC11 102 /* thumb unconditional branch */
-+#define R_ARM_THM_PC9 103 /* thumb conditional branch */
-+#define R_ARM_RXPC25 249
-+#define R_ARM_RSBREL32 250
-+#define R_ARM_THM_RPC22 251
-+#define R_ARM_RREL32 252
-+#define R_ARM_RABS22 253
-+#define R_ARM_RPC24 254
-+#define R_ARM_RBASE 255
-+/* Keep this the last entry. */
-+#define R_ARM_NUM 256
-+
-+/* IA-64 specific declarations. */
-+
-+/* Processor specific flags for the Ehdr e_flags field. */
-+#define EF_IA_64_MASKOS 0x0000000f /* os-specific flags */
-+#define EF_IA_64_ABI64 0x00000010 /* 64-bit ABI */
-+#define EF_IA_64_ARCH 0xff000000 /* arch. version mask */
-+
-+/* Processor specific values for the Phdr p_type field. */
-+#define PT_IA_64_ARCHEXT (PT_LOPROC + 0) /* arch extension bits */
-+#define PT_IA_64_UNWIND (PT_LOPROC + 1) /* ia64 unwind bits */
-+
-+/* Processor specific flags for the Phdr p_flags field. */
-+#define PF_IA_64_NORECOV 0x80000000 /* spec insns w/o recovery */
-+
-+/* Processor specific values for the Shdr sh_type field. */
-+#define SHT_IA_64_EXT (SHT_LOPROC + 0) /* extension bits */
-+#define SHT_IA_64_UNWIND (SHT_LOPROC + 1) /* unwind bits */
-+
-+/* Processor specific flags for the Shdr sh_flags field. */
-+#define SHF_IA_64_SHORT 0x10000000 /* section near gp */
-+#define SHF_IA_64_NORECOV 0x20000000 /* spec insns w/o recovery */
-+
-+/* Processor specific values for the Dyn d_tag field. */
-+#define DT_IA_64_PLT_RESERVE (DT_LOPROC + 0)
-+#define DT_IA_64_NUM 1
-+
-+/* IA-64 relocations. */
-+#define R_IA64_NONE 0x00 /* none */
-+#define R_IA64_IMM14 0x21 /* symbol + addend, add imm14 */
-+#define R_IA64_IMM22 0x22 /* symbol + addend, add imm22 */
-+#define R_IA64_IMM64 0x23 /* symbol + addend, mov imm64 */
-+#define R_IA64_DIR32MSB 0x24 /* symbol + addend, data4 MSB */
-+#define R_IA64_DIR32LSB 0x25 /* symbol + addend, data4 LSB */
-+#define R_IA64_DIR64MSB 0x26 /* symbol + addend, data8 MSB */
-+#define R_IA64_DIR64LSB 0x27 /* symbol + addend, data8 LSB */
-+#define R_IA64_GPREL22 0x2a /* @gprel(sym + add), add imm22 */
-+#define R_IA64_GPREL64I 0x2b /* @gprel(sym + add), mov imm64 */
-+#define R_IA64_GPREL32MSB 0x2c /* @gprel(sym + add), data4 MSB */
-+#define R_IA64_GPREL32LSB 0x2d /* @gprel(sym + add), data4 LSB */
-+#define R_IA64_GPREL64MSB 0x2e /* @gprel(sym + add), data8 MSB */
-+#define R_IA64_GPREL64LSB 0x2f /* @gprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF22 0x32 /* @ltoff(sym + add), add imm22 */
-+#define R_IA64_LTOFF64I 0x33 /* @ltoff(sym + add), mov imm64 */
-+#define R_IA64_PLTOFF22 0x3a /* @pltoff(sym + add), add imm22 */
-+#define R_IA64_PLTOFF64I 0x3b /* @pltoff(sym + add), mov imm64 */
-+#define R_IA64_PLTOFF64MSB 0x3e /* @pltoff(sym + add), data8 MSB */
-+#define R_IA64_PLTOFF64LSB 0x3f /* @pltoff(sym + add), data8 LSB */
-+#define R_IA64_FPTR64I 0x43 /* @fptr(sym + add), mov imm64 */
-+#define R_IA64_FPTR32MSB 0x44 /* @fptr(sym + add), data4 MSB */
-+#define R_IA64_FPTR32LSB 0x45 /* @fptr(sym + add), data4 LSB */
-+#define R_IA64_FPTR64MSB 0x46 /* @fptr(sym + add), data8 MSB */
-+#define R_IA64_FPTR64LSB 0x47 /* @fptr(sym + add), data8 LSB */
-+#define R_IA64_PCREL60B 0x48 /* @pcrel(sym + add), brl */
-+#define R_IA64_PCREL21B 0x49 /* @pcrel(sym + add), ptb, call */
-+#define R_IA64_PCREL21M 0x4a /* @pcrel(sym + add), chk.s */
-+#define R_IA64_PCREL21F 0x4b /* @pcrel(sym + add), fchkf */
-+#define R_IA64_PCREL32MSB 0x4c /* @pcrel(sym + add), data4 MSB */
-+#define R_IA64_PCREL32LSB 0x4d /* @pcrel(sym + add), data4 LSB */
-+#define R_IA64_PCREL64MSB 0x4e /* @pcrel(sym + add), data8 MSB */
-+#define R_IA64_PCREL64LSB 0x4f /* @pcrel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_FPTR22 0x52 /* @ltoff(@fptr(s+a)), imm22 */
-+#define R_IA64_LTOFF_FPTR64I 0x53 /* @ltoff(@fptr(s+a)), imm64 */
-+#define R_IA64_LTOFF_FPTR32MSB 0x54 /* @ltoff(@fptr(s+a)), data4 MSB */
-+#define R_IA64_LTOFF_FPTR32LSB 0x55 /* @ltoff(@fptr(s+a)), data4 LSB */
-+#define R_IA64_LTOFF_FPTR64MSB 0x56 /* @ltoff(@fptr(s+a)), data8 MSB */
-+#define R_IA64_LTOFF_FPTR64LSB 0x57 /* @ltoff(@fptr(s+a)), data8 LSB */
-+#define R_IA64_SEGREL32MSB 0x5c /* @segrel(sym + add), data4 MSB */
-+#define R_IA64_SEGREL32LSB 0x5d /* @segrel(sym + add), data4 LSB */
-+#define R_IA64_SEGREL64MSB 0x5e /* @segrel(sym + add), data8 MSB */
-+#define R_IA64_SEGREL64LSB 0x5f /* @segrel(sym + add), data8 LSB */
-+#define R_IA64_SECREL32MSB 0x64 /* @secrel(sym + add), data4 MSB */
-+#define R_IA64_SECREL32LSB 0x65 /* @secrel(sym + add), data4 LSB */
-+#define R_IA64_SECREL64MSB 0x66 /* @secrel(sym + add), data8 MSB */
-+#define R_IA64_SECREL64LSB 0x67 /* @secrel(sym + add), data8 LSB */
-+#define R_IA64_REL32MSB 0x6c /* data 4 + REL */
-+#define R_IA64_REL32LSB 0x6d /* data 4 + REL */
-+#define R_IA64_REL64MSB 0x6e /* data 8 + REL */
-+#define R_IA64_REL64LSB 0x6f /* data 8 + REL */
-+#define R_IA64_LTV32MSB 0x74 /* symbol + addend, data4 MSB */
-+#define R_IA64_LTV32LSB 0x75 /* symbol + addend, data4 LSB */
-+#define R_IA64_LTV64MSB 0x76 /* symbol + addend, data8 MSB */
-+#define R_IA64_LTV64LSB 0x77 /* symbol + addend, data8 LSB */
-+#define R_IA64_PCREL21BI 0x79 /* @pcrel(sym + add), 21bit inst */
-+#define R_IA64_PCREL22 0x7a /* @pcrel(sym + add), 22bit inst */
-+#define R_IA64_PCREL64I 0x7b /* @pcrel(sym + add), 64bit inst */
-+#define R_IA64_IPLTMSB 0x80 /* dynamic reloc, imported PLT, MSB */
-+#define R_IA64_IPLTLSB 0x81 /* dynamic reloc, imported PLT, LSB */
-+#define R_IA64_COPY 0x84 /* copy relocation */
-+#define R_IA64_SUB 0x85 /* Addend and symbol difference */
-+#define R_IA64_LTOFF22X 0x86 /* LTOFF22, relaxable. */
-+#define R_IA64_LDXMOV 0x87 /* Use of LTOFF22X. */
-+#define R_IA64_TPREL14 0x91 /* @tprel(sym + add), imm14 */
-+#define R_IA64_TPREL22 0x92 /* @tprel(sym + add), imm22 */
-+#define R_IA64_TPREL64I 0x93 /* @tprel(sym + add), imm64 */
-+#define R_IA64_TPREL64MSB 0x96 /* @tprel(sym + add), data8 MSB */
-+#define R_IA64_TPREL64LSB 0x97 /* @tprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_TPREL22 0x9a /* @ltoff(@tprel(s+a)), imm2 */
-+#define R_IA64_DTPMOD64MSB 0xa6 /* @dtpmod(sym + add), data8 MSB */
-+#define R_IA64_DTPMOD64LSB 0xa7 /* @dtpmod(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_DTPMOD22 0xaa /* @ltoff(@dtpmod(sym + add)), imm22 */
-+#define R_IA64_DTPREL14 0xb1 /* @dtprel(sym + add), imm14 */
-+#define R_IA64_DTPREL22 0xb2 /* @dtprel(sym + add), imm22 */
-+#define R_IA64_DTPREL64I 0xb3 /* @dtprel(sym + add), imm64 */
-+#define R_IA64_DTPREL32MSB 0xb4 /* @dtprel(sym + add), data4 MSB */
-+#define R_IA64_DTPREL32LSB 0xb5 /* @dtprel(sym + add), data4 LSB */
-+#define R_IA64_DTPREL64MSB 0xb6 /* @dtprel(sym + add), data8 MSB */
-+#define R_IA64_DTPREL64LSB 0xb7 /* @dtprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_DTPREL22 0xba /* @ltoff(@dtprel(s+a)), imm22 */
-+
-+/* SH specific declarations */
-+
-+/* SH relocs. */
-+#define R_SH_NONE 0
-+#define R_SH_DIR32 1
-+#define R_SH_REL32 2
-+#define R_SH_DIR8WPN 3
-+#define R_SH_IND12W 4
-+#define R_SH_DIR8WPL 5
-+#define R_SH_DIR8WPZ 6
-+#define R_SH_DIR8BP 7
-+#define R_SH_DIR8W 8
-+#define R_SH_DIR8L 9
-+#define R_SH_SWITCH16 25
-+#define R_SH_SWITCH32 26
-+#define R_SH_USES 27
-+#define R_SH_COUNT 28
-+#define R_SH_ALIGN 29
-+#define R_SH_CODE 30
-+#define R_SH_DATA 31
-+#define R_SH_LABEL 32
-+#define R_SH_SWITCH8 33
-+#define R_SH_GNU_VTINHERIT 34
-+#define R_SH_GNU_VTENTRY 35
-+#define R_SH_TLS_GD_32 144
-+#define R_SH_TLS_LD_32 145
-+#define R_SH_TLS_LDO_32 146
-+#define R_SH_TLS_IE_32 147
-+#define R_SH_TLS_LE_32 148
-+#define R_SH_TLS_DTPMOD32 149
-+#define R_SH_TLS_DTPOFF32 150
-+#define R_SH_TLS_TPOFF32 151
-+#define R_SH_GOT32 160
-+#define R_SH_PLT32 161
-+#define R_SH_COPY 162
-+#define R_SH_GLOB_DAT 163
-+#define R_SH_JMP_SLOT 164
-+#define R_SH_RELATIVE 165
-+#define R_SH_GOTOFF 166
-+#define R_SH_GOTPC 167
-+/* Keep this the last entry. */
-+#define R_SH_NUM 256
-+
-+/* Additional s390 relocs */
-+
-+#define R_390_NONE 0 /* No reloc. */
-+#define R_390_8 1 /* Direct 8 bit. */
-+#define R_390_12 2 /* Direct 12 bit. */
-+#define R_390_16 3 /* Direct 16 bit. */
-+#define R_390_32 4 /* Direct 32 bit. */
-+#define R_390_PC32 5 /* PC relative 32 bit. */
-+#define R_390_GOT12 6 /* 12 bit GOT offset. */
-+#define R_390_GOT32 7 /* 32 bit GOT offset. */
-+#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */
-+#define R_390_COPY 9 /* Copy symbol at runtime. */
-+#define R_390_GLOB_DAT 10 /* Create GOT entry. */
-+#define R_390_JMP_SLOT 11 /* Create PLT entry. */
-+#define R_390_RELATIVE 12 /* Adjust by program base. */
-+#define R_390_GOTOFF32 13 /* 32 bit offset to GOT. */
-+#define R_390_GOTPC 14 /* 32 bit PC relative offset to GOT. */
-+#define R_390_GOT16 15 /* 16 bit GOT offset. */
-+#define R_390_PC16 16 /* PC relative 16 bit. */
-+#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */
-+#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */
-+#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */
-+#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */
-+#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */
-+#define R_390_64 22 /* Direct 64 bit. */
-+#define R_390_PC64 23 /* PC relative 64 bit. */
-+#define R_390_GOT64 24 /* 64 bit GOT offset. */
-+#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */
-+#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */
-+#define R_390_GOTOFF16 27 /* 16 bit offset to GOT. */
-+#define R_390_GOTOFF64 28 /* 64 bit offset to GOT. */
-+#define R_390_GOTPLT12 29 /* 12 bit offset to jump slot. */
-+#define R_390_GOTPLT16 30 /* 16 bit offset to jump slot. */
-+#define R_390_GOTPLT32 31 /* 32 bit offset to jump slot. */
-+#define R_390_GOTPLT64 32 /* 64 bit offset to jump slot. */
-+#define R_390_GOTPLTENT 33 /* 32 bit rel. offset to jump slot. */
-+#define R_390_PLTOFF16 34 /* 16 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF32 35 /* 32 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF64 36 /* 16 bit offset from GOT to PLT. */
-+#define R_390_TLS_LOAD 37 /* Tag for load insn in TLS code. */
-+#define R_390_TLS_GDCALL 38 /* Tag for function call in general
-+ dynamic TLS code. */
-+#define R_390_TLS_LDCALL 39 /* Tag for function call in local
-+ dynamic TLS code. */
-+#define R_390_TLS_GD32 40 /* Direct 32 bit for general dynamic
-+ thread local data. */
-+#define R_390_TLS_GD64 41 /* Direct 64 bit for general dynamic
-+ thread local data. */
-+#define R_390_TLS_GOTIE12 42 /* 12 bit GOT offset for static TLS
-+ block offset. */
-+#define R_390_TLS_GOTIE32 43 /* 32 bit GOT offset for static TLS
-+ block offset. */
-+#define R_390_TLS_GOTIE64 44 /* 64 bit GOT offset for static TLS
-+ block offset. */
-+#define R_390_TLS_LDM32 45 /* Direct 32 bit for local dynamic
-+ thread local data in LE code. */
-+#define R_390_TLS_LDM64 46 /* Direct 64 bit for local dynamic
-+ thread local data in LE code. */
-+#define R_390_TLS_IE32 47 /* 32 bit address of GOT entry for
-+ negated static TLS block offset. */
-+#define R_390_TLS_IE64 48 /* 64 bit address of GOT entry for
-+ negated static TLS block offset. */
-+#define R_390_TLS_IEENT 49 /* 32 bit rel. offset to GOT entry for
-+ negated static TLS block offset. */
-+#define R_390_TLS_LE32 50 /* 32 bit negated offset relative to
-+ static TLS block. */
-+#define R_390_TLS_LE64 51 /* 64 bit negated offset relative to
-+ static TLS block. */
-+#define R_390_TLS_LDO32 52 /* 32 bit offset relative to TLS
-+ block. */
-+#define R_390_TLS_LDO64 53 /* 64 bit offset relative to TLS
-+ block. */
-+#define R_390_TLS_DTPMOD 54 /* ID of module containing symbol. */
-+#define R_390_TLS_DTPOFF 55 /* Offset in TLS block. */
-+#define R_390_TLS_TPOFF 56 /* Negated offset in static TLS
-+ block. */
-+
-+/* Keep this the last entry. */
-+#define R_390_NUM 57
-+
-+/* CRIS relocations. */
-+#define R_CRIS_NONE 0
-+#define R_CRIS_8 1
-+#define R_CRIS_16 2
-+#define R_CRIS_32 3
-+#define R_CRIS_8_PCREL 4
-+#define R_CRIS_16_PCREL 5
-+#define R_CRIS_32_PCREL 6
-+#define R_CRIS_GNU_VTINHERIT 7
-+#define R_CRIS_GNU_VTENTRY 8
-+#define R_CRIS_COPY 9
-+#define R_CRIS_GLOB_DAT 10
-+#define R_CRIS_JUMP_SLOT 11
-+#define R_CRIS_RELATIVE 12
-+#define R_CRIS_16_GOT 13
-+#define R_CRIS_32_GOT 14
-+#define R_CRIS_16_GOTPLT 15
-+#define R_CRIS_32_GOTPLT 16
-+#define R_CRIS_32_GOTREL 17
-+#define R_CRIS_32_PLT_GOTREL 18
-+#define R_CRIS_32_PLT_PCREL 19
-+
-+#define R_CRIS_NUM 20
-+
-+/* AMD x86-64 relocations. */
-+#define R_X86_64_NONE 0 /* No reloc */
-+#define R_X86_64_64 1 /* Direct 64 bit */
-+#define R_X86_64_PC32 2 /* PC relative 32 bit signed */
-+#define R_X86_64_GOT32 3 /* 32 bit GOT entry */
-+#define R_X86_64_PLT32 4 /* 32 bit PLT address */
-+#define R_X86_64_COPY 5 /* Copy symbol at runtime */
-+#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
-+#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
-+#define R_X86_64_RELATIVE 8 /* Adjust by program base */
-+#define R_X86_64_GOTPCREL 9 /* 32 bit signed PC relative
-+ offset to GOT */
-+#define R_X86_64_32 10 /* Direct 32 bit zero extended */
-+#define R_X86_64_32S 11 /* Direct 32 bit sign extended */
-+#define R_X86_64_16 12 /* Direct 16 bit zero extended */
-+#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */
-+#define R_X86_64_8 14 /* Direct 8 bit sign extended */
-+#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
-+#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */
-+#define R_X86_64_DTPOFF64 17 /* Offset in module's TLS block */
-+#define R_X86_64_TPOFF64 18 /* Offset in initial TLS block */
-+#define R_X86_64_TLSGD 19 /* 32 bit signed PC relative offset
-+ to two GOT entries for GD symbol */
-+#define R_X86_64_TLSLD 20 /* 32 bit signed PC relative offset
-+ to two GOT entries for LD symbol */
-+#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */
-+#define R_X86_64_GOTTPOFF 22 /* 32 bit signed PC relative offset
-+ to GOT entry for IE symbol */
-+#define R_X86_64_TPOFF32 23 /* Offset in initial TLS block */
-+
-+#define R_X86_64_NUM 24
-+
-+__END_DECLS
-+
-+#endif /* elf.h */
-
- #include "elfconfig.h"
-
-@@ -185,3 +2631,4 @@
- void fatal(const char *fmt, ...);
- void warn(const char *fmt, ...);
- void merror(const char *fmt, ...);
-+
-diff -Nur linux-3.11.5.orig/scripts/mod/sumversion.c linux-3.11.5/scripts/mod/sumversion.c
---- linux-3.11.5.orig/scripts/mod/sumversion.c 2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/scripts/mod/sumversion.c 2013-10-16 18:09:31.000000000 +0200
-@@ -1,4 +1,4 @@
--#include <netinet/in.h>
-+/* #include <netinet/in.h> */
- #ifdef __sun__
- #include <inttypes.h>
- #else
-diff -Nur linux-3.11.5.orig/tools/include/tools/linux_types.h linux-3.11.5/tools/include/tools/linux_types.h
---- linux-3.11.5.orig/tools/include/tools/linux_types.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.11.5/tools/include/tools/linux_types.h 2013-10-16 18:09:31.000000000 +0200
-@@ -0,0 +1,22 @@
-+#ifndef __LINUX_TYPES_H
-+#define __LINUX_TYPES_H
-+
-+#include <stdint.h>
-+
-+typedef uint8_t __u8;
-+typedef uint8_t __be8;
-+typedef uint8_t __le8;
-+
-+typedef uint16_t __u16;
-+typedef uint16_t __be16;
-+typedef uint16_t __le16;
-+
-+typedef uint32_t __u32;
-+typedef uint32_t __be32;
-+typedef uint32_t __le32;
-+
-+typedef uint64_t __u64;
-+typedef uint64_t __be64;
-+typedef uint64_t __le64;
-+
-+#endif
diff --git a/target/linux/patches/3.15-rc7/cleankernel.patch b/target/linux/patches/3.15-rc7/cleankernel.patch
deleted file mode 100644
index d8c055dc3..000000000
--- a/target/linux/patches/3.15-rc7/cleankernel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-3.11.5.orig/scripts/Makefile.headersinst linux-3.11.5/scripts/Makefile.headersinst
---- linux-3.11.5.orig/scripts/Makefile.headersinst 2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/scripts/Makefile.headersinst 2013-10-15 16:33:10.000000000 +0200
-@@ -107,7 +107,6 @@
-
- targets += $(install-file)
- $(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
-- $(if $(unwanted),$(call cmd,remove),)
- $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- $(call if_changed,install)
-
diff --git a/target/linux/patches/3.15-rc7/defaults.patch b/target/linux/patches/3.15-rc7/defaults.patch
deleted file mode 100644
index 6cdca084e..000000000
--- a/target/linux/patches/3.15-rc7/defaults.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nur linux-3.0.4.orig/fs/Kconfig linux-3.0.4/fs/Kconfig
---- linux-3.0.4.orig/fs/Kconfig 2011-08-29 22:56:30.000000000 +0200
-+++ linux-3.0.4/fs/Kconfig 2011-10-15 22:08:44.000000000 +0200
-@@ -47,7 +47,7 @@
- def_bool n
-
- config EXPORTFS
-- tristate
-+ def_bool y
-
- config FILE_LOCKING
- bool "Enable POSIX file locking API" if EXPERT
-diff -Nur linux-3.0.4.orig/fs/notify/Kconfig linux-3.0.4/fs/notify/Kconfig
---- linux-3.0.4.orig/fs/notify/Kconfig 2011-08-29 22:56:30.000000000 +0200
-+++ linux-3.0.4/fs/notify/Kconfig 2011-10-15 22:02:00.000000000 +0200
-@@ -1,5 +1,5 @@
- config FSNOTIFY
-- def_bool n
-+ def_bool y
-
- source "fs/notify/dnotify/Kconfig"
- source "fs/notify/inotify/Kconfig"
-diff -Nur linux-3.11.10.orig/drivers/scsi/Kconfig linux-3.11.10/drivers/scsi/Kconfig
---- linux-3.11.10.orig/drivers/scsi/Kconfig 2013-11-29 19:42:37.000000000 +0100
-+++ linux-3.11.10/drivers/scsi/Kconfig 2013-12-27 19:13:21.000000000 +0100
-@@ -2,7 +2,7 @@
-
- config SCSI_MOD
- tristate
-- default y if SCSI=n || SCSI=y
-+ default y if SCSI=y
- default m if SCSI=m
-
- config RAID_ATTRS
-diff -Nur linux-3.11.10.orig/usr/Kconfig linux-3.11.10/usr/Kconfig
---- linux-3.11.10.orig/usr/Kconfig 2013-11-29 19:42:37.000000000 +0100
-+++ linux-3.11.10/usr/Kconfig 2013-12-27 19:15:16.000000000 +0100
-@@ -47,7 +47,7 @@
-
- config RD_GZIP
- bool "Support initial ramdisks compressed using gzip" if EXPERT
-- default y
-+ default n
- depends on BLK_DEV_INITRD
- select DECOMPRESS_GZIP
- help
diff --git a/target/linux/patches/3.15-rc7/disable-netfilter.patch b/target/linux/patches/3.15-rc7/disable-netfilter.patch
deleted file mode 100644
index 7b1ca013a..000000000
--- a/target/linux/patches/3.15-rc7/disable-netfilter.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -Nur linux-3.7.3.orig/net/Kconfig linux-3.7.3/net/Kconfig
---- linux-3.7.3.orig/net/Kconfig 2013-01-17 17:47:40.000000000 +0100
-+++ linux-3.7.3/net/Kconfig 2013-01-19 18:19:55.000000000 +0100
-@@ -163,7 +163,7 @@
- config NETFILTER_ADVANCED
- bool "Advanced netfilter configuration"
- depends on NETFILTER
-- default y
-+ default n
- help
- If you say Y here you can select between all the netfilter modules.
- If you say N the more unusual ones will not be shown and the
-@@ -175,7 +175,7 @@
- bool "Bridged IP/ARP packets filtering"
- depends on BRIDGE && NETFILTER && INET
- depends on NETFILTER_ADVANCED
-- default y
-+ default n
- ---help---
- Enabling this option will let arptables resp. iptables see bridged
- ARP resp. IP traffic. If you want a bridging firewall, you probably
-diff -Nur linux-3.7.3.orig/net/netfilter/Kconfig linux-3.7.3/net/netfilter/Kconfig
---- linux-3.7.3.orig/net/netfilter/Kconfig 2013-01-17 17:47:40.000000000 +0100
-+++ linux-3.7.3/net/netfilter/Kconfig 2013-01-19 18:21:41.000000000 +0100
-@@ -22,7 +22,6 @@
-
- config NETFILTER_NETLINK_LOG
- tristate "Netfilter LOG over NFNETLINK interface"
-- default m if NETFILTER_ADVANCED=n
- select NETFILTER_NETLINK
- help
- If this option is enabled, the kernel will include support
-@@ -34,7 +33,6 @@
-
- config NF_CONNTRACK
- tristate "Netfilter connection tracking support"
-- default m if NETFILTER_ADVANCED=n
- help
- Connection tracking keeps a record of what packets have passed
- through your machine, in order to figure out how they are related
-@@ -60,7 +58,6 @@
- config NF_CONNTRACK_SECMARK
- bool 'Connection tracking security mark support'
- depends on NETWORK_SECMARK
-- default m if NETFILTER_ADVANCED=n
- help
- This option enables security markings to be applied to
- connections. Typically they are copied to connections from
-@@ -177,7 +174,6 @@
-
- config NF_CONNTRACK_FTP
- tristate "FTP protocol support"
-- default m if NETFILTER_ADVANCED=n
- help
- Tracking FTP connections is problematic: special helpers are
- required for tracking them, and doing masquerading and other forms
-@@ -211,7 +207,6 @@
-
- config NF_CONNTRACK_IRC
- tristate "IRC protocol support"
-- default m if NETFILTER_ADVANCED=n
- help
- There is a commonly-used extension to IRC called
- Direct Client-to-Client Protocol (DCC). This enables users to send
-@@ -296,7 +291,6 @@
-
- config NF_CONNTRACK_SIP
- tristate "SIP protocol support"
-- default m if NETFILTER_ADVANCED=n
- help
- SIP is an application-layer control protocol that can establish,
- modify, and terminate multimedia sessions (conferences) such as
-@@ -320,7 +314,6 @@
- config NF_CT_NETLINK
- tristate 'Connection tracking netlink interface'
- select NETFILTER_NETLINK
-- default m if NETFILTER_ADVANCED=n
- help
- This option enables support for a netlink-based userspace interface
-
-@@ -424,7 +417,6 @@
-
- config NETFILTER_XTABLES
- tristate "Netfilter Xtables support (required for ip_tables)"
-- default m if NETFILTER_ADVANCED=n
- help
- This is required if you intend to use any of ip_tables,
- ip6_tables or arp_tables.
-@@ -435,7 +427,6 @@
-
- config NETFILTER_XT_MARK
- tristate 'nfmark target and match support'
-- default m if NETFILTER_ADVANCED=n
- ---help---
- This option adds the "MARK" target and "mark" match.
-
-@@ -527,7 +518,6 @@
- config NETFILTER_XT_TARGET_CONNSECMARK
- tristate '"CONNSECMARK" target support'
- depends on NF_CONNTRACK && NF_CONNTRACK_SECMARK
-- default m if NETFILTER_ADVANCED=n
- help
- The CONNSECMARK target copies security markings from packets
- to connections, and restores security markings from connections
-@@ -632,7 +622,6 @@
-
- config NETFILTER_XT_TARGET_LOG
- tristate "LOG target support"
-- default m if NETFILTER_ADVANCED=n
- help
- This option adds a `LOG' target, which allows you to create rules in
- any iptables table which records the packet header to the syslog.
-@@ -660,7 +649,6 @@
-
- config NETFILTER_XT_TARGET_NFLOG
- tristate '"NFLOG" target support'
-- default m if NETFILTER_ADVANCED=n
- select NETFILTER_NETLINK_LOG
- help
- This option enables the NFLOG target, which allows to LOG
-@@ -741,7 +729,6 @@
- config NETFILTER_XT_TARGET_SECMARK
- tristate '"SECMARK" target support'
- depends on NETWORK_SECMARK
-- default m if NETFILTER_ADVANCED=n
- help
- The SECMARK target allows security marking of network
- packets, for use with security subsystems.
-@@ -751,7 +738,6 @@
- config NETFILTER_XT_TARGET_TCPMSS
- tristate '"TCPMSS" target support'
- depends on (IPV6 || IPV6=n)
-- default m if NETFILTER_ADVANCED=n
- ---help---
- This option adds a `TCPMSS' target, which allows you to alter the
- MSS value of TCP SYN packets, to control the maximum size for that
-@@ -856,7 +842,6 @@
- config NETFILTER_XT_MATCH_CONNTRACK
- tristate '"conntrack" connection tracking match support'
- depends on NF_CONNTRACK
-- default m if NETFILTER_ADVANCED=n
- help
- This is a general conntrack match module, a superset of the state match.
-
-@@ -1063,7 +1048,6 @@
- config NETFILTER_XT_MATCH_POLICY
- tristate 'IPsec "policy" match support'
- depends on XFRM
-- default m if NETFILTER_ADVANCED=n
- help
- Policy matching allows you to match packets based on the
- IPsec policy that was used during decapsulation/will
-@@ -1170,7 +1154,6 @@
- config NETFILTER_XT_MATCH_STATE
- tristate '"state" match support'
- depends on NF_CONNTRACK
-- default m if NETFILTER_ADVANCED=n
- help
- Connection state matching allows you to match packets based on their
- relationship to a tracked connection (ie. previous packets). This
diff --git a/target/linux/patches/3.15-rc7/export-symbol-for-exmap.patch b/target/linux/patches/3.15-rc7/export-symbol-for-exmap.patch
deleted file mode 100644
index 4f0fc8449..000000000
--- a/target/linux/patches/3.15-rc7/export-symbol-for-exmap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-3.11.5.orig/kernel/pid.c linux-3.11.5/kernel/pid.c
---- linux-3.11.5.orig/kernel/pid.c 2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/kernel/pid.c 2013-10-29 15:37:02.000000000 +0100
-@@ -450,6 +450,7 @@
- {
- return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
- }
-+EXPORT_SYMBOL(find_task_by_vpid);
-
- struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
- {
diff --git a/target/linux/patches/3.15-rc7/gemalto.patch b/target/linux/patches/3.15-rc7/gemalto.patch
deleted file mode 100644
index 65f7af1d7..000000000
--- a/target/linux/patches/3.15-rc7/gemalto.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-2.6.36.orig/drivers/tty/serial/8250/serial_cs.c linux-2.6.36/drivers/serial/8250/serial_cs.c
---- linux-2.6.36.orig/drivers/tty/serial/8250/serial_cs.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/tty/serial/8250/serial_cs.c 2010-12-13 23:03:40.000000000 +0100
-@@ -794,6 +794,7 @@
- PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025),
- PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045),
- PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052),
-+ PCMCIA_DEVICE_MANF_CARD(0x0157, 0x0100), /* Gemalto SCR */
- PCMCIA_DEVICE_MANF_CARD(0x016c, 0x0006), /* Psion 56K+Fax */
- PCMCIA_DEVICE_MANF_CARD(0x0200, 0x0001), /* MultiMobile */
- PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae),
diff --git a/target/linux/patches/3.15-rc7/initramfs-nosizelimit.patch b/target/linux/patches/3.15-rc7/initramfs-nosizelimit.patch
deleted file mode 100644
index 40d2f6bd8..000000000
--- a/target/linux/patches/3.15-rc7/initramfs-nosizelimit.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9a18df7a71bfa620b1278777d64783a359d7eb4e Mon Sep 17 00:00:00 2001
-From: Thorsten Glaser <tg@mirbsd.org>
-Date: Sun, 4 May 2014 01:37:54 +0200
-Subject: [PATCH] mount tmpfs-as-rootfs (initramfs) with -o
- nr_blocks=0,nr_inodes=0
-
-I would have preferred to write this patch to be able to pass
-rootflags=nr_blocks=0,nr_inodes=0 on the kernel command line,
-and then hand these rootflags over to the initramfs (tmpfs)
-mount in the same way the kernel hands them over to the block
-device rootfs mount. But at least the Debian/m68k initrd also
-parses $rootflags from the environment and adds it to the call
-to the user-space mount for the eventual root device, which
-would make the kernel command line rootflags option be used in
-both places (tmpfs and e.g. ext4) which is guaranteed to error
-out in at least one of them.
-
-This change is intended to aid people in a setup where the
-initrd is the final root filesystem, i.e. not mounted over.
-This is especially useful in automated tests running on qemu
-for boards with constrained memory (e.g. 64 MiB on sh4).
-
-Considering that the initramfs is normally emptied out then
-overmounted, this change is probably safe for setups where
-initramfs just hosts early userspace, too, since the tmpfs
-backing it is not accessible any more later on, AFAICT.
-
-Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
----
- init/do_mounts.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 82f2288..55a4cfe 100644
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -594,6 +594,7 @@ out:
- }
-
- static bool is_tmpfs;
-+static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0";
- static struct dentry *rootfs_mount(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
- {
-@@ -606,6 +607,9 @@ static struct dentry *rootfs_mount(struct file_system_type *fs_type,
- if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)
- fill = shmem_fill_super;
-
-+ if (is_tmpfs)
-+ data = tmpfs_rootflags;
-+
- return mount_nodev(fs_type, flags, data, fill);
- }
-
---
-2.0.0.rc0
-
diff --git a/target/linux/patches/3.15-rc7/lemote-rfkill.patch b/target/linux/patches/3.15-rc7/lemote-rfkill.patch
deleted file mode 100644
index a61488434..000000000
--- a/target/linux/patches/3.15-rc7/lemote-rfkill.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur linux-3.3.orig/drivers/net/wireless/rtl818x/rtl8187/rfkill.c linux-3.3/drivers/net/wireless/rtl818x/rtl8187/rfkill.c
---- linux-3.3.orig/drivers/net/wireless/rtl818x/rtl8187/rfkill.c 2012-03-19 00:15:34.000000000 +0100
-+++ linux-3.3/drivers/net/wireless/rtl818x/rtl8187/rfkill.c 2012-03-27 23:29:46.000000000 +0200
-@@ -22,6 +22,9 @@
-
- static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv)
- {
-+#ifdef CONFIG_LEMOTE_MACH2F
-+ return 1;
-+#else
- u8 gpio;
-
- gpio = rtl818x_ioread8(priv, &priv->map->GPIO0);
-@@ -29,6 +32,7 @@
- gpio = rtl818x_ioread8(priv, &priv->map->GPIO1);
-
- return gpio & priv->rfkill_mask;
-+#endif
- }
-
- void rtl8187_rfkill_init(struct ieee80211_hw *hw)
diff --git a/target/linux/patches/3.15-rc7/microblaze-axi.patch b/target/linux/patches/3.15-rc7/microblaze-axi.patch
deleted file mode 100644
index 1a4b17d8c..000000000
--- a/target/linux/patches/3.15-rc7/microblaze-axi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-3.13.3.orig/drivers/net/ethernet/xilinx/xilinx_axienet_main.c linux-3.13.3/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
---- linux-3.13.3.orig/drivers/net/ethernet/xilinx/xilinx_axienet_main.c 2014-02-13 23:00:14.000000000 +0100
-+++ linux-3.13.3/drivers/net/ethernet/xilinx/xilinx_axienet_main.c 2014-02-24 08:03:57.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <linux/init.h>
- #include <linux/module.h>
- #include <linux/netdevice.h>
-+#include <linux/of_irq.h>
- #include <linux/of_mdio.h>
- #include <linux/of_platform.h>
- #include <linux/of_address.h>
diff --git a/target/linux/patches/3.15-rc7/microblaze-ethernet.patch b/target/linux/patches/3.15-rc7/microblaze-ethernet.patch
deleted file mode 100644
index 742ab477e..000000000
--- a/target/linux/patches/3.15-rc7/microblaze-ethernet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-3.11.10.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c linux-3.11.10/drivers/net/ethernet/xilinx/xilinx_emaclite.c
---- linux-3.11.10.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c 2013-11-29 19:42:37.000000000 +0100
-+++ linux-3.11.10/drivers/net/ethernet/xilinx/xilinx_emaclite.c 2013-12-23 20:01:14.000000000 +0100
-@@ -1282,6 +1282,7 @@
- { .compatible = "xlnx,opb-ethernetlite-1.01.b", },
- { .compatible = "xlnx,xps-ethernetlite-1.00.a", },
- { .compatible = "xlnx,xps-ethernetlite-2.00.a", },
-+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", },
- { .compatible = "xlnx,xps-ethernetlite-2.01.a", },
- { .compatible = "xlnx,xps-ethernetlite-3.00.a", },
- { /* end of list */ },
diff --git a/target/linux/patches/3.15-rc7/mkpiggy.patch b/target/linux/patches/3.15-rc7/mkpiggy.patch
deleted file mode 100644
index 751678b74..000000000
--- a/target/linux/patches/3.15-rc7/mkpiggy.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur linux-3.13.3.orig/arch/x86/boot/compressed/mkpiggy.c linux-3.13.3/arch/x86/boot/compressed/mkpiggy.c
---- linux-3.13.3.orig/arch/x86/boot/compressed/mkpiggy.c 2014-02-13 23:00:14.000000000 +0100
-+++ linux-3.13.3/arch/x86/boot/compressed/mkpiggy.c 2014-02-17 11:09:06.000000000 +0100
-@@ -29,7 +29,14 @@
- #include <stdio.h>
- #include <string.h>
- #include <inttypes.h>
--#include <tools/le_byteshift.h>
-+
-+static uint32_t getle32(const void *p)
-+{
-+ const uint8_t *cp = p;
-+
-+ return (uint32_t)cp[0] + ((uint32_t)cp[1] << 8) +
-+ ((uint32_t)cp[2] << 16) + ((uint32_t)cp[3] << 24);
-+}
-
- int main(int argc, char *argv[])
- {
-@@ -63,7 +70,7 @@
- }
-
- ilen = ftell(f);
-- olen = get_unaligned_le32(&olen);
-+ olen = getle32(&olen);
-
- /*
- * Now we have the input (compressed) and output (uncompressed)
diff --git a/target/linux/patches/3.15-rc7/mtd-rootfs.patch b/target/linux/patches/3.15-rc7/mtd-rootfs.patch
deleted file mode 100644
index 775d5fc80..000000000
--- a/target/linux/patches/3.15-rc7/mtd-rootfs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur linux-3.5.orig//drivers/mtd/mtdpart.c linux-3.5/drivers/mtd/mtdpart.c
---- linux-3.5.orig//drivers/mtd/mtdpart.c 2012-07-21 22:58:29.000000000 +0200
-+++ linux-3.5/drivers/mtd/mtdpart.c 2012-07-31 23:59:07.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/err.h>
-+#include <linux/root_dev.h>
-
- #include "mtdcore.h"
-
-@@ -637,6 +638,14 @@
- if (IS_ERR(slave))
- return PTR_ERR(slave);
-
-+ if (strcmp(parts[i].name, "rootfs") == 0) {
-+ if (ROOT_DEV == 0) {
-+ printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+ "set to be root filesystem\n");
-+ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, i);
-+ }
-+ }
-+
- mutex_lock(&mtd_partitions_mutex);
- list_add(&slave->list, &mtd_partitions);
- mutex_unlock(&mtd_partitions_mutex);
diff --git a/target/linux/patches/3.15-rc7/nfsv3-tcp.patch b/target/linux/patches/3.15-rc7/nfsv3-tcp.patch
deleted file mode 100644
index d5e07e1c2..000000000
--- a/target/linux/patches/3.15-rc7/nfsv3-tcp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-3.15-rc5.orig/fs/nfs/nfsroot.c linux-3.15-rc5/fs/nfs/nfsroot.c
---- linux-3.15-rc5.orig/fs/nfs/nfsroot.c 2014-05-09 22:10:52.000000000 +0200
-+++ linux-3.15-rc5/fs/nfs/nfsroot.c 2014-05-16 15:45:38.000000000 +0200
-@@ -87,7 +87,7 @@
- #define NFS_ROOT "/tftpboot/%s"
-
- /* Default NFSROOT mount options. */
--#define NFS_DEF_OPTIONS "vers=2,udp,rsize=4096,wsize=4096"
-+#define NFS_DEF_OPTIONS "nfsvers=3,proto=tcp,rsize=4096,wsize=4096"
-
- /* Parameters passed from the kernel command line */
- static char nfs_root_parms[256] __initdata = "";
diff --git a/target/linux/patches/3.15-rc7/non-static.patch b/target/linux/patches/3.15-rc7/non-static.patch
deleted file mode 100644
index a967703d0..000000000
--- a/target/linux/patches/3.15-rc7/non-static.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur linux-2.6.39-rc6.orig/fs/namei.c linux-2.6.39-rc6/fs/namei.c
---- linux-2.6.39-rc6.orig/fs/namei.c 2011-05-04 04:59:13.000000000 +0200
-+++ linux-2.6.39-rc6/fs/namei.c 2011-05-05 11:30:14.000000000 +0200
-@@ -1769,7 +1769,7 @@
- * needs parent already locked. Doesn't follow mounts.
- * SMP-safe.
- */
--static struct dentry *lookup_hash(struct nameidata *nd)
-+struct dentry *lookup_hash(struct nameidata *nd)
- {
- return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-diff -Nur linux-2.6.39-rc6.orig/fs/splice.c linux-2.6.39-rc6/fs/splice.c
---- linux-2.6.39-rc6.orig/fs/splice.c 2011-05-04 04:59:13.000000000 +0200
-+++ linux-2.6.39-rc6/fs/splice.c 2011-05-05 11:31:04.000000000 +0200
-@@ -1081,7 +1081,7 @@
- /*
- * Attempt to initiate a splice from pipe to file.
- */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- loff_t *ppos, size_t len, unsigned int flags)
- {
- ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
-@@ -1109,7 +1109,7 @@
- /*
- * Attempt to initiate a splice from a file to a pipe.
- */
--static long do_splice_to(struct file *in, loff_t *ppos,
-+long do_splice_to(struct file *in, loff_t *ppos,
- struct pipe_inode_info *pipe, size_t len,
- unsigned int flags)
- {
diff --git a/target/linux/patches/3.15-rc7/patch-yaffs2 b/target/linux/patches/3.15-rc7/patch-yaffs2
deleted file mode 100644
index bb244c7ca..000000000
--- a/target/linux/patches/3.15-rc7/patch-yaffs2
+++ /dev/null
@@ -1,16551 +0,0 @@
-diff -Nur linux-3.15-rc5.orig/fs/Kconfig linux-3.15-rc5/fs/Kconfig
---- linux-3.15-rc5.orig/fs/Kconfig 2014-05-09 22:10:52.000000000 +0200
-+++ linux-3.15-rc5/fs/Kconfig 2014-05-17 01:53:17.000000000 +0200
-@@ -190,6 +190,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.15-rc5.orig/fs/Makefile linux-3.15-rc5/fs/Makefile
---- linux-3.15-rc5.orig/fs/Makefile 2014-05-09 22:10:52.000000000 +0200
-+++ linux-3.15-rc5/fs/Makefile 2014-05-17 01:53:25.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.15-rc5.orig/fs/yaffs2/Kconfig linux-3.15-rc5/fs/yaffs2/Kconfig
---- linux-3.15-rc5.orig/fs/yaffs2/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/Kconfig 2014-05-17 01:53:27.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.15-rc5.orig/fs/yaffs2/Makefile linux-3.15-rc5/fs/yaffs2/Makefile
---- linux-3.15-rc5.orig/fs/yaffs2/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/Makefile 2014-05-17 01:53:27.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.15-rc5.orig/fs/yaffs2/yaffs_allocator.c linux-3.15-rc5/fs/yaffs2/yaffs_allocator.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_allocator.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_allocator.c 2014-05-17 01:53:27.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.15-rc5.orig/fs/yaffs2/yaffs_allocator.h linux-3.15-rc5/fs/yaffs2/yaffs_allocator.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_allocator.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_allocator.h 2014-05-17 01:53:27.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.15-rc5.orig/fs/yaffs2/yaffs_attribs.c linux-3.15-rc5/fs/yaffs2/yaffs_attribs.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_attribs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_attribs.c 2014-05-17 01:53:27.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.15-rc5.orig/fs/yaffs2/yaffs_attribs.h linux-3.15-rc5/fs/yaffs2/yaffs_attribs.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_attribs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_attribs.h 2014-05-17 01:53:27.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.15-rc5.orig/fs/yaffs2/yaffs_bitmap.c linux-3.15-rc5/fs/yaffs2/yaffs_bitmap.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_bitmap.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_bitmap.c 2014-05-17 01:53:27.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.15-rc5.orig/fs/yaffs2/yaffs_bitmap.h linux-3.15-rc5/fs/yaffs2/yaffs_bitmap.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_bitmap.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_bitmap.h 2014-05-17 01:53:27.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.15-rc5.orig/fs/yaffs2/yaffs_checkptrw.c linux-3.15-rc5/fs/yaffs2/yaffs_checkptrw.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_checkptrw.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_checkptrw.c 2014-05-17 01:53:27.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;
-+ u32 sum;
-+ u32 xor;
-+} ;
-+
-+
-+static int apply_chunk_offset(struct yaffs_dev *dev, int chunk)
-+{
-+ return chunk - dev->chunk_offset;
-+}
-+
-+static int apply_block_offset(struct yaffs_dev *dev, int block)
-+{
-+ return block - dev->block_offset;
-+}
-+
-+static void yaffs2_checkpt_init_chunk_hdr(struct yaffs_dev *dev)
-+{
-+ struct yaffs_checkpt_chunk_hdr hdr;
-+
-+ hdr.version = YAFFS_CHECKPOINT_VERSION;
-+ hdr.seq = dev->checkpt_page_seq;
-+ hdr.sum = dev->checkpt_sum;
-+ hdr.xor = dev->checkpt_xor;
-+
-+ dev->checkpt_byte_offs = sizeof(hdr);
-+
-+ memcpy(dev->checkpt_buffer, &hdr, sizeof(hdr));
-+}
-+
-+static int yaffs2_checkpt_check_chunk_hdr(struct yaffs_dev *dev)
-+{
-+ struct yaffs_checkpt_chunk_hdr hdr;
-+
-+ memcpy(&hdr, dev->checkpt_buffer, sizeof(hdr));
-+
-+ dev->checkpt_byte_offs = sizeof(hdr);
-+
-+ return hdr.version == YAFFS_CHECKPOINT_VERSION &&
-+ hdr.seq == dev->checkpt_page_seq &&
-+ hdr.sum == dev->checkpt_sum &&
-+ hdr.xor == dev->checkpt_xor;
-+}
-+
-+static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
-+{
-+ int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "checkpt blocks_avail = %d", blocks_avail);
-+
-+ return (blocks_avail <= 0) ? 0 : 1;
-+}
-+
-+static int yaffs_checkpt_erase(struct yaffs_dev *dev)
-+{
-+ int i;
-+
-+ if (!dev->drv.drv_erase_fn)
-+ return 0;
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "checking blocks %d to %d",
-+ dev->internal_start_block, dev->internal_end_block);
-+
-+ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
-+ int offset_i = apply_block_offset(dev, i);
-+ int result;
-+
-+ if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "erasing checkpt block %d", i);
-+
-+ dev->n_erasures++;
-+
-+ result = dev->drv.drv_erase_fn(dev, offset_i);
-+ if(result) {
-+ bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
-+ dev->n_erased_blocks++;
-+ dev->n_free_chunks +=
-+ dev->param.chunks_per_block;
-+ } else {
-+ dev->drv.drv_mark_bad_fn(dev, offset_i);
-+ bi->block_state = YAFFS_BLOCK_STATE_DEAD;
-+ }
-+ }
-+ }
-+
-+ dev->blocks_in_checkpt = 0;
-+
-+ return 1;
-+}
-+
-+static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
-+{
-+ int i;
-+ int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "allocating checkpt block: erased %d reserved %d avail %d next %d ",
-+ dev->n_erased_blocks, dev->param.n_reserved_blocks,
-+ blocks_avail, dev->checkpt_next_block);
-+
-+ if (dev->checkpt_next_block >= 0 &&
-+ dev->checkpt_next_block <= dev->internal_end_block &&
-+ blocks_avail > 0) {
-+
-+ for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
-+ i++) {
-+ struct yaffs_block_info *bi;
-+
-+ bi = yaffs_get_block_info(dev, i);
-+ if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
-+ dev->checkpt_next_block = i + 1;
-+ dev->checkpt_cur_block = i;
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "allocating checkpt block %d", i);
-+ return;
-+ }
-+ }
-+ }
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT, "out of checkpt blocks");
-+
-+ dev->checkpt_next_block = -1;
-+ dev->checkpt_cur_block = -1;
-+}
-+
-+static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
-+{
-+ int i;
-+ struct yaffs_ext_tags tags;
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "find next checkpt block: start: blocks %d next %d",
-+ dev->blocks_in_checkpt, dev->checkpt_next_block);
-+
-+ if (dev->blocks_in_checkpt < dev->checkpt_max_blocks)
-+ for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
-+ i++) {
-+ int chunk = i * dev->param.chunks_per_block;
-+ enum yaffs_block_state state;
-+ u32 seq;
-+
-+ dev->tagger.read_chunk_tags_fn(dev,
-+ apply_chunk_offset(dev, chunk),
-+ NULL, &tags);
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "find next checkpt block: search: block %d state %d oid %d seq %d eccr %d",
-+ i, (int) state,
-+ tags.obj_id, tags.seq_number,
-+ tags.ecc_result);
-+
-+ if (tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+ continue;
-+
-+ dev->tagger.query_block_fn(dev,
-+ apply_block_offset(dev, i),
-+ &state, &seq);
-+ if (state == YAFFS_BLOCK_STATE_DEAD)
-+ continue;
-+
-+ /* Right kind of block */
-+ dev->checkpt_next_block = tags.obj_id;
-+ dev->checkpt_cur_block = i;
-+ dev->checkpt_block_list[dev->blocks_in_checkpt] = i;
-+ dev->blocks_in_checkpt++;
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "found checkpt block %d", i);
-+ return;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT, "found no more checkpt blocks");
-+
-+ dev->checkpt_next_block = -1;
-+ dev->checkpt_cur_block = -1;
-+}
-+
-+int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
-+{
-+ int i;
-+
-+ dev->checkpt_open_write = writing;
-+
-+ /* Got the functions we need? */
-+ if (!dev->tagger.write_chunk_tags_fn ||
-+ !dev->tagger.read_chunk_tags_fn ||
-+ !dev->drv.drv_erase_fn ||
-+ !dev->drv.drv_mark_bad_fn)
-+ return 0;
-+
-+ if (writing && !yaffs2_checkpt_space_ok(dev))
-+ return 0;
-+
-+ if (!dev->checkpt_buffer)
-+ dev->checkpt_buffer =
-+ kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
-+ if (!dev->checkpt_buffer)
-+ return 0;
-+
-+ dev->checkpt_page_seq = 0;
-+ dev->checkpt_byte_count = 0;
-+ dev->checkpt_sum = 0;
-+ dev->checkpt_xor = 0;
-+ dev->checkpt_cur_block = -1;
-+ dev->checkpt_cur_chunk = -1;
-+ dev->checkpt_next_block = dev->internal_start_block;
-+
-+ if (writing) {
-+ memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
-+ yaffs2_checkpt_init_chunk_hdr(dev);
-+ return yaffs_checkpt_erase(dev);
-+ }
-+
-+ /* Opening for a read */
-+ /* Set to a value that will kick off a read */
-+ dev->checkpt_byte_offs = dev->data_bytes_per_chunk;
-+ /* A checkpoint block list of 1 checkpoint block per 16 block is
-+ * (hopefully) going to be way more than we need */
-+ dev->blocks_in_checkpt = 0;
-+ dev->checkpt_max_blocks =
-+ (dev->internal_end_block - dev->internal_start_block) / 16 + 2;
-+ dev->checkpt_block_list =
-+ kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS);
-+
-+ if (!dev->checkpt_block_list)
-+ return 0;
-+
-+ for (i = 0; i < dev->checkpt_max_blocks; i++)
-+ dev->checkpt_block_list[i] = -1;
-+
-+ return 1;
-+}
-+
-+int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum)
-+{
-+ u32 composite_sum;
-+
-+ composite_sum = (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xff);
-+ *sum = composite_sum;
-+ return 1;
-+}
-+
-+static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
-+{
-+ int chunk;
-+ int offset_chunk;
-+ struct yaffs_ext_tags tags;
-+
-+ if (dev->checkpt_cur_block < 0) {
-+ yaffs2_checkpt_find_erased_block(dev);
-+ dev->checkpt_cur_chunk = 0;
-+ }
-+
-+ if (dev->checkpt_cur_block < 0)
-+ return 0;
-+
-+ tags.is_deleted = 0;
-+ tags.obj_id = dev->checkpt_next_block; /* Hint to next place to look */
-+ tags.chunk_id = dev->checkpt_page_seq + 1;
-+ tags.seq_number = YAFFS_SEQUENCE_CHECKPOINT_DATA;
-+ tags.n_bytes = dev->data_bytes_per_chunk;
-+ if (dev->checkpt_cur_chunk == 0) {
-+ /* First chunk we write for the block? Set block state to
-+ checkpoint */
-+ struct yaffs_block_info *bi =
-+ yaffs_get_block_info(dev, dev->checkpt_cur_block);
-+ bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+ dev->blocks_in_checkpt++;
-+ }
-+
-+ chunk =
-+ dev->checkpt_cur_block * dev->param.chunks_per_block +
-+ dev->checkpt_cur_chunk;
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "checkpoint wite buffer nand %d(%d:%d) objid %d chId %d",
-+ chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk,
-+ tags.obj_id, tags.chunk_id);
-+
-+ offset_chunk = apply_chunk_offset(dev, chunk);
-+
-+ dev->n_page_writes++;
-+
-+ dev->tagger.write_chunk_tags_fn(dev, offset_chunk,
-+ dev->checkpt_buffer, &tags);
-+ dev->checkpt_page_seq++;
-+ dev->checkpt_cur_chunk++;
-+ if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block) {
-+ dev->checkpt_cur_chunk = 0;
-+ dev->checkpt_cur_block = -1;
-+ }
-+ memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
-+
-+ yaffs2_checkpt_init_chunk_hdr(dev);
-+
-+
-+ return 1;
-+}
-+
-+int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
-+{
-+ int i = 0;
-+ int ok = 1;
-+ u8 *data_bytes = (u8 *) data;
-+
-+ if (!dev->checkpt_buffer)
-+ return 0;
-+
-+ if (!dev->checkpt_open_write)
-+ return -1;
-+
-+ while (i < n_bytes && ok) {
-+ dev->checkpt_buffer[dev->checkpt_byte_offs] = *data_bytes;
-+ dev->checkpt_sum += *data_bytes;
-+ dev->checkpt_xor ^= *data_bytes;
-+
-+ dev->checkpt_byte_offs++;
-+ i++;
-+ data_bytes++;
-+ dev->checkpt_byte_count++;
-+
-+ if (dev->checkpt_byte_offs < 0 ||
-+ dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
-+ ok = yaffs2_checkpt_flush_buffer(dev);
-+ }
-+
-+ return i;
-+}
-+
-+int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
-+{
-+ int i = 0;
-+ int ok = 1;
-+ struct yaffs_ext_tags tags;
-+ int chunk;
-+ int offset_chunk;
-+ u8 *data_bytes = (u8 *) data;
-+
-+ if (!dev->checkpt_buffer)
-+ return 0;
-+
-+ if (dev->checkpt_open_write)
-+ return -1;
-+
-+ while (i < n_bytes && ok) {
-+
-+ if (dev->checkpt_byte_offs < 0 ||
-+ dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
-+
-+ if (dev->checkpt_cur_block < 0) {
-+ yaffs2_checkpt_find_block(dev);
-+ dev->checkpt_cur_chunk = 0;
-+ }
-+
-+ if (dev->checkpt_cur_block < 0) {
-+ ok = 0;
-+ break;
-+ }
-+
-+ chunk = dev->checkpt_cur_block *
-+ dev->param.chunks_per_block +
-+ dev->checkpt_cur_chunk;
-+
-+ offset_chunk = apply_chunk_offset(dev, chunk);
-+ dev->n_page_reads++;
-+
-+ /* read in the next chunk */
-+ dev->tagger.read_chunk_tags_fn(dev,
-+ offset_chunk,
-+ dev->checkpt_buffer,
-+ &tags);
-+
-+ if (tags.chunk_id != (dev->checkpt_page_seq + 1) ||
-+ tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
-+ tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA) {
-+ ok = 0;
-+ break;
-+ }
-+ if(!yaffs2_checkpt_check_chunk_hdr(dev)) {
-+ ok = 0;
-+ break;
-+ }
-+
-+ dev->checkpt_page_seq++;
-+ dev->checkpt_cur_chunk++;
-+
-+ if (dev->checkpt_cur_chunk >=
-+ dev->param.chunks_per_block)
-+ dev->checkpt_cur_block = -1;
-+
-+ }
-+
-+ *data_bytes = dev->checkpt_buffer[dev->checkpt_byte_offs];
-+ dev->checkpt_sum += *data_bytes;
-+ dev->checkpt_xor ^= *data_bytes;
-+ dev->checkpt_byte_offs++;
-+ i++;
-+ data_bytes++;
-+ dev->checkpt_byte_count++;
-+ }
-+
-+ return i;
-+}
-+
-+int yaffs_checkpt_close(struct yaffs_dev *dev)
-+{
-+ int i;
-+
-+ if (dev->checkpt_open_write) {
-+ if (dev->checkpt_byte_offs !=
-+ sizeof(sizeof(struct yaffs_checkpt_chunk_hdr)))
-+ yaffs2_checkpt_flush_buffer(dev);
-+ } else if (dev->checkpt_block_list) {
-+ for (i = 0;
-+ i < dev->blocks_in_checkpt &&
-+ dev->checkpt_block_list[i] >= 0; i++) {
-+ int blk = dev->checkpt_block_list[i];
-+ struct yaffs_block_info *bi = NULL;
-+
-+ if (dev->internal_start_block <= blk &&
-+ blk <= dev->internal_end_block)
-+ bi = yaffs_get_block_info(dev, blk);
-+ if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
-+ bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+ }
-+ kfree(dev->checkpt_block_list);
-+ dev->checkpt_block_list = NULL;
-+ }
-+
-+ dev->n_free_chunks -=
-+ dev->blocks_in_checkpt * dev->param.chunks_per_block;
-+ dev->n_erased_blocks -= dev->blocks_in_checkpt;
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT, "checkpoint byte count %d",
-+ dev->checkpt_byte_count);
-+
-+ if (dev->checkpt_buffer) {
-+ /* free the buffer */
-+ kfree(dev->checkpt_buffer);
-+ dev->checkpt_buffer = NULL;
-+ return 1;
-+ } else {
-+ return 0;
-+ }
-+}
-+
-+int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)
-+{
-+ /* Erase the checkpoint data */
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "checkpoint invalidate of %d blocks",
-+ dev->blocks_in_checkpt);
-+
-+ return yaffs_checkpt_erase(dev);
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_checkptrw.h linux-3.15-rc5/fs/yaffs2/yaffs_checkptrw.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_checkptrw.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_checkptrw.h 2014-05-17 01:53:27.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.
-+ */
-+
-+#ifndef __YAFFS_CHECKPTRW_H__
-+#define __YAFFS_CHECKPTRW_H__
-+
-+#include "yaffs_guts.h"
-+
-+int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing);
-+
-+int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes);
-+
-+int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes);
-+
-+int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum);
-+
-+int yaffs_checkpt_close(struct yaffs_dev *dev);
-+
-+int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev);
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_ecc.c linux-3.15-rc5/fs/yaffs2/yaffs_ecc.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_ecc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_ecc.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,281 @@
-+/*
-+ * 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.
-+ */
-+
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two
-+ * such ECC blocks are used on a 512-byte NAND page.
-+ *
-+ */
-+
-+#include "yportenv.h"
-+
-+#include "yaffs_ecc.h"
-+
-+/* Table generated by gen-ecc.c
-+ * Using a table means we do not have to calculate p1..p4 and p1'..p4'
-+ * for each byte of data. These are instead provided in a table in bits7..2.
-+ * Bit 0 of each entry indicates whether the entry has an odd or even parity,
-+ * and therefore this bytes influence on the line parity.
-+ */
-+
-+static const unsigned char column_parity_table[] = {
-+ 0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
-+ 0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
-+ 0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
-+ 0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
-+ 0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
-+ 0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
-+ 0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
-+ 0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
-+ 0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
-+ 0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
-+ 0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
-+ 0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
-+ 0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
-+ 0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
-+ 0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
-+ 0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
-+ 0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
-+ 0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
-+ 0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
-+ 0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
-+ 0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
-+ 0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
-+ 0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
-+ 0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
-+ 0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
-+ 0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
-+ 0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
-+ 0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
-+ 0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
-+ 0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
-+ 0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
-+ 0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
-+};
-+
-+
-+/* Calculate the ECC for a 256-byte block of data */
-+void yaffs_ecc_calc(const unsigned char *data, unsigned char *ecc)
-+{
-+ unsigned int i;
-+ unsigned char col_parity = 0;
-+ unsigned char line_parity = 0;
-+ unsigned char line_parity_prime = 0;
-+ unsigned char t;
-+ unsigned char b;
-+
-+ for (i = 0; i < 256; i++) {
-+ b = column_parity_table[*data++];
-+ col_parity ^= b;
-+
-+ if (b & 0x01) { /* odd number of bits in the byte */
-+ line_parity ^= i;
-+ line_parity_prime ^= ~i;
-+ }
-+ }
-+
-+ ecc[2] = (~col_parity) | 0x03;
-+
-+ t = 0;
-+ if (line_parity & 0x80)
-+ t |= 0x80;
-+ if (line_parity_prime & 0x80)
-+ t |= 0x40;
-+ if (line_parity & 0x40)
-+ t |= 0x20;
-+ if (line_parity_prime & 0x40)
-+ t |= 0x10;
-+ if (line_parity & 0x20)
-+ t |= 0x08;
-+ if (line_parity_prime & 0x20)
-+ t |= 0x04;
-+ if (line_parity & 0x10)
-+ t |= 0x02;
-+ if (line_parity_prime & 0x10)
-+ t |= 0x01;
-+ ecc[1] = ~t;
-+
-+ t = 0;
-+ if (line_parity & 0x08)
-+ t |= 0x80;
-+ if (line_parity_prime & 0x08)
-+ t |= 0x40;
-+ if (line_parity & 0x04)
-+ t |= 0x20;
-+ if (line_parity_prime & 0x04)
-+ t |= 0x10;
-+ if (line_parity & 0x02)
-+ t |= 0x08;
-+ if (line_parity_prime & 0x02)
-+ t |= 0x04;
-+ if (line_parity & 0x01)
-+ t |= 0x02;
-+ if (line_parity_prime & 0x01)
-+ t |= 0x01;
-+ ecc[0] = ~t;
-+
-+}
-+
-+/* Correct the ECC on a 256 byte block of data */
-+
-+int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
-+ const unsigned char *test_ecc)
-+{
-+ unsigned char d0, d1, d2; /* deltas */
-+
-+ d0 = read_ecc[0] ^ test_ecc[0];
-+ d1 = read_ecc[1] ^ test_ecc[1];
-+ d2 = read_ecc[2] ^ test_ecc[2];
-+
-+ if ((d0 | d1 | d2) == 0)
-+ return 0; /* no error */
-+
-+ if (((d0 ^ (d0 >> 1)) & 0x55) == 0x55 &&
-+ ((d1 ^ (d1 >> 1)) & 0x55) == 0x55 &&
-+ ((d2 ^ (d2 >> 1)) & 0x54) == 0x54) {
-+ /* Single bit (recoverable) error in data */
-+
-+ unsigned byte;
-+ unsigned bit;
-+
-+ bit = byte = 0;
-+
-+ if (d1 & 0x80)
-+ byte |= 0x80;
-+ if (d1 & 0x20)
-+ byte |= 0x40;
-+ if (d1 & 0x08)
-+ byte |= 0x20;
-+ if (d1 & 0x02)
-+ byte |= 0x10;
-+ if (d0 & 0x80)
-+ byte |= 0x08;
-+ if (d0 & 0x20)
-+ byte |= 0x04;
-+ if (d0 & 0x08)
-+ byte |= 0x02;
-+ if (d0 & 0x02)
-+ byte |= 0x01;
-+
-+ if (d2 & 0x80)
-+ bit |= 0x04;
-+ if (d2 & 0x20)
-+ bit |= 0x02;
-+ if (d2 & 0x08)
-+ bit |= 0x01;
-+
-+ data[byte] ^= (1 << bit);
-+
-+ return 1; /* Corrected the error */
-+ }
-+
-+ if ((hweight8(d0) + hweight8(d1) + hweight8(d2)) == 1) {
-+ /* Reccoverable error in ecc */
-+
-+ read_ecc[0] = test_ecc[0];
-+ read_ecc[1] = test_ecc[1];
-+ read_ecc[2] = test_ecc[2];
-+
-+ return 1; /* Corrected the error */
-+ }
-+
-+ /* Unrecoverable error */
-+
-+ return -1;
-+
-+}
-+
-+/*
-+ * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-+ */
-+void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
-+ struct yaffs_ecc_other *ecc_other)
-+{
-+ unsigned int i;
-+ unsigned char col_parity = 0;
-+ unsigned line_parity = 0;
-+ unsigned line_parity_prime = 0;
-+ unsigned char b;
-+
-+ for (i = 0; i < n_bytes; i++) {
-+ b = column_parity_table[*data++];
-+ col_parity ^= b;
-+
-+ if (b & 0x01) {
-+ /* odd number of bits in the byte */
-+ line_parity ^= i;
-+ line_parity_prime ^= ~i;
-+ }
-+
-+ }
-+
-+ ecc_other->col_parity = (col_parity >> 2) & 0x3f;
-+ ecc_other->line_parity = line_parity;
-+ ecc_other->line_parity_prime = line_parity_prime;
-+}
-+
-+int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
-+ struct yaffs_ecc_other *read_ecc,
-+ const struct yaffs_ecc_other *test_ecc)
-+{
-+ unsigned char delta_col; /* column parity delta */
-+ unsigned delta_line; /* line parity delta */
-+ unsigned delta_line_prime; /* line parity delta */
-+ unsigned bit;
-+
-+ delta_col = read_ecc->col_parity ^ test_ecc->col_parity;
-+ delta_line = read_ecc->line_parity ^ test_ecc->line_parity;
-+ delta_line_prime =
-+ read_ecc->line_parity_prime ^ test_ecc->line_parity_prime;
-+
-+ if ((delta_col | delta_line | delta_line_prime) == 0)
-+ return 0; /* no error */
-+
-+ if (delta_line == ~delta_line_prime &&
-+ (((delta_col ^ (delta_col >> 1)) & 0x15) == 0x15)) {
-+ /* Single bit (recoverable) error in data */
-+
-+ bit = 0;
-+
-+ if (delta_col & 0x20)
-+ bit |= 0x04;
-+ if (delta_col & 0x08)
-+ bit |= 0x02;
-+ if (delta_col & 0x02)
-+ bit |= 0x01;
-+
-+ if (delta_line >= n_bytes)
-+ return -1;
-+
-+ data[delta_line] ^= (1 << bit);
-+
-+ return 1; /* corrected */
-+ }
-+
-+ if ((hweight32(delta_line) +
-+ hweight32(delta_line_prime) +
-+ hweight8(delta_col)) == 1) {
-+ /* Reccoverable error in ecc */
-+
-+ *read_ecc = *test_ecc;
-+ return 1; /* corrected */
-+ }
-+
-+ /* Unrecoverable error */
-+
-+ return -1;
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_ecc.h linux-3.15-rc5/fs/yaffs2/yaffs_ecc.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_ecc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_ecc.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,44 @@
-+/*
-+ * 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.
-+ */
-+
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data.
-+ * Thus, two such ECC blocks are used on a 512-byte NAND page.
-+ *
-+ */
-+
-+#ifndef __YAFFS_ECC_H__
-+#define __YAFFS_ECC_H__
-+
-+struct yaffs_ecc_other {
-+ unsigned char col_parity;
-+ unsigned line_parity;
-+ unsigned line_parity_prime;
-+};
-+
-+void yaffs_ecc_calc(const unsigned char *data, unsigned char *ecc);
-+int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
-+ const unsigned char *test_ecc);
-+
-+void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
-+ struct yaffs_ecc_other *ecc);
-+int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
-+ struct yaffs_ecc_other *read_ecc,
-+ const struct yaffs_ecc_other *test_ecc);
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_getblockinfo.h linux-3.15-rc5/fs/yaffs2/yaffs_getblockinfo.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_getblockinfo.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_getblockinfo.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,35 @@
-+/*
-+ * 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_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+#include "yaffs_trace.h"
-+
-+/* Function to manipulate block info */
-+static inline struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
-+ *dev, int blk)
-+{
-+ if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "**>> yaffs: get_block_info block %d is not valid",
-+ blk);
-+ BUG();
-+ }
-+ return &dev->block_info[blk - dev->internal_start_block];
-+}
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_guts.c linux-3.15-rc5/fs/yaffs2/yaffs_guts.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_guts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_guts.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,5146 @@
-+/*
-+ * 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 "yportenv.h"
-+#include "yaffs_trace.h"
-+
-+#include "yaffs_guts.h"
-+#include "yaffs_getblockinfo.h"
-+#include "yaffs_tagscompat.h"
-+#include "yaffs_tagsmarshall.h"
-+#include "yaffs_nand.h"
-+#include "yaffs_yaffs1.h"
-+#include "yaffs_yaffs2.h"
-+#include "yaffs_bitmap.h"
-+#include "yaffs_verify.h"
-+#include "yaffs_nand.h"
-+#include "yaffs_packedtags2.h"
-+#include "yaffs_nameval.h"
-+#include "yaffs_allocator.h"
-+#include "yaffs_attribs.h"
-+#include "yaffs_summary.h"
-+
-+/* Note YAFFS_GC_GOOD_ENOUGH must be <= YAFFS_GC_PASSIVE_THRESHOLD */
-+#define YAFFS_GC_GOOD_ENOUGH 2
-+#define YAFFS_GC_PASSIVE_THRESHOLD 4
-+
-+#include "yaffs_ecc.h"
-+
-+/* Forward declarations */
-+
-+static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
-+ const u8 *buffer, int n_bytes, int use_reserve);
-+
-+static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name,
-+ int buffer_size);
-+
-+/* Function to calculate chunk and offset */
-+
-+void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
-+ int *chunk_out, u32 *offset_out)
-+{
-+ int chunk;
-+ u32 offset;
-+
-+ chunk = (u32) (addr >> dev->chunk_shift);
-+
-+ if (dev->chunk_div == 1) {
-+ /* easy power of 2 case */
-+ offset = (u32) (addr & dev->chunk_mask);
-+ } else {
-+ /* Non power-of-2 case */
-+
-+ loff_t chunk_base;
-+
-+ chunk /= dev->chunk_div;
-+
-+ chunk_base = ((loff_t) chunk) * dev->data_bytes_per_chunk;
-+ offset = (u32) (addr - chunk_base);
-+ }
-+
-+ *chunk_out = chunk;
-+ *offset_out = offset;
-+}
-+
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-+ * Note we don't try to cater for all possible numbers and this does not have to
-+ * be hellishly efficient.
-+ */
-+
-+static inline u32 calc_shifts_ceiling(u32 x)
-+{
-+ int extra_bits;
-+ int shifts;
-+
-+ shifts = extra_bits = 0;
-+
-+ while (x > 1) {
-+ if (x & 1)
-+ extra_bits++;
-+ x >>= 1;
-+ shifts++;
-+ }
-+
-+ if (extra_bits)
-+ shifts++;
-+
-+ return shifts;
-+}
-+
-+/* Function to return the number of shifts to get a 1 in bit 0
-+ */
-+
-+static inline u32 calc_shifts(u32 x)
-+{
-+ u32 shifts;
-+
-+ shifts = 0;
-+
-+ if (!x)
-+ return 0;
-+
-+ while (!(x & 1)) {
-+ x >>= 1;
-+ shifts++;
-+ }
-+
-+ return shifts;
-+}
-+
-+/*
-+ * Temporary buffer manipulations.
-+ */
-+
-+static int yaffs_init_tmp_buffers(struct yaffs_dev *dev)
-+{
-+ int i;
-+ u8 *buf = (u8 *) 1;
-+
-+ memset(dev->temp_buffer, 0, sizeof(dev->temp_buffer));
-+
-+ for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
-+ dev->temp_buffer[i].in_use = 0;
-+ buf = kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
-+ dev->temp_buffer[i].buffer = buf;
-+ }
-+
-+ return buf ? YAFFS_OK : YAFFS_FAIL;
-+}
-+
-+u8 *yaffs_get_temp_buffer(struct yaffs_dev * dev)
-+{
-+ int i;
-+
-+ dev->temp_in_use++;
-+ if (dev->temp_in_use > dev->max_temp)
-+ dev->max_temp = dev->temp_in_use;
-+
-+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+ if (dev->temp_buffer[i].in_use == 0) {
-+ dev->temp_buffer[i].in_use = 1;
-+ return dev->temp_buffer[i].buffer;
-+ }
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_BUFFERS, "Out of temp buffers");
-+ /*
-+ * If we got here then we have to allocate an unmanaged one
-+ * This is not good.
-+ */
-+
-+ dev->unmanaged_buffer_allocs++;
-+ return kmalloc(dev->data_bytes_per_chunk, GFP_NOFS);
-+
-+}
-+
-+void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 *buffer)
-+{
-+ int i;
-+
-+ dev->temp_in_use--;
-+
-+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+ if (dev->temp_buffer[i].buffer == buffer) {
-+ dev->temp_buffer[i].in_use = 0;
-+ return;
-+ }
-+ }
-+
-+ if (buffer) {
-+ /* assume it is an unmanaged one. */
-+ yaffs_trace(YAFFS_TRACE_BUFFERS,
-+ "Releasing unmanaged temp buffer");
-+ kfree(buffer);
-+ dev->unmanaged_buffer_deallocs++;
-+ }
-+
-+}
-+
-+/*
-+ * Functions for robustisizing TODO
-+ *
-+ */
-+
-+static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk,
-+ const u8 *data,
-+ const struct yaffs_ext_tags *tags)
-+{
-+ (void) dev;
-+ (void) nand_chunk;
-+ (void) data;
-+ (void) tags;
-+}
-+
-+static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
-+ const struct yaffs_ext_tags *tags)
-+{
-+ (void) dev;
-+ (void) nand_chunk;
-+ (void) tags;
-+}
-+
-+void yaffs_handle_chunk_error(struct yaffs_dev *dev,
-+ struct yaffs_block_info *bi)
-+{
-+ if (!bi->gc_prioritise) {
-+ bi->gc_prioritise = 1;
-+ dev->has_pending_prioritised_gc = 1;
-+ bi->chunk_error_strikes++;
-+
-+ if (bi->chunk_error_strikes > 3) {
-+ bi->needs_retiring = 1; /* Too many stikes, so retire */
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs: Block struck out");
-+
-+ }
-+ }
-+}
-+
-+static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk,
-+ int erased_ok)
-+{
-+ int flash_block = nand_chunk / dev->param.chunks_per_block;
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block);
-+
-+ yaffs_handle_chunk_error(dev, bi);
-+
-+ if (erased_ok) {
-+ /* Was an actual write failure,
-+ * so mark the block for retirement.*/
-+ bi->needs_retiring = 1;
-+ yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-+ "**>> Block %d needs retiring", flash_block);
-+ }
-+
-+ /* Delete the chunk */
-+ yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
-+ yaffs_skip_rest_of_block(dev);
-+}
-+
-+/*
-+ * Verification code
-+ */
-+
-+/*
-+ * Simple hash function. Needs to have a reasonable spread
-+ */
-+
-+static inline int yaffs_hash_fn(int n)
-+{
-+ if (n < 0)
-+ n = -n;
-+ return n % YAFFS_NOBJECT_BUCKETS;
-+}
-+
-+/*
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-+ */
-+
-+struct yaffs_obj *yaffs_root(struct yaffs_dev *dev)
-+{
-+ return dev->root_dir;
-+}
-+
-+struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev)
-+{
-+ return dev->lost_n_found;
-+}
-+
-+/*
-+ * Erased NAND checking functions
-+ */
-+
-+int yaffs_check_ff(u8 *buffer, int n_bytes)
-+{
-+ /* Horrible, slow implementation */
-+ while (n_bytes--) {
-+ if (*buffer != 0xff)
-+ return 0;
-+ buffer++;
-+ }
-+ return 1;
-+}
-+
-+static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk)
-+{
-+ int retval = YAFFS_OK;
-+ u8 *data = yaffs_get_temp_buffer(dev);
-+ struct yaffs_ext_tags tags;
-+ int result;
-+
-+ result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, data, &tags);
-+
-+ if (tags.ecc_result > YAFFS_ECC_RESULT_NO_ERROR)
-+ retval = YAFFS_FAIL;
-+
-+ if (!yaffs_check_ff(data, dev->data_bytes_per_chunk) ||
-+ tags.chunk_used) {
-+ yaffs_trace(YAFFS_TRACE_NANDACCESS,
-+ "Chunk %d not erased", nand_chunk);
-+ retval = YAFFS_FAIL;
-+ }
-+
-+ yaffs_release_temp_buffer(dev, data);
-+
-+ return retval;
-+
-+}
-+
-+static int yaffs_verify_chunk_written(struct yaffs_dev *dev,
-+ int nand_chunk,
-+ const u8 *data,
-+ struct yaffs_ext_tags *tags)
-+{
-+ int retval = YAFFS_OK;
-+ struct yaffs_ext_tags temp_tags;
-+ u8 *buffer = yaffs_get_temp_buffer(dev);
-+ int result;
-+
-+ result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, buffer, &temp_tags);
-+ if (memcmp(buffer, data, dev->data_bytes_per_chunk) ||
-+ temp_tags.obj_id != tags->obj_id ||
-+ temp_tags.chunk_id != tags->chunk_id ||
-+ temp_tags.n_bytes != tags->n_bytes)
-+ retval = YAFFS_FAIL;
-+
-+ yaffs_release_temp_buffer(dev, buffer);
-+
-+ return retval;
-+}
-+
-+
-+int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks)
-+{
-+ int reserved_chunks;
-+ int reserved_blocks = dev->param.n_reserved_blocks;
-+ int checkpt_blocks;
-+
-+ checkpt_blocks = yaffs_calc_checkpt_blocks_required(dev);
-+
-+ reserved_chunks =
-+ (reserved_blocks + checkpt_blocks) * dev->param.chunks_per_block;
-+
-+ return (dev->n_free_chunks > (reserved_chunks + n_chunks));
-+}
-+
-+static int yaffs_find_alloc_block(struct yaffs_dev *dev)
-+{
-+ int i;
-+ struct yaffs_block_info *bi;
-+
-+ if (dev->n_erased_blocks < 1) {
-+ /* Hoosterman we've got a problem.
-+ * Can't get space to gc
-+ */
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs tragedy: no more erased blocks");
-+
-+ return -1;
-+ }
-+
-+ /* Find an empty block. */
-+
-+ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-+ dev->alloc_block_finder++;
-+ if (dev->alloc_block_finder < dev->internal_start_block
-+ || dev->alloc_block_finder > dev->internal_end_block) {
-+ dev->alloc_block_finder = dev->internal_start_block;
-+ }
-+
-+ bi = yaffs_get_block_info(dev, dev->alloc_block_finder);
-+
-+ if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
-+ bi->block_state = YAFFS_BLOCK_STATE_ALLOCATING;
-+ dev->seq_number++;
-+ bi->seq_number = dev->seq_number;
-+ dev->n_erased_blocks--;
-+ yaffs_trace(YAFFS_TRACE_ALLOCATE,
-+ "Allocated block %d, seq %d, %d left" ,
-+ dev->alloc_block_finder, dev->seq_number,
-+ dev->n_erased_blocks);
-+ return dev->alloc_block_finder;
-+ }
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs tragedy: no more erased blocks, but there should have been %d",
-+ dev->n_erased_blocks);
-+
-+ return -1;
-+}
-+
-+static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver,
-+ struct yaffs_block_info **block_ptr)
-+{
-+ int ret_val;
-+ struct yaffs_block_info *bi;
-+
-+ if (dev->alloc_block < 0) {
-+ /* Get next block to allocate off */
-+ dev->alloc_block = yaffs_find_alloc_block(dev);
-+ dev->alloc_page = 0;
-+ }
-+
-+ if (!use_reserver && !yaffs_check_alloc_available(dev, 1)) {
-+ /* No space unless we're allowed to use the reserve. */
-+ return -1;
-+ }
-+
-+ if (dev->n_erased_blocks < dev->param.n_reserved_blocks
-+ && dev->alloc_page == 0)
-+ yaffs_trace(YAFFS_TRACE_ALLOCATE, "Allocating reserve");
-+
-+ /* Next page please.... */
-+ if (dev->alloc_block >= 0) {
-+ bi = yaffs_get_block_info(dev, dev->alloc_block);
-+
-+ ret_val = (dev->alloc_block * dev->param.chunks_per_block) +
-+ dev->alloc_page;
-+ bi->pages_in_use++;
-+ yaffs_set_chunk_bit(dev, dev->alloc_block, dev->alloc_page);
-+
-+ dev->alloc_page++;
-+
-+ dev->n_free_chunks--;
-+
-+ /* If the block is full set the state to full */
-+ if (dev->alloc_page >= dev->param.chunks_per_block) {
-+ bi->block_state = YAFFS_BLOCK_STATE_FULL;
-+ dev->alloc_block = -1;
-+ }
-+
-+ if (block_ptr)
-+ *block_ptr = bi;
-+
-+ return ret_val;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!");
-+
-+ return -1;
-+}
-+
-+static int yaffs_get_erased_chunks(struct yaffs_dev *dev)
-+{
-+ int n;
-+
-+ n = dev->n_erased_blocks * dev->param.chunks_per_block;
-+
-+ if (dev->alloc_block > 0)
-+ n += (dev->param.chunks_per_block - dev->alloc_page);
-+
-+ return n;
-+
-+}
-+
-+/*
-+ * yaffs_skip_rest_of_block() skips over the rest of the allocation block
-+ * if we don't want to write to it.
-+ */
-+void yaffs_skip_rest_of_block(struct yaffs_dev *dev)
-+{
-+ struct yaffs_block_info *bi;
-+
-+ if (dev->alloc_block > 0) {
-+ bi = yaffs_get_block_info(dev, dev->alloc_block);
-+ if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING) {
-+ bi->block_state = YAFFS_BLOCK_STATE_FULL;
-+ dev->alloc_block = -1;
-+ }
-+ }
-+}
-+
-+static int yaffs_write_new_chunk(struct yaffs_dev *dev,
-+ const u8 *data,
-+ struct yaffs_ext_tags *tags, int use_reserver)
-+{
-+ int attempts = 0;
-+ int write_ok = 0;
-+ int chunk;
-+
-+ yaffs2_checkpt_invalidate(dev);
-+
-+ do {
-+ struct yaffs_block_info *bi = 0;
-+ int erased_ok = 0;
-+
-+ chunk = yaffs_alloc_chunk(dev, use_reserver, &bi);
-+ if (chunk < 0) {
-+ /* no space */
-+ break;
-+ }
-+
-+ /* First check this chunk is erased, if it needs
-+ * checking. The checking policy (unless forced
-+ * always on) is as follows:
-+ *
-+ * Check the first page we try to write in a block.
-+ * If the check passes then we don't need to check any
-+ * more. If the check fails, we check again...
-+ * If the block has been erased, we don't need to check.
-+ *
-+ * However, if the block has been prioritised for gc,
-+ * then we think there might be something odd about
-+ * this block and stop using it.
-+ *
-+ * Rationale: We should only ever see chunks that have
-+ * not been erased if there was a partially written
-+ * chunk due to power loss. This checking policy should
-+ * catch that case with very few checks and thus save a
-+ * lot of checks that are most likely not needed.
-+ *
-+ * Mods to the above
-+ * If an erase check fails or the write fails we skip the
-+ * rest of the block.
-+ */
-+
-+ /* let's give it a try */
-+ attempts++;
-+
-+ if (dev->param.always_check_erased)
-+ bi->skip_erased_check = 0;
-+
-+ if (!bi->skip_erased_check) {
-+ erased_ok = yaffs_check_chunk_erased(dev, chunk);
-+ if (erased_ok != YAFFS_OK) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "**>> yaffs chunk %d was not erased",
-+ chunk);
-+
-+ /* If not erased, delete this one,
-+ * skip rest of block and
-+ * try another chunk */
-+ yaffs_chunk_del(dev, chunk, 1, __LINE__);
-+ yaffs_skip_rest_of_block(dev);
-+ continue;
-+ }
-+ }
-+
-+ write_ok = yaffs_wr_chunk_tags_nand(dev, chunk, data, tags);
-+
-+ if (!bi->skip_erased_check)
-+ write_ok =
-+ yaffs_verify_chunk_written(dev, chunk, data, tags);
-+
-+ if (write_ok != YAFFS_OK) {
-+ /* Clean up aborted write, skip to next block and
-+ * try another chunk */
-+ yaffs_handle_chunk_wr_error(dev, chunk, erased_ok);
-+ continue;
-+ }
-+
-+ bi->skip_erased_check = 1;
-+
-+ /* Copy the data into the robustification buffer */
-+ yaffs_handle_chunk_wr_ok(dev, chunk, data, tags);
-+
-+ } while (write_ok != YAFFS_OK &&
-+ (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+ if (!write_ok)
-+ chunk = -1;
-+
-+ if (attempts > 1) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "**>> yaffs write required %d attempts",
-+ attempts);
-+ dev->n_retried_writes += (attempts - 1);
-+ }
-+
-+ return chunk;
-+}
-+
-+/*
-+ * Block retiring for handling a broken block.
-+ */
-+
-+static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block)
-+{
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block);
-+
-+ yaffs2_checkpt_invalidate(dev);
-+
-+ yaffs2_clear_oldest_dirty_seq(dev, bi);
-+
-+ if (yaffs_mark_bad(dev, flash_block) != YAFFS_OK) {
-+ if (yaffs_erase_block(dev, flash_block) != YAFFS_OK) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs: Failed to mark bad and erase block %d",
-+ flash_block);
-+ } else {
-+ struct yaffs_ext_tags tags;
-+ int chunk_id =
-+ flash_block * dev->param.chunks_per_block;
-+
-+ u8 *buffer = yaffs_get_temp_buffer(dev);
-+
-+ memset(buffer, 0xff, dev->data_bytes_per_chunk);
-+ memset(&tags, 0, sizeof(tags));
-+ tags.seq_number = YAFFS_SEQUENCE_BAD_BLOCK;
-+ if (dev->tagger.write_chunk_tags_fn(dev, chunk_id -
-+ dev->chunk_offset,
-+ buffer,
-+ &tags) != YAFFS_OK)
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs: Failed to write bad block marker to block %d",
-+ flash_block);
-+
-+ yaffs_release_temp_buffer(dev, buffer);
-+ }
-+ }
-+
-+ bi->block_state = YAFFS_BLOCK_STATE_DEAD;
-+ bi->gc_prioritise = 0;
-+ bi->needs_retiring = 0;
-+
-+ dev->n_retired_blocks++;
-+}
-+
-+/*---------------- Name handling functions ------------*/
-+
-+static u16 yaffs_calc_name_sum(const YCHAR *name)
-+{
-+ u16 sum = 0;
-+ u16 i = 1;
-+
-+ if (!name)
-+ return 0;
-+
-+ while ((*name) && i < (YAFFS_MAX_NAME_LENGTH / 2)) {
-+
-+ /* 0x1f mask is case insensitive */
-+ sum += ((*name) & 0x1f) * i;
-+ i++;
-+ name++;
-+ }
-+ return sum;
-+}
-+
-+
-+void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
-+{
-+ memset(obj->short_name, 0, sizeof(obj->short_name));
-+
-+ if (name && !name[0]) {
-+ yaffs_fix_null_name(obj, obj->short_name,
-+ YAFFS_SHORT_NAME_LENGTH);
-+ name = obj->short_name;
-+ } else if (name &&
-+ strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <=
-+ YAFFS_SHORT_NAME_LENGTH) {
-+ strcpy(obj->short_name, name);
-+ }
-+
-+ obj->sum = yaffs_calc_name_sum(name);
-+}
-+
-+void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
-+ const struct yaffs_obj_hdr *oh)
-+{
-+#ifdef CONFIG_YAFFS_AUTO_UNICODE
-+ YCHAR tmp_name[YAFFS_MAX_NAME_LENGTH + 1];
-+ memset(tmp_name, 0, sizeof(tmp_name));
-+ yaffs_load_name_from_oh(obj->my_dev, tmp_name, oh->name,
-+ YAFFS_MAX_NAME_LENGTH + 1);
-+ yaffs_set_obj_name(obj, tmp_name);
-+#else
-+ yaffs_set_obj_name(obj, oh->name);
-+#endif
-+}
-+
-+loff_t yaffs_max_file_size(struct yaffs_dev *dev)
-+{
-+ if(sizeof(loff_t) < 8)
-+ return YAFFS_MAX_FILE_SIZE_32;
-+ else
-+ return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk;
-+}
-+
-+/*-------------------- TNODES -------------------
-+
-+ * List of spare tnodes
-+ * The list is hooked together using the first pointer
-+ * in the tnode.
-+ */
-+
-+struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev)
-+{
-+ struct yaffs_tnode *tn = yaffs_alloc_raw_tnode(dev);
-+
-+ if (tn) {
-+ memset(tn, 0, dev->tnode_size);
-+ dev->n_tnodes++;
-+ }
-+
-+ dev->checkpoint_blocks_required = 0; /* force recalculation */
-+
-+ return tn;
-+}
-+
-+/* FreeTnode frees up a tnode and puts it back on the free list */
-+static void yaffs_free_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
-+{
-+ yaffs_free_raw_tnode(dev, tn);
-+ dev->n_tnodes--;
-+ dev->checkpoint_blocks_required = 0; /* force recalculation */
-+}
-+
-+static void yaffs_deinit_tnodes_and_objs(struct yaffs_dev *dev)
-+{
-+ yaffs_deinit_raw_tnodes_and_objs(dev);
-+ dev->n_obj = 0;
-+ dev->n_tnodes = 0;
-+}
-+
-+static void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn,
-+ unsigned pos, unsigned val)
-+{
-+ u32 *map = (u32 *) tn;
-+ u32 bit_in_map;
-+ u32 bit_in_word;
-+ u32 word_in_map;
-+ u32 mask;
-+
-+ pos &= YAFFS_TNODES_LEVEL0_MASK;
-+ val >>= dev->chunk_grp_bits;
-+
-+ bit_in_map = pos * dev->tnode_width;
-+ word_in_map = bit_in_map / 32;
-+ bit_in_word = bit_in_map & (32 - 1);
-+
-+ mask = dev->tnode_mask << bit_in_word;
-+
-+ map[word_in_map] &= ~mask;
-+ map[word_in_map] |= (mask & (val << bit_in_word));
-+
-+ if (dev->tnode_width > (32 - bit_in_word)) {
-+ bit_in_word = (32 - bit_in_word);
-+ word_in_map++;
-+ mask =
-+ dev->tnode_mask >> bit_in_word;
-+ map[word_in_map] &= ~mask;
-+ map[word_in_map] |= (mask & (val >> bit_in_word));
-+ }
-+}
-+
-+u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
-+ unsigned pos)
-+{
-+ u32 *map = (u32 *) tn;
-+ u32 bit_in_map;
-+ u32 bit_in_word;
-+ u32 word_in_map;
-+ u32 val;
-+
-+ pos &= YAFFS_TNODES_LEVEL0_MASK;
-+
-+ bit_in_map = pos * dev->tnode_width;
-+ word_in_map = bit_in_map / 32;
-+ bit_in_word = bit_in_map & (32 - 1);
-+
-+ val = map[word_in_map] >> bit_in_word;
-+
-+ if (dev->tnode_width > (32 - bit_in_word)) {
-+ bit_in_word = (32 - bit_in_word);
-+ word_in_map++;
-+ val |= (map[word_in_map] << bit_in_word);
-+ }
-+
-+ val &= dev->tnode_mask;
-+ val <<= dev->chunk_grp_bits;
-+
-+ return val;
-+}
-+
-+/* ------------------- End of individual tnode manipulation -----------------*/
-+
-+/* ---------Functions to manipulate the look-up tree (made up of tnodes) ------
-+ * The look up tree is represented by the top tnode and the number of top_level
-+ * in the tree. 0 means only the level 0 tnode is in the tree.
-+ */
-+
-+/* FindLevel0Tnode finds the level 0 tnode, if one exists. */
-+struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
-+ struct yaffs_file_var *file_struct,
-+ u32 chunk_id)
-+{
-+ struct yaffs_tnode *tn = file_struct->top;
-+ u32 i;
-+ int required_depth;
-+ int level = file_struct->top_level;
-+
-+ (void) dev;
-+
-+ /* Check sane level and chunk Id */
-+ if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
-+ return NULL;
-+
-+ if (chunk_id > YAFFS_MAX_CHUNK_ID)
-+ return NULL;
-+
-+ /* First check we're tall enough (ie enough top_level) */
-+
-+ i = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
-+ required_depth = 0;
-+ while (i) {
-+ i >>= YAFFS_TNODES_INTERNAL_BITS;
-+ required_depth++;
-+ }
-+
-+ if (required_depth > file_struct->top_level)
-+ return NULL; /* Not tall enough, so we can't find it */
-+
-+ /* Traverse down to level 0 */
-+ while (level > 0 && tn) {
-+ tn = tn->internal[(chunk_id >>
-+ (YAFFS_TNODES_LEVEL0_BITS +
-+ (level - 1) *
-+ YAFFS_TNODES_INTERNAL_BITS)) &
-+ YAFFS_TNODES_INTERNAL_MASK];
-+ level--;
-+ }
-+
-+ return tn;
-+}
-+
-+/* add_find_tnode_0 finds the level 0 tnode if it exists,
-+ * otherwise first expands the tree.
-+ * This happens in two steps:
-+ * 1. If the tree isn't tall enough, then make it taller.
-+ * 2. Scan down the tree towards the level 0 tnode adding tnodes if required.
-+ *
-+ * Used when modifying the tree.
-+ *
-+ * If the tn argument is NULL, then a fresh tnode will be added otherwise the
-+ * specified tn will be plugged into the ttree.
-+ */
-+
-+struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev,
-+ struct yaffs_file_var *file_struct,
-+ u32 chunk_id,
-+ struct yaffs_tnode *passed_tn)
-+{
-+ int required_depth;
-+ int i;
-+ int l;
-+ struct yaffs_tnode *tn;
-+ u32 x;
-+
-+ /* Check sane level and page Id */
-+ if (file_struct->top_level < 0 ||
-+ file_struct->top_level > YAFFS_TNODES_MAX_LEVEL)
-+ return NULL;
-+
-+ if (chunk_id > YAFFS_MAX_CHUNK_ID)
-+ return NULL;
-+
-+ /* First check we're tall enough (ie enough top_level) */
-+
-+ x = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
-+ required_depth = 0;
-+ while (x) {
-+ x >>= YAFFS_TNODES_INTERNAL_BITS;
-+ required_depth++;
-+ }
-+
-+ if (required_depth > file_struct->top_level) {
-+ /* Not tall enough, gotta make the tree taller */
-+ for (i = file_struct->top_level; i < required_depth; i++) {
-+
-+ tn = yaffs_get_tnode(dev);
-+
-+ if (tn) {
-+ tn->internal[0] = file_struct->top;
-+ file_struct->top = tn;
-+ file_struct->top_level++;
-+ } else {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs: no more tnodes");
-+ return NULL;
-+ }
-+ }
-+ }
-+
-+ /* Traverse down to level 0, adding anything we need */
-+
-+ l = file_struct->top_level;
-+ tn = file_struct->top;
-+
-+ if (l > 0) {
-+ while (l > 0 && tn) {
-+ x = (chunk_id >>
-+ (YAFFS_TNODES_LEVEL0_BITS +
-+ (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
-+ YAFFS_TNODES_INTERNAL_MASK;
-+
-+ if ((l > 1) && !tn->internal[x]) {
-+ /* Add missing non-level-zero tnode */
-+ tn->internal[x] = yaffs_get_tnode(dev);
-+ if (!tn->internal[x])
-+ return NULL;
-+ } else if (l == 1) {
-+ /* Looking from level 1 at level 0 */
-+ if (passed_tn) {
-+ /* If we already have one, release it */
-+ if (tn->internal[x])
-+ yaffs_free_tnode(dev,
-+ tn->internal[x]);
-+ tn->internal[x] = passed_tn;
-+
-+ } else if (!tn->internal[x]) {
-+ /* Don't have one, none passed in */
-+ tn->internal[x] = yaffs_get_tnode(dev);
-+ if (!tn->internal[x])
-+ return NULL;
-+ }
-+ }
-+
-+ tn = tn->internal[x];
-+ l--;
-+ }
-+ } else {
-+ /* top is level 0 */
-+ if (passed_tn) {
-+ memcpy(tn, passed_tn,
-+ (dev->tnode_width * YAFFS_NTNODES_LEVEL0) / 8);
-+ yaffs_free_tnode(dev, passed_tn);
-+ }
-+ }
-+
-+ return tn;
-+}
-+
-+static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id,
-+ int chunk_obj)
-+{
-+ return (tags->chunk_id == chunk_obj &&
-+ tags->obj_id == obj_id &&
-+ !tags->is_deleted) ? 1 : 0;
-+
-+}
-+
-+static int yaffs_find_chunk_in_group(struct yaffs_dev *dev, int the_chunk,
-+ struct yaffs_ext_tags *tags, int obj_id,
-+ int inode_chunk)
-+{
-+ int j;
-+
-+ for (j = 0; the_chunk && j < dev->chunk_grp_size; j++) {
-+ if (yaffs_check_chunk_bit
-+ (dev, the_chunk / dev->param.chunks_per_block,
-+ the_chunk % dev->param.chunks_per_block)) {
-+
-+ if (dev->chunk_grp_size == 1)
-+ return the_chunk;
-+ else {
-+ yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
-+ tags);
-+ if (yaffs_tags_match(tags,
-+ obj_id, inode_chunk)) {
-+ /* found it; */
-+ return the_chunk;
-+ }
-+ }
-+ }
-+ the_chunk++;
-+ }
-+ return -1;
-+}
-+
-+int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
-+ struct yaffs_ext_tags *tags)
-+{
-+ /*Get the Tnode, then get the level 0 offset chunk offset */
-+ struct yaffs_tnode *tn;
-+ int the_chunk = -1;
-+ struct yaffs_ext_tags local_tags;
-+ int ret_val = -1;
-+ struct yaffs_dev *dev = in->my_dev;
-+
-+ if (!tags) {
-+ /* Passed a NULL, so use our own tags space */
-+ tags = &local_tags;
-+ }
-+
-+ tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
-+
-+ if (!tn)
-+ return ret_val;
-+
-+ the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
-+
-+ ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
-+ inode_chunk);
-+ return ret_val;
-+}
-+
-+static int yaffs_find_del_file_chunk(struct yaffs_obj *in, int inode_chunk,
-+ struct yaffs_ext_tags *tags)
-+{
-+ /* Get the Tnode, then get the level 0 offset chunk offset */
-+ struct yaffs_tnode *tn;
-+ int the_chunk = -1;
-+ struct yaffs_ext_tags local_tags;
-+ struct yaffs_dev *dev = in->my_dev;
-+ int ret_val = -1;
-+
-+ if (!tags) {
-+ /* Passed a NULL, so use our own tags space */
-+ tags = &local_tags;
-+ }
-+
-+ tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
-+
-+ if (!tn)
-+ return ret_val;
-+
-+ the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
-+
-+ ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
-+ inode_chunk);
-+
-+ /* Delete the entry in the filestructure (if found) */
-+ if (ret_val != -1)
-+ yaffs_load_tnode_0(dev, tn, inode_chunk, 0);
-+
-+ return ret_val;
-+}
-+
-+int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
-+ int nand_chunk, int in_scan)
-+{
-+ /* NB in_scan is zero unless scanning.
-+ * For forward scanning, in_scan is > 0;
-+ * for backward scanning in_scan is < 0
-+ *
-+ * nand_chunk = 0 is a dummy insert to make sure the tnodes are there.
-+ */
-+
-+ struct yaffs_tnode *tn;
-+ struct yaffs_dev *dev = in->my_dev;
-+ int existing_cunk;
-+ struct yaffs_ext_tags existing_tags;
-+ struct yaffs_ext_tags new_tags;
-+ unsigned existing_serial, new_serial;
-+
-+ if (in->variant_type != YAFFS_OBJECT_TYPE_FILE) {
-+ /* Just ignore an attempt at putting a chunk into a non-file
-+ * during scanning.
-+ * If it is not during Scanning then something went wrong!
-+ */
-+ if (!in_scan) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs tragedy:attempt to put data chunk into a non-file"
-+ );
-+ BUG();
-+ }
-+
-+ yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
-+ return YAFFS_OK;
-+ }
-+
-+ tn = yaffs_add_find_tnode_0(dev,
-+ &in->variant.file_variant,
-+ inode_chunk, NULL);
-+ if (!tn)
-+ return YAFFS_FAIL;
-+
-+ if (!nand_chunk)
-+ /* Dummy insert, bail now */
-+ return YAFFS_OK;
-+
-+ existing_cunk = yaffs_get_group_base(dev, tn, inode_chunk);
-+
-+ if (in_scan != 0) {
-+ /* If we're scanning then we need to test for duplicates
-+ * NB This does not need to be efficient since it should only
-+ * happen when the power fails during a write, then only one
-+ * chunk should ever be affected.
-+ *
-+ * Correction for YAFFS2: This could happen quite a lot and we
-+ * need to think about efficiency! TODO
-+ * Update: For backward scanning we don't need to re-read tags
-+ * so this is quite cheap.
-+ */
-+
-+ if (existing_cunk > 0) {
-+ /* NB Right now existing chunk will not be real
-+ * chunk_id if the chunk group size > 1
-+ * thus we have to do a FindChunkInFile to get the
-+ * real chunk id.
-+ *
-+ * We have a duplicate now we need to decide which
-+ * one to use:
-+ *
-+ * Backwards scanning YAFFS2: The old one is what
-+ * we use, dump the new one.
-+ * YAFFS1: Get both sets of tags and compare serial
-+ * numbers.
-+ */
-+
-+ if (in_scan > 0) {
-+ /* Only do this for forward scanning */
-+ yaffs_rd_chunk_tags_nand(dev,
-+ nand_chunk,
-+ NULL, &new_tags);
-+
-+ /* Do a proper find */
-+ existing_cunk =
-+ yaffs_find_chunk_in_file(in, inode_chunk,
-+ &existing_tags);
-+ }
-+
-+ if (existing_cunk <= 0) {
-+ /*Hoosterman - how did this happen? */
-+
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs tragedy: existing chunk < 0 in scan"
-+ );
-+
-+ }
-+
-+ /* NB The deleted flags should be false, otherwise
-+ * the chunks will not be loaded during a scan
-+ */
-+
-+ if (in_scan > 0) {
-+ new_serial = new_tags.serial_number;
-+ existing_serial = existing_tags.serial_number;
-+ }
-+
-+ if ((in_scan > 0) &&
-+ (existing_cunk <= 0 ||
-+ ((existing_serial + 1) & 3) == new_serial)) {
-+ /* Forward scanning.
-+ * Use new
-+ * Delete the old one and drop through to
-+ * update the tnode
-+ */
-+ yaffs_chunk_del(dev, existing_cunk, 1,
-+ __LINE__);
-+ } else {
-+ /* Backward scanning or we want to use the
-+ * existing one
-+ * Delete the new one and return early so that
-+ * the tnode isn't changed
-+ */
-+ yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
-+ return YAFFS_OK;
-+ }
-+ }
-+
-+ }
-+
-+ if (existing_cunk == 0)
-+ in->n_data_chunks++;
-+
-+ yaffs_load_tnode_0(dev, tn, inode_chunk, nand_chunk);
-+
-+ return YAFFS_OK;
-+}
-+
-+static void yaffs_soft_del_chunk(struct yaffs_dev *dev, int chunk)
-+{
-+ struct yaffs_block_info *the_block;
-+ unsigned block_no;
-+
-+ yaffs_trace(YAFFS_TRACE_DELETION, "soft delete chunk %d", chunk);
-+
-+ block_no = chunk / dev->param.chunks_per_block;
-+ the_block = yaffs_get_block_info(dev, block_no);
-+ if (the_block) {
-+ the_block->soft_del_pages++;
-+ dev->n_free_chunks++;
-+ yaffs2_update_oldest_dirty_seq(dev, block_no, the_block);
-+ }
-+}
-+
-+/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all
-+ * the chunks in the file.
-+ * All soft deleting does is increment the block's softdelete count and pulls
-+ * the chunk out of the tnode.
-+ * Thus, essentially this is the same as DeleteWorker except that the chunks
-+ * are soft deleted.
-+ */
-+
-+static int yaffs_soft_del_worker(struct yaffs_obj *in, struct yaffs_tnode *tn,
-+ u32 level, int chunk_offset)
-+{
-+ int i;
-+ int the_chunk;
-+ int all_done = 1;
-+ struct yaffs_dev *dev = in->my_dev;
-+
-+ if (!tn)
-+ return 1;
-+
-+ if (level > 0) {
-+ for (i = YAFFS_NTNODES_INTERNAL - 1;
-+ all_done && i >= 0;
-+ i--) {
-+ if (tn->internal[i]) {
-+ all_done =
-+ yaffs_soft_del_worker(in,
-+ tn->internal[i],
-+ level - 1,
-+ (chunk_offset <<
-+ YAFFS_TNODES_INTERNAL_BITS)
-+ + i);
-+ if (all_done) {
-+ yaffs_free_tnode(dev,
-+ tn->internal[i]);
-+ tn->internal[i] = NULL;
-+ } else {
-+ /* Can this happen? */
-+ }
-+ }
-+ }
-+ return (all_done) ? 1 : 0;
-+ }
-+
-+ /* level 0 */
-+ for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
-+ the_chunk = yaffs_get_group_base(dev, tn, i);
-+ if (the_chunk) {
-+ yaffs_soft_del_chunk(dev, the_chunk);
-+ yaffs_load_tnode_0(dev, tn, i, 0);
-+ }
-+ }
-+ return 1;
-+}
-+
-+static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj)
-+{
-+ struct yaffs_dev *dev = obj->my_dev;
-+ struct yaffs_obj *parent;
-+
-+ yaffs_verify_obj_in_dir(obj);
-+ parent = obj->parent;
-+
-+ yaffs_verify_dir(parent);
-+
-+ if (dev && dev->param.remove_obj_fn)
-+ dev->param.remove_obj_fn(obj);
-+
-+ list_del_init(&obj->siblings);
-+ obj->parent = NULL;
-+
-+ yaffs_verify_dir(parent);
-+}
-+
-+void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj)
-+{
-+ if (!directory) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "tragedy: Trying to add an object to a null pointer directory"
-+ );
-+ BUG();
-+ return;
-+ }
-+ if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "tragedy: Trying to add an object to a non-directory"
-+ );
-+ BUG();
-+ }
-+
-+ if (obj->siblings.prev == NULL) {
-+ /* Not initialised */
-+ BUG();
-+ }
-+
-+ yaffs_verify_dir(directory);
-+
-+ yaffs_remove_obj_from_dir(obj);
-+
-+ /* Now add it */
-+ list_add(&obj->siblings, &directory->variant.dir_variant.children);
-+ obj->parent = directory;
-+
-+ if (directory == obj->my_dev->unlinked_dir
-+ || directory == obj->my_dev->del_dir) {
-+ obj->unlinked = 1;
-+ obj->my_dev->n_unlinked_files++;
-+ obj->rename_allowed = 0;
-+ }
-+
-+ yaffs_verify_dir(directory);
-+ yaffs_verify_obj_in_dir(obj);
-+}
-+
-+static int yaffs_change_obj_name(struct yaffs_obj *obj,
-+ struct yaffs_obj *new_dir,
-+ const YCHAR *new_name, int force, int shadows)
-+{
-+ int unlink_op;
-+ int del_op;
-+ struct yaffs_obj *existing_target;
-+
-+ if (new_dir == NULL)
-+ new_dir = obj->parent; /* use the old directory */
-+
-+ if (new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "tragedy: yaffs_change_obj_name: new_dir is not a directory"
-+ );
-+ BUG();
-+ }
-+
-+ unlink_op = (new_dir == obj->my_dev->unlinked_dir);
-+ del_op = (new_dir == obj->my_dev->del_dir);
-+
-+ existing_target = yaffs_find_by_name(new_dir, new_name);
-+
-+ /* If the object is a file going into the unlinked directory,
-+ * then it is OK to just stuff it in since duplicate names are OK.
-+ * else only proceed if the new name does not exist and we're putting
-+ * it into a directory.
-+ */
-+ if (!(unlink_op || del_op || force ||
-+ shadows > 0 || !existing_target) ||
-+ new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
-+ return YAFFS_FAIL;
-+
-+ yaffs_set_obj_name(obj, new_name);
-+ obj->dirty = 1;
-+ yaffs_add_obj_to_dir(new_dir, obj);
-+
-+ if (unlink_op)
-+ obj->unlinked = 1;
-+
-+ /* If it is a deletion then we mark it as a shrink for gc */
-+ if (yaffs_update_oh(obj, new_name, 0, del_op, shadows, NULL) >= 0)
-+ return YAFFS_OK;
-+
-+ return YAFFS_FAIL;
-+}
-+
-+/*------------------------ Short Operations Cache ------------------------------
-+ * In many situations where there is no high level buffering a lot of
-+ * reads might be short sequential reads, and a lot of writes may be short
-+ * sequential writes. eg. scanning/writing a jpeg file.
-+ * In these cases, a short read/write cache can provide a huge perfomance
-+ * benefit with dumb-as-a-rock code.
-+ * In Linux, the page cache provides read buffering and the short op cache
-+ * provides write buffering.
-+ *
-+ * There are a small number (~10) of cache chunks per device so that we don't
-+ * need a very intelligent search.
-+ */
-+
-+static int yaffs_obj_cache_dirty(struct yaffs_obj *obj)
-+{
-+ struct yaffs_dev *dev = obj->my_dev;
-+ int i;
-+ struct yaffs_cache *cache;
-+ int n_caches = obj->my_dev->param.n_caches;
-+
-+ for (i = 0; i < n_caches; i++) {
-+ cache = &dev->cache[i];
-+ if (cache->object == obj && cache->dirty)
-+ return 1;
-+ }
-+
-+ return 0;
-+}
-+
-+static void yaffs_flush_file_cache(struct yaffs_obj *obj)
-+{
-+ struct yaffs_dev *dev = obj->my_dev;
-+ int lowest = -99; /* Stop compiler whining. */
-+ int i;
-+ struct yaffs_cache *cache;
-+ int chunk_written = 0;
-+ int n_caches = obj->my_dev->param.n_caches;
-+
-+ if (n_caches < 1)
-+ return;
-+ do {
-+ cache = NULL;
-+
-+ /* Find the lowest dirty chunk for this object */
-+ for (i = 0; i < n_caches; i++) {
-+ if (dev->cache[i].object == obj &&
-+ dev->cache[i].dirty) {
-+ if (!cache ||
-+ dev->cache[i].chunk_id < lowest) {
-+ cache = &dev->cache[i];
-+ lowest = cache->chunk_id;
-+ }
-+ }
-+ }
-+
-+ if (cache && !cache->locked) {
-+ /* Write it out and free it up */
-+ chunk_written =
-+ yaffs_wr_data_obj(cache->object,
-+ cache->chunk_id,
-+ cache->data,
-+ cache->n_bytes, 1);
-+ cache->dirty = 0;
-+ cache->object = NULL;
-+ }
-+ } while (cache && chunk_written > 0);
-+
-+ if (cache)
-+ /* Hoosterman, disk full while writing cache out. */
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs tragedy: no space during cache write");
-+}
-+
-+/*yaffs_flush_whole_cache(dev)
-+ *
-+ *
-+ */
-+
-+void yaffs_flush_whole_cache(struct yaffs_dev *dev)
-+{
-+ struct yaffs_obj *obj;
-+ int n_caches = dev->param.n_caches;
-+ int i;
-+
-+ /* Find a dirty object in the cache and flush it...
-+ * until there are no further dirty objects.
-+ */
-+ do {
-+ obj = NULL;
-+ for (i = 0; i < n_caches && !obj; i++) {
-+ if (dev->cache[i].object && dev->cache[i].dirty)
-+ obj = dev->cache[i].object;
-+ }
-+ if (obj)
-+ yaffs_flush_file_cache(obj);
-+ } while (obj);
-+
-+}
-+
-+/* Grab us a cache chunk for use.
-+ * First look for an empty one.
-+ * Then look for the least recently used non-dirty one.
-+ * Then look for the least recently used dirty one...., flush and look again.
-+ */
-+static struct yaffs_cache *yaffs_grab_chunk_worker(struct yaffs_dev *dev)
-+{
-+ int i;
-+
-+ if (dev->param.n_caches > 0) {
-+ for (i = 0; i < dev->param.n_caches; i++) {
-+ if (!dev->cache[i].object)
-+ return &dev->cache[i];
-+ }
-+ }
-+ return NULL;
-+}
-+
-+static struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev)
-+{
-+ struct yaffs_cache *cache;
-+ struct yaffs_obj *the_obj;
-+ int usage;
-+ int i;
-+ int pushout;
-+
-+ if (dev->param.n_caches < 1)
-+ return NULL;
-+
-+ /* Try find a non-dirty one... */
-+
-+ cache = yaffs_grab_chunk_worker(dev);
-+
-+ if (!cache) {
-+ /* They were all dirty, find the LRU object and flush
-+ * its cache, then find again.
-+ * NB what's here is not very accurate,
-+ * we actually flush the object with the LRU chunk.
-+ */
-+
-+ /* With locking we can't assume we can use entry zero,
-+ * Set the_obj to a valid pointer for Coverity. */
-+ the_obj = dev->cache[0].object;
-+ usage = -1;
-+ cache = NULL;
-+ pushout = -1;
-+
-+ for (i = 0; i < dev->param.n_caches; i++) {
-+ if (dev->cache[i].object &&
-+ !dev->cache[i].locked &&
-+ (dev->cache[i].last_use < usage ||
-+ !cache)) {
-+ usage = dev->cache[i].last_use;
-+ the_obj = dev->cache[i].object;
-+ cache = &dev->cache[i];
-+ pushout = i;
-+ }
-+ }
-+
-+ if (!cache || cache->dirty) {
-+ /* Flush and try again */
-+ yaffs_flush_file_cache(the_obj);
-+ cache = yaffs_grab_chunk_worker(dev);
-+ }
-+ }
-+ return cache;
-+}
-+
-+/* Find a cached chunk */
-+static struct yaffs_cache *yaffs_find_chunk_cache(const struct yaffs_obj *obj,
-+ int chunk_id)
-+{
-+ struct yaffs_dev *dev = obj->my_dev;
-+ int i;
-+
-+ if (dev->param.n_caches < 1)
-+ return NULL;
-+
-+ for (i = 0; i < dev->param.n_caches; i++) {
-+ if (dev->cache[i].object == obj &&
-+ dev->cache[i].chunk_id == chunk_id) {
-+ dev->cache_hits++;
-+
-+ return &dev->cache[i];
-+ }
-+ }
-+ return NULL;
-+}
-+
-+/* Mark the chunk for the least recently used algorithym */
-+static void yaffs_use_cache(struct yaffs_dev *dev, struct yaffs_cache *cache,
-+ int is_write)
-+{
-+ int i;
-+
-+ if (dev->param.n_caches < 1)
-+ return;
-+
-+ if (dev->cache_last_use < 0 ||
-+ dev->cache_last_use > 100000000) {
-+ /* Reset the cache usages */
-+ for (i = 1; i < dev->param.n_caches; i++)
-+ dev->cache[i].last_use = 0;
-+
-+ dev->cache_last_use = 0;
-+ }
-+ dev->cache_last_use++;
-+ cache->last_use = dev->cache_last_use;
-+
-+ if (is_write)
-+ cache->dirty = 1;
-+}
-+
-+/* Invalidate a single cache page.
-+ * Do this when a whole page gets written,
-+ * ie the short cache for this page is no longer valid.
-+ */
-+static void yaffs_invalidate_chunk_cache(struct yaffs_obj *object, int chunk_id)
-+{
-+ struct yaffs_cache *cache;
-+
-+ if (object->my_dev->param.n_caches > 0) {
-+ cache = yaffs_find_chunk_cache(object, chunk_id);
-+
-+ if (cache)
-+ cache->object = NULL;
-+ }
-+}
-+
-+/* Invalidate all the cache pages associated with this object
-+ * Do this whenever ther file is deleted or resized.
-+ */
-+static void yaffs_invalidate_whole_cache(struct yaffs_obj *in)
-+{
-+ int i;
-+ struct yaffs_dev *dev = in->my_dev;
-+
-+ if (dev->param.n_caches > 0) {
-+ /* Invalidate it. */
-+ for (i = 0; i < dev->param.n_caches; i++) {
-+ if (dev->cache[i].object == in)
-+ dev->cache[i].object = NULL;
-+ }
-+ }
-+}
-+
-+static void yaffs_unhash_obj(struct yaffs_obj *obj)
-+{
-+ int bucket;
-+ struct yaffs_dev *dev = obj->my_dev;
-+
-+ /* If it is still linked into the bucket list, free from the list */
-+ if (!list_empty(&obj->hash_link)) {
-+ list_del_init(&obj->hash_link);
-+ bucket = yaffs_hash_fn(obj->obj_id);
-+ dev->obj_bucket[bucket].count--;
-+ }
-+}
-+
-+/* FreeObject frees up a Object and puts it back on the free list */
-+static void yaffs_free_obj(struct yaffs_obj *obj)
-+{
-+ struct yaffs_dev *dev;
-+
-+ if (!obj) {
-+ BUG();
-+ return;
-+ }
-+ dev = obj->my_dev;
-+ yaffs_trace(YAFFS_TRACE_OS, "FreeObject %p inode %p",
-+ obj, obj->my_inode);
-+ if (obj->parent)
-+ BUG();
-+ if (!list_empty(&obj->siblings))
-+ BUG();
-+
-+ if (obj->my_inode) {
-+ /* We're still hooked up to a cached inode.
-+ * Don't delete now, but mark for later deletion
-+ */
-+ obj->defered_free = 1;
-+ return;
-+ }
-+
-+ yaffs_unhash_obj(obj);
-+
-+ yaffs_free_raw_obj(dev, obj);
-+ dev->n_obj--;
-+ dev->checkpoint_blocks_required = 0; /* force recalculation */
-+}
-+
-+void yaffs_handle_defered_free(struct yaffs_obj *obj)
-+{
-+ if (obj->defered_free)
-+ yaffs_free_obj(obj);
-+}
-+
-+static int yaffs_generic_obj_del(struct yaffs_obj *in)
-+{
-+ /* Iinvalidate the file's data in the cache, without flushing. */
-+ yaffs_invalidate_whole_cache(in);
-+
-+ if (in->my_dev->param.is_yaffs2 && in->parent != in->my_dev->del_dir) {
-+ /* Move to unlinked directory so we have a deletion record */
-+ yaffs_change_obj_name(in, in->my_dev->del_dir, _Y("deleted"), 0,
-+ 0);
-+ }
-+
-+ yaffs_remove_obj_from_dir(in);
-+ yaffs_chunk_del(in->my_dev, in->hdr_chunk, 1, __LINE__);
-+ in->hdr_chunk = 0;
-+
-+ yaffs_free_obj(in);
-+ return YAFFS_OK;
-+
-+}
-+
-+static void yaffs_soft_del_file(struct yaffs_obj *obj)
-+{
-+ if (!obj->deleted ||
-+ obj->variant_type != YAFFS_OBJECT_TYPE_FILE ||
-+ obj->soft_del)
-+ return;
-+
-+ if (obj->n_data_chunks <= 0) {
-+ /* Empty file with no duplicate object headers,
-+ * just delete it immediately */
-+ yaffs_free_tnode(obj->my_dev, obj->variant.file_variant.top);
-+ obj->variant.file_variant.top = NULL;
-+ yaffs_trace(YAFFS_TRACE_TRACING,
-+ "yaffs: Deleting empty file %d",
-+ obj->obj_id);
-+ yaffs_generic_obj_del(obj);
-+ } else {
-+ yaffs_soft_del_worker(obj,
-+ obj->variant.file_variant.top,
-+ obj->variant.
-+ file_variant.top_level, 0);
-+ obj->soft_del = 1;
-+ }
-+}
-+
-+/* Pruning removes any part of the file structure tree that is beyond the
-+ * bounds of the file (ie that does not point to chunks).
-+ *
-+ * A file should only get pruned when its size is reduced.
-+ *
-+ * Before pruning, the chunks must be pulled from the tree and the
-+ * level 0 tnode entries must be zeroed out.
-+ * Could also use this for file deletion, but that's probably better handled
-+ * by a special case.
-+ *
-+ * This function is recursive. For levels > 0 the function is called again on
-+ * any sub-tree. For level == 0 we just check if the sub-tree has data.
-+ * If there is no data in a subtree then it is pruned.
-+ */
-+
-+static struct yaffs_tnode *yaffs_prune_worker(struct yaffs_dev *dev,
-+ struct yaffs_tnode *tn, u32 level,
-+ int del0)
-+{
-+ int i;
-+ int has_data;
-+
-+ if (!tn)
-+ return tn;
-+
-+ has_data = 0;
-+
-+ if (level > 0) {
-+ for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
-+ if (tn->internal[i]) {
-+ tn->internal[i] =
-+ yaffs_prune_worker(dev,
-+ tn->internal[i],
-+ level - 1,
-+ (i == 0) ? del0 : 1);
-+ }
-+
-+ if (tn->internal[i])
-+ has_data++;
-+ }
-+ } else {
-+ int tnode_size_u32 = dev->tnode_size / sizeof(u32);
-+ u32 *map = (u32 *) tn;
-+
-+ for (i = 0; !has_data && i < tnode_size_u32; i++) {
-+ if (map[i])
-+ has_data++;
-+ }
-+ }
-+
-+ if (has_data == 0 && del0) {
-+ /* Free and return NULL */
-+ yaffs_free_tnode(dev, tn);
-+ tn = NULL;
-+ }
-+ return tn;
-+}
-+
-+static int yaffs_prune_tree(struct yaffs_dev *dev,
-+ struct yaffs_file_var *file_struct)
-+{
-+ int i;
-+ int has_data;
-+ int done = 0;
-+ struct yaffs_tnode *tn;
-+
-+ if (file_struct->top_level < 1)
-+ return YAFFS_OK;
-+
-+ file_struct->top =
-+ yaffs_prune_worker(dev, file_struct->top, file_struct->top_level, 0);
-+
-+ /* Now we have a tree with all the non-zero branches NULL but
-+ * the height is the same as it was.
-+ * Let's see if we can trim internal tnodes to shorten the tree.
-+ * We can do this if only the 0th element in the tnode is in use
-+ * (ie all the non-zero are NULL)
-+ */
-+
-+ while (file_struct->top_level && !done) {
-+ tn = file_struct->top;
-+
-+ has_data = 0;
-+ for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
-+ if (tn->internal[i])
-+ has_data++;
-+ }
-+
-+ if (!has_data) {
-+ file_struct->top = tn->internal[0];
-+ file_struct->top_level--;
-+ yaffs_free_tnode(dev, tn);
-+ } else {
-+ done = 1;
-+ }
-+ }
-+
-+ return YAFFS_OK;
-+}
-+
-+/*-------------------- End of File Structure functions.-------------------*/
-+
-+/* alloc_empty_obj gets us a clean Object.*/
-+static struct yaffs_obj *yaffs_alloc_empty_obj(struct yaffs_dev *dev)
-+{
-+ struct yaffs_obj *obj = yaffs_alloc_raw_obj(dev);
-+
-+ if (!obj)
-+ return obj;
-+
-+ dev->n_obj++;
-+
-+ /* Now sweeten it up... */
-+
-+ memset(obj, 0, sizeof(struct yaffs_obj));
-+ obj->being_created = 1;
-+
-+ obj->my_dev = dev;
-+ obj->hdr_chunk = 0;
-+ obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN;
-+ INIT_LIST_HEAD(&(obj->hard_links));
-+ INIT_LIST_HEAD(&(obj->hash_link));
-+ INIT_LIST_HEAD(&obj->siblings);
-+
-+ /* Now make the directory sane */
-+ if (dev->root_dir) {
-+ obj->parent = dev->root_dir;
-+ list_add(&(obj->siblings),
-+ &dev->root_dir->variant.dir_variant.children);
-+ }
-+
-+ /* Add it to the lost and found directory.
-+ * NB Can't put root or lost-n-found in lost-n-found so
-+ * check if lost-n-found exists first
-+ */
-+ if (dev->lost_n_found)
-+ yaffs_add_obj_to_dir(dev->lost_n_found, obj);
-+
-+ obj->being_created = 0;
-+
-+ dev->checkpoint_blocks_required = 0; /* force recalculation */
-+
-+ return obj;
-+}
-+
-+static int yaffs_find_nice_bucket(struct yaffs_dev *dev)
-+{
-+ int i;
-+ int l = 999;
-+ int lowest = 999999;
-+
-+ /* Search for the shortest list or one that
-+ * isn't too long.
-+ */
-+
-+ for (i = 0; i < 10 && lowest > 4; i++) {
-+ dev->bucket_finder++;
-+ dev->bucket_finder %= YAFFS_NOBJECT_BUCKETS;
-+ if (dev->obj_bucket[dev->bucket_finder].count < lowest) {
-+ lowest = dev->obj_bucket[dev->bucket_finder].count;
-+ l = dev->bucket_finder;
-+ }
-+ }
-+
-+ return l;
-+}
-+
-+static int yaffs_new_obj_id(struct yaffs_dev *dev)
-+{
-+ int bucket = yaffs_find_nice_bucket(dev);
-+ int found = 0;
-+ struct list_head *i;
-+ u32 n = (u32) bucket;
-+
-+ /* Now find an object value that has not already been taken
-+ * by scanning the list.
-+ */
-+
-+ while (!found) {
-+ found = 1;
-+ n += YAFFS_NOBJECT_BUCKETS;
-+ if (1 || dev->obj_bucket[bucket].count > 0) {
-+ list_for_each(i, &dev->obj_bucket[bucket].list) {
-+ /* If there is already one in the list */
-+ if (i && list_entry(i, struct yaffs_obj,
-+ hash_link)->obj_id == n) {
-+ found = 0;
-+ }
-+ }
-+ }
-+ }
-+ return n;
-+}
-+
-+static void yaffs_hash_obj(struct yaffs_obj *in)
-+{
-+ int bucket = yaffs_hash_fn(in->obj_id);
-+ struct yaffs_dev *dev = in->my_dev;
-+
-+ list_add(&in->hash_link, &dev->obj_bucket[bucket].list);
-+ dev->obj_bucket[bucket].count++;
-+}
-+
-+struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number)
-+{
-+ int bucket = yaffs_hash_fn(number);
-+ struct list_head *i;
-+ struct yaffs_obj *in;
-+
-+ list_for_each(i, &dev->obj_bucket[bucket].list) {
-+ /* Look if it is in the list */
-+ in = list_entry(i, struct yaffs_obj, hash_link);
-+ if (in->obj_id == number) {
-+ /* Don't show if it is defered free */
-+ if (in->defered_free)
-+ return NULL;
-+ return in;
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
-+static struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
-+ enum yaffs_obj_type type)
-+{
-+ struct yaffs_obj *the_obj = NULL;
-+ struct yaffs_tnode *tn = NULL;
-+
-+ if (number < 0)
-+ number = yaffs_new_obj_id(dev);
-+
-+ if (type == YAFFS_OBJECT_TYPE_FILE) {
-+ tn = yaffs_get_tnode(dev);
-+ if (!tn)
-+ return NULL;
-+ }
-+
-+ the_obj = yaffs_alloc_empty_obj(dev);
-+ if (!the_obj) {
-+ if (tn)
-+ yaffs_free_tnode(dev, tn);
-+ return NULL;
-+ }
-+
-+ the_obj->fake = 0;
-+ the_obj->rename_allowed = 1;
-+ the_obj->unlink_allowed = 1;
-+ the_obj->obj_id = number;
-+ yaffs_hash_obj(the_obj);
-+ the_obj->variant_type = type;
-+ yaffs_load_current_time(the_obj, 1, 1);
-+
-+ switch (type) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ the_obj->variant.file_variant.file_size = 0;
-+ the_obj->variant.file_variant.scanned_size = 0;
-+ the_obj->variant.file_variant.shrink_size =
-+ yaffs_max_file_size(dev);
-+ the_obj->variant.file_variant.top_level = 0;
-+ the_obj->variant.file_variant.top = tn;
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ INIT_LIST_HEAD(&the_obj->variant.dir_variant.children);
-+ INIT_LIST_HEAD(&the_obj->variant.dir_variant.dirty);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ /* No action required */
-+ break;
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ /* todo this should not happen */
-+ break;
-+ }
-+ return the_obj;
-+}
-+
-+static struct yaffs_obj *yaffs_create_fake_dir(struct yaffs_dev *dev,
-+ int number, u32 mode)
-+{
-+
-+ struct yaffs_obj *obj =
-+ yaffs_new_obj(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
-+
-+ if (!obj)
-+ return NULL;
-+
-+ obj->fake = 1; /* it is fake so it might not use NAND */
-+ obj->rename_allowed = 0;
-+ obj->unlink_allowed = 0;
-+ obj->deleted = 0;
-+ obj->unlinked = 0;
-+ obj->yst_mode = mode;
-+ obj->my_dev = dev;
-+ obj->hdr_chunk = 0; /* Not a valid chunk. */
-+ return obj;
-+
-+}
-+
-+
-+static void yaffs_init_tnodes_and_objs(struct yaffs_dev *dev)
-+{
-+ int i;
-+
-+ dev->n_obj = 0;
-+ dev->n_tnodes = 0;
-+ yaffs_init_raw_tnodes_and_objs(dev);
-+
-+ for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-+ INIT_LIST_HEAD(&dev->obj_bucket[i].list);
-+ dev->obj_bucket[i].count = 0;
-+ }
-+}
-+
-+struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev,
-+ int number,
-+ enum yaffs_obj_type type)
-+{
-+ struct yaffs_obj *the_obj = NULL;
-+
-+ if (number > 0)
-+ the_obj = yaffs_find_by_number(dev, number);
-+
-+ if (!the_obj)
-+ the_obj = yaffs_new_obj(dev, number, type);
-+
-+ return the_obj;
-+
-+}
-+
-+YCHAR *yaffs_clone_str(const YCHAR *str)
-+{
-+ YCHAR *new_str = NULL;
-+ int len;
-+
-+ if (!str)
-+ str = _Y("");
-+
-+ len = strnlen(str, YAFFS_MAX_ALIAS_LENGTH);
-+ new_str = kmalloc((len + 1) * sizeof(YCHAR), GFP_NOFS);
-+ if (new_str) {
-+ strncpy(new_str, str, len);
-+ new_str[len] = 0;
-+ }
-+ return new_str;
-+
-+}
-+/*
-+ *yaffs_update_parent() handles fixing a directories mtime and ctime when a new
-+ * link (ie. name) is created or deleted in the directory.
-+ *
-+ * ie.
-+ * create dir/a : update dir's mtime/ctime
-+ * rm dir/a: update dir's mtime/ctime
-+ * modify dir/a: don't update dir's mtimme/ctime
-+ *
-+ * This can be handled immediately or defered. Defering helps reduce the number
-+ * of updates when many files in a directory are changed within a brief period.
-+ *
-+ * If the directory updating is defered then yaffs_update_dirty_dirs must be
-+ * called periodically.
-+ */
-+
-+static void yaffs_update_parent(struct yaffs_obj *obj)
-+{
-+ struct yaffs_dev *dev;
-+
-+ if (!obj)
-+ return;
-+ dev = obj->my_dev;
-+ obj->dirty = 1;
-+ yaffs_load_current_time(obj, 0, 1);
-+ if (dev->param.defered_dir_update) {
-+ struct list_head *link = &obj->variant.dir_variant.dirty;
-+
-+ if (list_empty(link)) {
-+ list_add(link, &dev->dirty_dirs);
-+ yaffs_trace(YAFFS_TRACE_BACKGROUND,
-+ "Added object %d to dirty directories",
-+ obj->obj_id);
-+ }
-+
-+ } else {
-+ yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
-+ }
-+}
-+
-+void yaffs_update_dirty_dirs(struct yaffs_dev *dev)
-+{
-+ struct list_head *link;
-+ struct yaffs_obj *obj;
-+ struct yaffs_dir_var *d_s;
-+ union yaffs_obj_var *o_v;
-+
-+ yaffs_trace(YAFFS_TRACE_BACKGROUND, "Update dirty directories");
-+
-+ while (!list_empty(&dev->dirty_dirs)) {
-+ link = dev->dirty_dirs.next;
-+ list_del_init(link);
-+
-+ d_s = list_entry(link, struct yaffs_dir_var, dirty);
-+ o_v = list_entry(d_s, union yaffs_obj_var, dir_variant);
-+ obj = list_entry(o_v, struct yaffs_obj, variant);
-+
-+ yaffs_trace(YAFFS_TRACE_BACKGROUND, "Update directory %d",
-+ obj->obj_id);
-+
-+ if (obj->dirty)
-+ yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
-+ }
-+}
-+
-+/*
-+ * Mknod (create) a new object.
-+ * equiv_obj only has meaning for a hard link;
-+ * alias_str only has meaning for a symlink.
-+ * rdev only has meaning for devices (a subset of special objects)
-+ */
-+
-+static struct yaffs_obj *yaffs_create_obj(enum yaffs_obj_type type,
-+ struct yaffs_obj *parent,
-+ const YCHAR *name,
-+ u32 mode,
-+ u32 uid,
-+ u32 gid,
-+ struct yaffs_obj *equiv_obj,
-+ const YCHAR *alias_str, u32 rdev)
-+{
-+ struct yaffs_obj *in;
-+ YCHAR *str = NULL;
-+ struct yaffs_dev *dev = parent->my_dev;
-+
-+ /* Check if the entry exists.
-+ * If it does then fail the call since we don't want a dup. */
-+ if (yaffs_find_by_name(parent, name))
-+ return NULL;
-+
-+ if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
-+ str = yaffs_clone_str(alias_str);
-+ if (!str)
-+ return NULL;
-+ }
-+
-+ in = yaffs_new_obj(dev, -1, type);
-+
-+ if (!in) {
-+ kfree(str);
-+ return NULL;
-+ }
-+
-+ in->hdr_chunk = 0;
-+ in->valid = 1;
-+ in->variant_type = type;
-+
-+ in->yst_mode = mode;
-+
-+ yaffs_attribs_init(in, gid, uid, rdev);
-+
-+ in->n_data_chunks = 0;
-+
-+ yaffs_set_obj_name(in, name);
-+ in->dirty = 1;
-+
-+ yaffs_add_obj_to_dir(parent, in);
-+
-+ in->my_dev = parent->my_dev;
-+
-+ switch (type) {
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ in->variant.symlink_variant.alias = str;
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ in->variant.hardlink_variant.equiv_obj = equiv_obj;
-+ in->variant.hardlink_variant.equiv_id = equiv_obj->obj_id;
-+ list_add(&in->hard_links, &equiv_obj->hard_links);
-+ break;
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ /* do nothing */
-+ break;
-+ }
-+
-+ if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) {
-+ /* Could not create the object header, fail */
-+ yaffs_del_obj(in);
-+ in = NULL;
-+ }
-+
-+ if (in)
-+ yaffs_update_parent(parent);
-+
-+ return in;
-+}
-+
-+struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent,
-+ const YCHAR *name, u32 mode, u32 uid,
-+ u32 gid)
-+{
-+ return yaffs_create_obj(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
-+ uid, gid, NULL, NULL, 0);
-+}
-+
-+struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR *name,
-+ u32 mode, u32 uid, u32 gid)
-+{
-+ return yaffs_create_obj(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
-+ mode, uid, gid, NULL, NULL, 0);
-+}
-+
-+struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent,
-+ const YCHAR *name, u32 mode, u32 uid,
-+ u32 gid, u32 rdev)
-+{
-+ return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
-+ uid, gid, NULL, NULL, rdev);
-+}
-+
-+struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent,
-+ const YCHAR *name, u32 mode, u32 uid,
-+ u32 gid, const YCHAR *alias)
-+{
-+ return yaffs_create_obj(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
-+ uid, gid, NULL, alias, 0);
-+}
-+
-+/* yaffs_link_obj returns the object id of the equivalent object.*/
-+struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR * name,
-+ struct yaffs_obj *equiv_obj)
-+{
-+ /* Get the real object in case we were fed a hard link obj */
-+ equiv_obj = yaffs_get_equivalent_obj(equiv_obj);
-+
-+ if (yaffs_create_obj(YAFFS_OBJECT_TYPE_HARDLINK,
-+ parent, name, 0, 0, 0,
-+ equiv_obj, NULL, 0))
-+ return equiv_obj;
-+
-+ return NULL;
-+
-+}
-+
-+
-+
-+/*---------------------- Block Management and Page Allocation -------------*/
-+
-+static void yaffs_deinit_blocks(struct yaffs_dev *dev)
-+{
-+ if (dev->block_info_alt && dev->block_info)
-+ vfree(dev->block_info);
-+ else
-+ kfree(dev->block_info);
-+
-+ dev->block_info_alt = 0;
-+
-+ dev->block_info = NULL;
-+
-+ if (dev->chunk_bits_alt && dev->chunk_bits)
-+ vfree(dev->chunk_bits);
-+ else
-+ kfree(dev->chunk_bits);
-+ dev->chunk_bits_alt = 0;
-+ dev->chunk_bits = NULL;
-+}
-+
-+static int yaffs_init_blocks(struct yaffs_dev *dev)
-+{
-+ int n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
-+
-+ dev->block_info = NULL;
-+ dev->chunk_bits = NULL;
-+ dev->alloc_block = -1; /* force it to get a new one */
-+
-+ /* If the first allocation strategy fails, thry the alternate one */
-+ dev->block_info =
-+ kmalloc(n_blocks * sizeof(struct yaffs_block_info), GFP_NOFS);
-+ if (!dev->block_info) {
-+ dev->block_info =
-+ vmalloc(n_blocks * sizeof(struct yaffs_block_info));
-+ dev->block_info_alt = 1;
-+ } else {
-+ dev->block_info_alt = 0;
-+ }
-+
-+ if (!dev->block_info)
-+ goto alloc_error;
-+
-+ /* Set up dynamic blockinfo stuff. Round up bytes. */
-+ dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8;
-+ dev->chunk_bits =
-+ kmalloc(dev->chunk_bit_stride * n_blocks, GFP_NOFS);
-+ if (!dev->chunk_bits) {
-+ dev->chunk_bits =
-+ vmalloc(dev->chunk_bit_stride * n_blocks);
-+ dev->chunk_bits_alt = 1;
-+ } else {
-+ dev->chunk_bits_alt = 0;
-+ }
-+ if (!dev->chunk_bits)
-+ goto alloc_error;
-+
-+
-+ memset(dev->block_info, 0, n_blocks * sizeof(struct yaffs_block_info));
-+ memset(dev->chunk_bits, 0, dev->chunk_bit_stride * n_blocks);
-+ return YAFFS_OK;
-+
-+alloc_error:
-+ yaffs_deinit_blocks(dev);
-+ return YAFFS_FAIL;
-+}
-+
-+
-+void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no)
-+{
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, block_no);
-+ int erased_ok = 0;
-+ int i;
-+
-+ /* If the block is still healthy erase it and mark as clean.
-+ * If the block has had a data failure, then retire it.
-+ */
-+
-+ yaffs_trace(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
-+ "yaffs_block_became_dirty block %d state %d %s",
-+ block_no, bi->block_state,
-+ (bi->needs_retiring) ? "needs retiring" : "");
-+
-+ yaffs2_clear_oldest_dirty_seq(dev, bi);
-+
-+ bi->block_state = YAFFS_BLOCK_STATE_DIRTY;
-+
-+ /* If this is the block being garbage collected then stop gc'ing */
-+ if (block_no == dev->gc_block)
-+ dev->gc_block = 0;
-+
-+ /* If this block is currently the best candidate for gc
-+ * then drop as a candidate */
-+ if (block_no == dev->gc_dirtiest) {
-+ dev->gc_dirtiest = 0;
-+ dev->gc_pages_in_use = 0;
-+ }
-+
-+ if (!bi->needs_retiring) {
-+ yaffs2_checkpt_invalidate(dev);
-+ erased_ok = yaffs_erase_block(dev, block_no);
-+ if (!erased_ok) {
-+ dev->n_erase_failures++;
-+ yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-+ "**>> Erasure failed %d", block_no);
-+ }
-+ }
-+
-+ /* Verify erasure if needed */
-+ if (erased_ok &&
-+ ((yaffs_trace_mask & YAFFS_TRACE_ERASE) ||
-+ !yaffs_skip_verification(dev))) {
-+ for (i = 0; i < dev->param.chunks_per_block; i++) {
-+ if (!yaffs_check_chunk_erased(dev,
-+ block_no * dev->param.chunks_per_block + i)) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ ">>Block %d erasure supposedly OK, but chunk %d not erased",
-+ block_no, i);
-+ }
-+ }
-+ }
-+
-+ if (!erased_ok) {
-+ /* We lost a block of free space */
-+ dev->n_free_chunks -= dev->param.chunks_per_block;
-+ yaffs_retire_block(dev, block_no);
-+ yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-+ "**>> Block %d retired", block_no);
-+ return;
-+ }
-+
-+ /* Clean it up... */
-+ bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
-+ bi->seq_number = 0;
-+ dev->n_erased_blocks++;
-+ bi->pages_in_use = 0;
-+ bi->soft_del_pages = 0;
-+ bi->has_shrink_hdr = 0;
-+ bi->skip_erased_check = 1; /* Clean, so no need to check */
-+ bi->gc_prioritise = 0;
-+ bi->has_summary = 0;
-+
-+ yaffs_clear_chunk_bits(dev, block_no);
-+
-+ yaffs_trace(YAFFS_TRACE_ERASE, "Erased block %d", block_no);
-+}
-+
-+static inline int yaffs_gc_process_chunk(struct yaffs_dev *dev,
-+ struct yaffs_block_info *bi,
-+ int old_chunk, u8 *buffer)
-+{
-+ int new_chunk;
-+ int mark_flash = 1;
-+ struct yaffs_ext_tags tags;
-+ struct yaffs_obj *object;
-+ int matching_chunk;
-+ int ret_val = YAFFS_OK;
-+
-+ memset(&tags, 0, sizeof(tags));
-+ yaffs_rd_chunk_tags_nand(dev, old_chunk,
-+ buffer, &tags);
-+ object = yaffs_find_by_number(dev, tags.obj_id);
-+
-+ yaffs_trace(YAFFS_TRACE_GC_DETAIL,
-+ "Collecting chunk in block %d, %d %d %d ",
-+ dev->gc_chunk, tags.obj_id,
-+ tags.chunk_id, tags.n_bytes);
-+
-+ if (object && !yaffs_skip_verification(dev)) {
-+ if (tags.chunk_id == 0)
-+ matching_chunk =
-+ object->hdr_chunk;
-+ else if (object->soft_del)
-+ /* Defeat the test */
-+ matching_chunk = old_chunk;
-+ else
-+ matching_chunk =
-+ yaffs_find_chunk_in_file
-+ (object, tags.chunk_id,
-+ NULL);
-+
-+ if (old_chunk != matching_chunk)
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "gc: page in gc mismatch: %d %d %d %d",
-+ old_chunk,
-+ matching_chunk,
-+ tags.obj_id,
-+ tags.chunk_id);
-+ }
-+
-+ if (!object) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "page %d in gc has no object: %d %d %d ",
-+ old_chunk,
-+ tags.obj_id, tags.chunk_id,
-+ tags.n_bytes);
-+ }
-+
-+ if (object &&
-+ object->deleted &&
-+ object->soft_del && tags.chunk_id != 0) {
-+ /* Data chunk in a soft deleted file,
-+ * throw it away.
-+ * It's a soft deleted data chunk,
-+ * No need to copy this, just forget
-+ * about it and fix up the object.
-+ */
-+
-+ /* Free chunks already includes
-+ * softdeleted chunks, how ever this
-+ * chunk is going to soon be really
-+ * deleted which will increment free
-+ * chunks. We have to decrement free
-+ * chunks so this works out properly.
-+ */
-+ dev->n_free_chunks--;
-+ bi->soft_del_pages--;
-+
-+ object->n_data_chunks--;
-+ if (object->n_data_chunks <= 0) {
-+ /* remeber to clean up obj */
-+ dev->gc_cleanup_list[dev->n_clean_ups] = tags.obj_id;
-+ dev->n_clean_ups++;
-+ }
-+ mark_flash = 0;
-+ } else if (object) {
-+ /* It's either a data chunk in a live
-+ * file or an ObjectHeader, so we're
-+ * interested in it.
-+ * NB Need to keep the ObjectHeaders of
-+ * deleted files until the whole file
-+ * has been deleted off
-+ */
-+ tags.serial_number++;
-+ dev->n_gc_copies++;
-+
-+ if (tags.chunk_id == 0) {
-+ /* It is an object Id,
-+ * We need to nuke the
-+ * shrinkheader flags since its
-+ * work is done.
-+ * Also need to clean up
-+ * shadowing.
-+ */
-+ struct yaffs_obj_hdr *oh;
-+ oh = (struct yaffs_obj_hdr *) buffer;
-+
-+ oh->is_shrink = 0;
-+ tags.extra_is_shrink = 0;
-+ oh->shadows_obj = 0;
-+ oh->inband_shadowed_obj_id = 0;
-+ tags.extra_shadows = 0;
-+
-+ /* Update file size */
-+ if (object->variant_type == YAFFS_OBJECT_TYPE_FILE) {
-+ yaffs_oh_size_load(oh,
-+ object->variant.file_variant.file_size);
-+ tags.extra_file_size =
-+ object->variant.file_variant.file_size;
-+ }
-+
-+ yaffs_verify_oh(object, oh, &tags, 1);
-+ new_chunk =
-+ yaffs_write_new_chunk(dev, (u8 *) oh, &tags, 1);
-+ } else {
-+ new_chunk =
-+ yaffs_write_new_chunk(dev, buffer, &tags, 1);
-+ }
-+
-+ if (new_chunk < 0) {
-+ ret_val = YAFFS_FAIL;
-+ } else {
-+
-+ /* Now fix up the Tnodes etc. */
-+
-+ if (tags.chunk_id == 0) {
-+ /* It's a header */
-+ object->hdr_chunk = new_chunk;
-+ object->serial = tags.serial_number;
-+ } else {
-+ /* It's a data chunk */
-+ yaffs_put_chunk_in_file(object, tags.chunk_id,
-+ new_chunk, 0);
-+ }
-+ }
-+ }
-+ if (ret_val == YAFFS_OK)
-+ yaffs_chunk_del(dev, old_chunk, mark_flash, __LINE__);
-+ return ret_val;
-+}
-+
-+static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block)
-+{
-+ int old_chunk;
-+ int ret_val = YAFFS_OK;
-+ int i;
-+ int is_checkpt_block;
-+ int max_copies;
-+ int chunks_before = yaffs_get_erased_chunks(dev);
-+ int chunks_after;
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, block);
-+
-+ is_checkpt_block = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT);
-+
-+ yaffs_trace(YAFFS_TRACE_TRACING,
-+ "Collecting block %d, in use %d, shrink %d, whole_block %d",
-+ block, bi->pages_in_use, bi->has_shrink_hdr,
-+ whole_block);
-+
-+ /*yaffs_verify_free_chunks(dev); */
-+
-+ if (bi->block_state == YAFFS_BLOCK_STATE_FULL)
-+ bi->block_state = YAFFS_BLOCK_STATE_COLLECTING;
-+
-+ bi->has_shrink_hdr = 0; /* clear the flag so that the block can erase */
-+
-+ dev->gc_disable = 1;
-+
-+ yaffs_summary_gc(dev, block);
-+
-+ if (is_checkpt_block || !yaffs_still_some_chunks(dev, block)) {
-+ yaffs_trace(YAFFS_TRACE_TRACING,
-+ "Collecting block %d that has no chunks in use",
-+ block);
-+ yaffs_block_became_dirty(dev, block);
-+ } else {
-+
-+ u8 *buffer = yaffs_get_temp_buffer(dev);
-+
-+ yaffs_verify_blk(dev, bi, block);
-+
-+ max_copies = (whole_block) ? dev->param.chunks_per_block : 5;
-+ old_chunk = block * dev->param.chunks_per_block + dev->gc_chunk;
-+
-+ for (/* init already done */ ;
-+ ret_val == YAFFS_OK &&
-+ dev->gc_chunk < dev->param.chunks_per_block &&
-+ (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) &&
-+ max_copies > 0;
-+ dev->gc_chunk++, old_chunk++) {
-+ if (yaffs_check_chunk_bit(dev, block, dev->gc_chunk)) {
-+ /* Page is in use and might need to be copied */
-+ max_copies--;
-+ ret_val = yaffs_gc_process_chunk(dev, bi,
-+ old_chunk, buffer);
-+ }
-+ }
-+ yaffs_release_temp_buffer(dev, buffer);
-+ }
-+
-+ yaffs_verify_collected_blk(dev, bi, block);
-+
-+ if (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
-+ /*
-+ * The gc did not complete. Set block state back to FULL
-+ * because checkpointing does not restore gc.
-+ */
-+ bi->block_state = YAFFS_BLOCK_STATE_FULL;
-+ } else {
-+ /* The gc completed. */
-+ /* Do any required cleanups */
-+ for (i = 0; i < dev->n_clean_ups; i++) {
-+ /* Time to delete the file too */
-+ struct yaffs_obj *object =
-+ yaffs_find_by_number(dev, dev->gc_cleanup_list[i]);
-+ if (object) {
-+ yaffs_free_tnode(dev,
-+ object->variant.file_variant.top);
-+ object->variant.file_variant.top = NULL;
-+ yaffs_trace(YAFFS_TRACE_GC,
-+ "yaffs: About to finally delete object %d",
-+ object->obj_id);
-+ yaffs_generic_obj_del(object);
-+ object->my_dev->n_deleted_files--;
-+ }
-+
-+ }
-+ chunks_after = yaffs_get_erased_chunks(dev);
-+ if (chunks_before >= chunks_after)
-+ yaffs_trace(YAFFS_TRACE_GC,
-+ "gc did not increase free chunks before %d after %d",
-+ chunks_before, chunks_after);
-+ dev->gc_block = 0;
-+ dev->gc_chunk = 0;
-+ dev->n_clean_ups = 0;
-+ }
-+
-+ dev->gc_disable = 0;
-+
-+ return ret_val;
-+}
-+
-+/*
-+ * find_gc_block() selects the dirtiest block (or close enough)
-+ * for garbage collection.
-+ */
-+
-+static unsigned yaffs_find_gc_block(struct yaffs_dev *dev,
-+ int aggressive, int background)
-+{
-+ int i;
-+ int iterations;
-+ unsigned selected = 0;
-+ int prioritised = 0;
-+ int prioritised_exist = 0;
-+ struct yaffs_block_info *bi;
-+ int threshold;
-+
-+ /* First let's see if we need to grab a prioritised block */
-+ if (dev->has_pending_prioritised_gc && !aggressive) {
-+ dev->gc_dirtiest = 0;
-+ bi = dev->block_info;
-+ for (i = dev->internal_start_block;
-+ i <= dev->internal_end_block && !selected; i++) {
-+
-+ if (bi->gc_prioritise) {
-+ prioritised_exist = 1;
-+ if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
-+ yaffs_block_ok_for_gc(dev, bi)) {
-+ selected = i;
-+ prioritised = 1;
-+ }
-+ }
-+ bi++;
-+ }
-+
-+ /*
-+ * If there is a prioritised block and none was selected then
-+ * this happened because there is at least one old dirty block
-+ * gumming up the works. Let's gc the oldest dirty block.
-+ */
-+
-+ if (prioritised_exist &&
-+ !selected && dev->oldest_dirty_block > 0)
-+ selected = dev->oldest_dirty_block;
-+
-+ if (!prioritised_exist) /* None found, so we can clear this */
-+ dev->has_pending_prioritised_gc = 0;
-+ }
-+
-+ /* If we're doing aggressive GC then we are happy to take a less-dirty
-+ * block, and search harder.
-+ * else (leasurely gc), then we only bother to do this if the
-+ * block has only a few pages in use.
-+ */
-+
-+ if (!selected) {
-+ int pages_used;
-+ int n_blocks =
-+ dev->internal_end_block - dev->internal_start_block + 1;
-+ if (aggressive) {
-+ threshold = dev->param.chunks_per_block;
-+ iterations = n_blocks;
-+ } else {
-+ int max_threshold;
-+
-+ if (background)
-+ max_threshold = dev->param.chunks_per_block / 2;
-+ else
-+ max_threshold = dev->param.chunks_per_block / 8;
-+
-+ if (max_threshold < YAFFS_GC_PASSIVE_THRESHOLD)
-+ max_threshold = YAFFS_GC_PASSIVE_THRESHOLD;
-+
-+ threshold = background ? (dev->gc_not_done + 2) * 2 : 0;
-+ if (threshold < YAFFS_GC_PASSIVE_THRESHOLD)
-+ threshold = YAFFS_GC_PASSIVE_THRESHOLD;
-+ if (threshold > max_threshold)
-+ threshold = max_threshold;
-+
-+ iterations = n_blocks / 16 + 1;
-+ if (iterations > 100)
-+ iterations = 100;
-+ }
-+
-+ for (i = 0;
-+ i < iterations &&
-+ (dev->gc_dirtiest < 1 ||
-+ dev->gc_pages_in_use > YAFFS_GC_GOOD_ENOUGH);
-+ i++) {
-+ dev->gc_block_finder++;
-+ if (dev->gc_block_finder < dev->internal_start_block ||
-+ dev->gc_block_finder > dev->internal_end_block)
-+ dev->gc_block_finder =
-+ dev->internal_start_block;
-+
-+ bi = yaffs_get_block_info(dev, dev->gc_block_finder);
-+
-+ pages_used = bi->pages_in_use - bi->soft_del_pages;
-+
-+ if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
-+ pages_used < dev->param.chunks_per_block &&
-+ (dev->gc_dirtiest < 1 ||
-+ pages_used < dev->gc_pages_in_use) &&
-+ yaffs_block_ok_for_gc(dev, bi)) {
-+ dev->gc_dirtiest = dev->gc_block_finder;
-+ dev->gc_pages_in_use = pages_used;
-+ }
-+ }
-+
-+ if (dev->gc_dirtiest > 0 && dev->gc_pages_in_use <= threshold)
-+ selected = dev->gc_dirtiest;
-+ }
-+
-+ /*
-+ * If nothing has been selected for a while, try the oldest dirty
-+ * because that's gumming up the works.
-+ */
-+
-+ if (!selected && dev->param.is_yaffs2 &&
-+ dev->gc_not_done >= (background ? 10 : 20)) {
-+ yaffs2_find_oldest_dirty_seq(dev);
-+ if (dev->oldest_dirty_block > 0) {
-+ selected = dev->oldest_dirty_block;
-+ dev->gc_dirtiest = selected;
-+ dev->oldest_dirty_gc_count++;
-+ bi = yaffs_get_block_info(dev, selected);
-+ dev->gc_pages_in_use =
-+ bi->pages_in_use - bi->soft_del_pages;
-+ } else {
-+ dev->gc_not_done = 0;
-+ }
-+ }
-+
-+ if (selected) {
-+ yaffs_trace(YAFFS_TRACE_GC,
-+ "GC Selected block %d with %d free, prioritised:%d",
-+ selected,
-+ dev->param.chunks_per_block - dev->gc_pages_in_use,
-+ prioritised);
-+
-+ dev->n_gc_blocks++;
-+ if (background)
-+ dev->bg_gcs++;
-+
-+ dev->gc_dirtiest = 0;
-+ dev->gc_pages_in_use = 0;
-+ dev->gc_not_done = 0;
-+ if (dev->refresh_skip > 0)
-+ dev->refresh_skip--;
-+ } else {
-+ dev->gc_not_done++;
-+ yaffs_trace(YAFFS_TRACE_GC,
-+ "GC none: finder %d skip %d threshold %d dirtiest %d using %d oldest %d%s",
-+ dev->gc_block_finder, dev->gc_not_done, threshold,
-+ dev->gc_dirtiest, dev->gc_pages_in_use,
-+ dev->oldest_dirty_block, background ? " bg" : "");
-+ }
-+
-+ return selected;
-+}
-+
-+/* New garbage collector
-+ * If we're very low on erased blocks then we do aggressive garbage collection
-+ * otherwise we do "leasurely" garbage collection.
-+ * Aggressive gc looks further (whole array) and will accept less dirty blocks.
-+ * Passive gc only inspects smaller areas and only accepts more dirty blocks.
-+ *
-+ * The idea is to help clear out space in a more spread-out manner.
-+ * Dunno if it really does anything useful.
-+ */
-+static int yaffs_check_gc(struct yaffs_dev *dev, int background)
-+{
-+ int aggressive = 0;
-+ int gc_ok = YAFFS_OK;
-+ int max_tries = 0;
-+ int min_erased;
-+ int erased_chunks;
-+ int checkpt_block_adjust;
-+
-+ if (dev->param.gc_control_fn &&
-+ (dev->param.gc_control_fn(dev) & 1) == 0)
-+ return YAFFS_OK;
-+
-+ if (dev->gc_disable)
-+ /* Bail out so we don't get recursive gc */
-+ return YAFFS_OK;
-+
-+ /* This loop should pass the first time.
-+ * Only loops here if the collection does not increase space.
-+ */
-+
-+ do {
-+ max_tries++;
-+
-+ checkpt_block_adjust = yaffs_calc_checkpt_blocks_required(dev);
-+
-+ min_erased =
-+ dev->param.n_reserved_blocks + checkpt_block_adjust + 1;
-+ erased_chunks =
-+ dev->n_erased_blocks * dev->param.chunks_per_block;
-+
-+ /* If we need a block soon then do aggressive gc. */
-+ if (dev->n_erased_blocks < min_erased)
-+ aggressive = 1;
-+ else {
-+ if (!background
-+ && erased_chunks > (dev->n_free_chunks / 4))
-+ break;
-+
-+ if (dev->gc_skip > 20)
-+ dev->gc_skip = 20;
-+ if (erased_chunks < dev->n_free_chunks / 2 ||
-+ dev->gc_skip < 1 || background)
-+ aggressive = 0;
-+ else {
-+ dev->gc_skip--;
-+ break;
-+ }
-+ }
-+
-+ dev->gc_skip = 5;
-+
-+ /* If we don't already have a block being gc'd then see if we
-+ * should start another */
-+
-+ if (dev->gc_block < 1 && !aggressive) {
-+ dev->gc_block = yaffs2_find_refresh_block(dev);
-+ dev->gc_chunk = 0;
-+ dev->n_clean_ups = 0;
-+ }
-+ if (dev->gc_block < 1) {
-+ dev->gc_block =
-+ yaffs_find_gc_block(dev, aggressive, background);
-+ dev->gc_chunk = 0;
-+ dev->n_clean_ups = 0;
-+ }
-+
-+ if (dev->gc_block > 0) {
-+ dev->all_gcs++;
-+ if (!aggressive)
-+ dev->passive_gc_count++;
-+
-+ yaffs_trace(YAFFS_TRACE_GC,
-+ "yaffs: GC n_erased_blocks %d aggressive %d",
-+ dev->n_erased_blocks, aggressive);
-+
-+ gc_ok = yaffs_gc_block(dev, dev->gc_block, aggressive);
-+ }
-+
-+ if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) &&
-+ dev->gc_block > 0) {
-+ yaffs_trace(YAFFS_TRACE_GC,
-+ "yaffs: GC !!!no reclaim!!! n_erased_blocks %d after try %d block %d",
-+ dev->n_erased_blocks, max_tries,
-+ dev->gc_block);
-+ }
-+ } while ((dev->n_erased_blocks < dev->param.n_reserved_blocks) &&
-+ (dev->gc_block > 0) && (max_tries < 2));
-+
-+ return aggressive ? gc_ok : YAFFS_OK;
-+}
-+
-+/*
-+ * yaffs_bg_gc()
-+ * Garbage collects. Intended to be called from a background thread.
-+ * Returns non-zero if at least half the free chunks are erased.
-+ */
-+int yaffs_bg_gc(struct yaffs_dev *dev, unsigned urgency)
-+{
-+ int erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block;
-+
-+ yaffs_trace(YAFFS_TRACE_BACKGROUND, "Background gc %u", urgency);
-+
-+ yaffs_check_gc(dev, 1);
-+ return erased_chunks > dev->n_free_chunks / 2;
-+}
-+
-+/*-------------------- Data file manipulation -----------------*/
-+
-+static int yaffs_rd_data_obj(struct yaffs_obj *in, int inode_chunk, u8 * buffer)
-+{
-+ int nand_chunk = yaffs_find_chunk_in_file(in, inode_chunk, NULL);
-+
-+ if (nand_chunk >= 0)
-+ return yaffs_rd_chunk_tags_nand(in->my_dev, nand_chunk,
-+ buffer, NULL);
-+ else {
-+ yaffs_trace(YAFFS_TRACE_NANDACCESS,
-+ "Chunk %d not found zero instead",
-+ nand_chunk);
-+ /* get sane (zero) data if you read a hole */
-+ memset(buffer, 0, in->my_dev->data_bytes_per_chunk);
-+ return 0;
-+ }
-+
-+}
-+
-+void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash,
-+ int lyn)
-+{
-+ int block;
-+ int page;
-+ struct yaffs_ext_tags tags;
-+ struct yaffs_block_info *bi;
-+
-+ if (chunk_id <= 0)
-+ return;
-+
-+ dev->n_deletions++;
-+ block = chunk_id / dev->param.chunks_per_block;
-+ page = chunk_id % dev->param.chunks_per_block;
-+
-+ if (!yaffs_check_chunk_bit(dev, block, page))
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Deleting invalid chunk %d", chunk_id);
-+
-+ bi = yaffs_get_block_info(dev, block);
-+
-+ yaffs2_update_oldest_dirty_seq(dev, block, bi);
-+
-+ yaffs_trace(YAFFS_TRACE_DELETION,
-+ "line %d delete of chunk %d",
-+ lyn, chunk_id);
-+
-+ if (!dev->param.is_yaffs2 && mark_flash &&
-+ bi->block_state != YAFFS_BLOCK_STATE_COLLECTING) {
-+
-+ memset(&tags, 0, sizeof(tags));
-+ tags.is_deleted = 1;
-+ yaffs_wr_chunk_tags_nand(dev, chunk_id, NULL, &tags);
-+ yaffs_handle_chunk_update(dev, chunk_id, &tags);
-+ } else {
-+ dev->n_unmarked_deletions++;
-+ }
-+
-+ /* Pull out of the management area.
-+ * If the whole block became dirty, this will kick off an erasure.
-+ */
-+ if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING ||
-+ bi->block_state == YAFFS_BLOCK_STATE_FULL ||
-+ bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN ||
-+ bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
-+ dev->n_free_chunks++;
-+ yaffs_clear_chunk_bit(dev, block, page);
-+ bi->pages_in_use--;
-+
-+ if (bi->pages_in_use == 0 &&
-+ !bi->has_shrink_hdr &&
-+ bi->block_state != YAFFS_BLOCK_STATE_ALLOCATING &&
-+ bi->block_state != YAFFS_BLOCK_STATE_NEEDS_SCAN) {
-+ yaffs_block_became_dirty(dev, block);
-+ }
-+ }
-+}
-+
-+static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
-+ const u8 *buffer, int n_bytes, int use_reserve)
-+{
-+ /* Find old chunk Need to do this to get serial number
-+ * Write new one and patch into tree.
-+ * Invalidate old tags.
-+ */
-+
-+ int prev_chunk_id;
-+ struct yaffs_ext_tags prev_tags;
-+ int new_chunk_id;
-+ struct yaffs_ext_tags new_tags;
-+ struct yaffs_dev *dev = in->my_dev;
-+
-+ yaffs_check_gc(dev, 0);
-+
-+ /* Get the previous chunk at this location in the file if it exists.
-+ * If it does not exist then put a zero into the tree. This creates
-+ * the tnode now, rather than later when it is harder to clean up.
-+ */
-+ prev_chunk_id = yaffs_find_chunk_in_file(in, inode_chunk, &prev_tags);
-+ if (prev_chunk_id < 1 &&
-+ !yaffs_put_chunk_in_file(in, inode_chunk, 0, 0))
-+ return 0;
-+
-+ /* Set up new tags */
-+ memset(&new_tags, 0, sizeof(new_tags));
-+
-+ new_tags.chunk_id = inode_chunk;
-+ new_tags.obj_id = in->obj_id;
-+ new_tags.serial_number =
-+ (prev_chunk_id > 0) ? prev_tags.serial_number + 1 : 1;
-+ new_tags.n_bytes = n_bytes;
-+
-+ if (n_bytes < 1 || n_bytes > dev->param.total_bytes_per_chunk) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "Writing %d bytes to chunk!!!!!!!!!",
-+ n_bytes);
-+ BUG();
-+ }
-+
-+ new_chunk_id =
-+ yaffs_write_new_chunk(dev, buffer, &new_tags, use_reserve);
-+
-+ if (new_chunk_id > 0) {
-+ yaffs_put_chunk_in_file(in, inode_chunk, new_chunk_id, 0);
-+
-+ if (prev_chunk_id > 0)
-+ yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__);
-+
-+ yaffs_verify_file_sane(in);
-+ }
-+ return new_chunk_id;
-+
-+}
-+
-+
-+
-+static int yaffs_do_xattrib_mod(struct yaffs_obj *obj, int set,
-+ const YCHAR *name, const void *value, int size,
-+ int flags)
-+{
-+ struct yaffs_xattr_mod xmod;
-+ int result;
-+
-+ xmod.set = set;
-+ xmod.name = name;
-+ xmod.data = value;
-+ xmod.size = size;
-+ xmod.flags = flags;
-+ xmod.result = -ENOSPC;
-+
-+ result = yaffs_update_oh(obj, NULL, 0, 0, 0, &xmod);
-+
-+ if (result > 0)
-+ return xmod.result;
-+ else
-+ return -ENOSPC;
-+}
-+
-+static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer,
-+ struct yaffs_xattr_mod *xmod)
-+{
-+ int retval = 0;
-+ int x_offs = sizeof(struct yaffs_obj_hdr);
-+ struct yaffs_dev *dev = obj->my_dev;
-+ int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr);
-+ char *x_buffer = buffer + x_offs;
-+
-+ if (xmod->set)
-+ retval =
-+ nval_set(x_buffer, x_size, xmod->name, xmod->data,
-+ xmod->size, xmod->flags);
-+ else
-+ retval = nval_del(x_buffer, x_size, xmod->name);
-+
-+ obj->has_xattr = nval_hasvalues(x_buffer, x_size);
-+ obj->xattr_known = 1;
-+ xmod->result = retval;
-+
-+ return retval;
-+}
-+
-+static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR *name,
-+ void *value, int size)
-+{
-+ char *buffer = NULL;
-+ int result;
-+ struct yaffs_ext_tags tags;
-+ struct yaffs_dev *dev = obj->my_dev;
-+ int x_offs = sizeof(struct yaffs_obj_hdr);
-+ int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr);
-+ char *x_buffer;
-+ int retval = 0;
-+
-+ if (obj->hdr_chunk < 1)
-+ return -ENODATA;
-+
-+ /* If we know that the object has no xattribs then don't do all the
-+ * reading and parsing.
-+ */
-+ if (obj->xattr_known && !obj->has_xattr) {
-+ if (name)
-+ return -ENODATA;
-+ else
-+ return 0;
-+ }
-+
-+ buffer = (char *)yaffs_get_temp_buffer(dev);
-+ if (!buffer)
-+ return -ENOMEM;
-+
-+ result =
-+ yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, (u8 *) buffer, &tags);
-+
-+ if (result != YAFFS_OK)
-+ retval = -ENOENT;
-+ else {
-+ x_buffer = buffer + x_offs;
-+
-+ if (!obj->xattr_known) {
-+ obj->has_xattr = nval_hasvalues(x_buffer, x_size);
-+ obj->xattr_known = 1;
-+ }
-+
-+ if (name)
-+ retval = nval_get(x_buffer, x_size, name, value, size);
-+ else
-+ retval = nval_list(x_buffer, x_size, value, size);
-+ }
-+ yaffs_release_temp_buffer(dev, (u8 *) buffer);
-+ return retval;
-+}
-+
-+int yaffs_set_xattrib(struct yaffs_obj *obj, const YCHAR * name,
-+ const void *value, int size, int flags)
-+{
-+ return yaffs_do_xattrib_mod(obj, 1, name, value, size, flags);
-+}
-+
-+int yaffs_remove_xattrib(struct yaffs_obj *obj, const YCHAR * name)
-+{
-+ return yaffs_do_xattrib_mod(obj, 0, name, NULL, 0, 0);
-+}
-+
-+int yaffs_get_xattrib(struct yaffs_obj *obj, const YCHAR * name, void *value,
-+ int size)
-+{
-+ return yaffs_do_xattrib_fetch(obj, name, value, size);
-+}
-+
-+int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size)
-+{
-+ return yaffs_do_xattrib_fetch(obj, NULL, buffer, size);
-+}
-+
-+static void yaffs_check_obj_details_loaded(struct yaffs_obj *in)
-+{
-+ u8 *buf;
-+ struct yaffs_obj_hdr *oh;
-+ struct yaffs_dev *dev;
-+ struct yaffs_ext_tags tags;
-+ int result;
-+ int alloc_failed = 0;
-+
-+ if (!in || !in->lazy_loaded || in->hdr_chunk < 1)
-+ return;
-+
-+ dev = in->my_dev;
-+ in->lazy_loaded = 0;
-+ buf = yaffs_get_temp_buffer(dev);
-+
-+ result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, buf, &tags);
-+ oh = (struct yaffs_obj_hdr *)buf;
-+
-+ in->yst_mode = oh->yst_mode;
-+ yaffs_load_attribs(in, oh);
-+ yaffs_set_obj_name_from_oh(in, oh);
-+
-+ if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
-+ in->variant.symlink_variant.alias =
-+ yaffs_clone_str(oh->alias);
-+ if (!in->variant.symlink_variant.alias)
-+ alloc_failed = 1; /* Not returned */
-+ }
-+ yaffs_release_temp_buffer(dev, buf);
-+}
-+
-+static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name,
-+ const YCHAR *oh_name, int buff_size)
-+{
-+#ifdef CONFIG_YAFFS_AUTO_UNICODE
-+ if (dev->param.auto_unicode) {
-+ if (*oh_name) {
-+ /* It is an ASCII name, do an ASCII to
-+ * unicode conversion */
-+ const char *ascii_oh_name = (const char *)oh_name;
-+ int n = buff_size - 1;
-+ while (n > 0 && *ascii_oh_name) {
-+ *name = *ascii_oh_name;
-+ name++;
-+ ascii_oh_name++;
-+ n--;
-+ }
-+ } else {
-+ strncpy(name, oh_name + 1, buff_size - 1);
-+ }
-+ } else {
-+#else
-+ (void) dev;
-+ {
-+#endif
-+ strncpy(name, oh_name, buff_size - 1);
-+ }
-+}
-+
-+static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name,
-+ const YCHAR *name)
-+{
-+#ifdef CONFIG_YAFFS_AUTO_UNICODE
-+
-+ int is_ascii;
-+ YCHAR *w;
-+
-+ if (dev->param.auto_unicode) {
-+
-+ is_ascii = 1;
-+ w = name;
-+
-+ /* Figure out if the name will fit in ascii character set */
-+ while (is_ascii && *w) {
-+ if ((*w) & 0xff00)
-+ is_ascii = 0;
-+ w++;
-+ }
-+
-+ if (is_ascii) {
-+ /* It is an ASCII name, so convert unicode to ascii */
-+ char *ascii_oh_name = (char *)oh_name;
-+ int n = YAFFS_MAX_NAME_LENGTH - 1;
-+ while (n > 0 && *name) {
-+ *ascii_oh_name = *name;
-+ name++;
-+ ascii_oh_name++;
-+ n--;
-+ }
-+ } else {
-+ /* Unicode name, so save starting at the second YCHAR */
-+ *oh_name = 0;
-+ strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2);
-+ }
-+ } else {
-+#else
-+ dev = dev;
-+ {
-+#endif
-+ strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1);
-+ }
-+}
-+
-+/* UpdateObjectHeader updates the header on NAND for an object.
-+ * If name is not NULL, then that new name is used.
-+ */
-+int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force,
-+ int is_shrink, int shadows, struct yaffs_xattr_mod *xmod)
-+{
-+
-+ struct yaffs_block_info *bi;
-+ struct yaffs_dev *dev = in->my_dev;
-+ int prev_chunk_id;
-+ int ret_val = 0;
-+ int result = 0;
-+ int new_chunk_id;
-+ struct yaffs_ext_tags new_tags;
-+ struct yaffs_ext_tags old_tags;
-+ const YCHAR *alias = NULL;
-+ u8 *buffer = NULL;
-+ YCHAR old_name[YAFFS_MAX_NAME_LENGTH + 1];
-+ struct yaffs_obj_hdr *oh = NULL;
-+ loff_t file_size = 0;
-+
-+ strcpy(old_name, _Y("silly old name"));
-+
-+ if (in->fake && in != dev->root_dir && !force && !xmod)
-+ return ret_val;
-+
-+ yaffs_check_gc(dev, 0);
-+ yaffs_check_obj_details_loaded(in);
-+
-+ buffer = yaffs_get_temp_buffer(in->my_dev);
-+ oh = (struct yaffs_obj_hdr *)buffer;
-+
-+ prev_chunk_id = in->hdr_chunk;
-+
-+ if (prev_chunk_id > 0) {
-+ result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id,
-+ buffer, &old_tags);
-+
-+ yaffs_verify_oh(in, oh, &old_tags, 0);
-+ memcpy(old_name, oh->name, sizeof(oh->name));
-+ memset(buffer, 0xff, sizeof(struct yaffs_obj_hdr));
-+ } else {
-+ memset(buffer, 0xff, dev->data_bytes_per_chunk);
-+ }
-+
-+ oh->type = in->variant_type;
-+ oh->yst_mode = in->yst_mode;
-+ oh->shadows_obj = oh->inband_shadowed_obj_id = shadows;
-+
-+ yaffs_load_attribs_oh(oh, in);
-+
-+ if (in->parent)
-+ oh->parent_obj_id = in->parent->obj_id;
-+ else
-+ oh->parent_obj_id = 0;
-+
-+ if (name && *name) {
-+ memset(oh->name, 0, sizeof(oh->name));
-+ yaffs_load_oh_from_name(dev, oh->name, name);
-+ } else if (prev_chunk_id > 0) {
-+ memcpy(oh->name, old_name, sizeof(oh->name));
-+ } else {
-+ memset(oh->name, 0, sizeof(oh->name));
-+ }
-+
-+ oh->is_shrink = is_shrink;
-+
-+ switch (in->variant_type) {
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ /* Should not happen */
-+ break;
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ if (oh->parent_obj_id != YAFFS_OBJECTID_DELETED &&
-+ oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED)
-+ file_size = in->variant.file_variant.file_size;
-+ yaffs_oh_size_load(oh, file_size);
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ oh->equiv_id = in->variant.hardlink_variant.equiv_id;
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ alias = in->variant.symlink_variant.alias;
-+ if (!alias)
-+ alias = _Y("no alias");
-+ strncpy(oh->alias, alias, YAFFS_MAX_ALIAS_LENGTH);
-+ oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;
-+ break;
-+ }
-+
-+ /* process any xattrib modifications */
-+ if (xmod)
-+ yaffs_apply_xattrib_mod(in, (char *)buffer, xmod);
-+
-+ /* Tags */
-+ memset(&new_tags, 0, sizeof(new_tags));
-+ in->serial++;
-+ new_tags.chunk_id = 0;
-+ new_tags.obj_id = in->obj_id;
-+ new_tags.serial_number = in->serial;
-+
-+ /* Add extra info for file header */
-+ new_tags.extra_available = 1;
-+ new_tags.extra_parent_id = oh->parent_obj_id;
-+ new_tags.extra_file_size = file_size;
-+ new_tags.extra_is_shrink = oh->is_shrink;
-+ new_tags.extra_equiv_id = oh->equiv_id;
-+ new_tags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0;
-+ new_tags.extra_obj_type = in->variant_type;
-+ yaffs_verify_oh(in, oh, &new_tags, 1);
-+
-+ /* Create new chunk in NAND */
-+ new_chunk_id =
-+ yaffs_write_new_chunk(dev, buffer, &new_tags,
-+ (prev_chunk_id > 0) ? 1 : 0);
-+
-+ if (buffer)
-+ yaffs_release_temp_buffer(dev, buffer);
-+
-+ if (new_chunk_id < 0)
-+ return new_chunk_id;
-+
-+ in->hdr_chunk = new_chunk_id;
-+
-+ if (prev_chunk_id > 0)
-+ yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__);
-+
-+ if (!yaffs_obj_cache_dirty(in))
-+ in->dirty = 0;
-+
-+ /* If this was a shrink, then mark the block
-+ * that the chunk lives on */
-+ if (is_shrink) {
-+ bi = yaffs_get_block_info(in->my_dev,
-+ new_chunk_id /
-+ in->my_dev->param.chunks_per_block);
-+ bi->has_shrink_hdr = 1;
-+ }
-+
-+
-+ return new_chunk_id;
-+}
-+
-+/*--------------------- File read/write ------------------------
-+ * Read and write have very similar structures.
-+ * In general the read/write has three parts to it
-+ * An incomplete chunk to start with (if the read/write is not chunk-aligned)
-+ * Some complete chunks
-+ * An incomplete chunk to end off with
-+ *
-+ * Curve-balls: the first chunk might also be the last chunk.
-+ */
-+
-+int yaffs_file_rd(struct yaffs_obj *in, u8 * buffer, loff_t offset, int n_bytes)
-+{
-+ int chunk;
-+ u32 start;
-+ int n_copy;
-+ int n = n_bytes;
-+ int n_done = 0;
-+ struct yaffs_cache *cache;
-+ struct yaffs_dev *dev;
-+
-+ dev = in->my_dev;
-+
-+ while (n > 0) {
-+ yaffs_addr_to_chunk(dev, offset, &chunk, &start);
-+ chunk++;
-+
-+ /* OK now check for the curveball where the start and end are in
-+ * the same chunk.
-+ */
-+ if ((start + n) < dev->data_bytes_per_chunk)
-+ n_copy = n;
-+ else
-+ n_copy = dev->data_bytes_per_chunk - start;
-+
-+ cache = yaffs_find_chunk_cache(in, chunk);
-+
-+ /* If the chunk is already in the cache or it is less than
-+ * a whole chunk or we're using inband tags then use the cache
-+ * (if there is caching) else bypass the cache.
-+ */
-+ if (cache || n_copy != dev->data_bytes_per_chunk ||
-+ dev->param.inband_tags) {
-+ if (dev->param.n_caches > 0) {
-+
-+ /* If we can't find the data in the cache,
-+ * then load it up. */
-+
-+ if (!cache) {
-+ cache =
-+ yaffs_grab_chunk_cache(in->my_dev);
-+ cache->object = in;
-+ cache->chunk_id = chunk;
-+ cache->dirty = 0;
-+ cache->locked = 0;
-+ yaffs_rd_data_obj(in, chunk,
-+ cache->data);
-+ cache->n_bytes = 0;
-+ }
-+
-+ yaffs_use_cache(dev, cache, 0);
-+
-+ cache->locked = 1;
-+
-+ memcpy(buffer, &cache->data[start], n_copy);
-+
-+ cache->locked = 0;
-+ } else {
-+ /* Read into the local buffer then copy.. */
-+
-+ u8 *local_buffer =
-+ yaffs_get_temp_buffer(dev);
-+ yaffs_rd_data_obj(in, chunk, local_buffer);
-+
-+ memcpy(buffer, &local_buffer[start], n_copy);
-+
-+ yaffs_release_temp_buffer(dev, local_buffer);
-+ }
-+ } else {
-+ /* A full chunk. Read directly into the buffer. */
-+ yaffs_rd_data_obj(in, chunk, buffer);
-+ }
-+ n -= n_copy;
-+ offset += n_copy;
-+ buffer += n_copy;
-+ n_done += n_copy;
-+ }
-+ return n_done;
-+}
-+
-+int yaffs_do_file_wr(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
-+ int n_bytes, int write_through)
-+{
-+
-+ int chunk;
-+ u32 start;
-+ int n_copy;
-+ int n = n_bytes;
-+ int n_done = 0;
-+ int n_writeback;
-+ loff_t start_write = offset;
-+ int chunk_written = 0;
-+ u32 n_bytes_read;
-+ loff_t chunk_start;
-+ struct yaffs_dev *dev;
-+
-+ dev = in->my_dev;
-+
-+ while (n > 0 && chunk_written >= 0) {
-+ yaffs_addr_to_chunk(dev, offset, &chunk, &start);
-+
-+ if (((loff_t)chunk) *
-+ dev->data_bytes_per_chunk + start != offset ||
-+ start >= dev->data_bytes_per_chunk) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "AddrToChunk of offset %lld gives chunk %d start %d",
-+ offset, chunk, start);
-+ }
-+ chunk++; /* File pos to chunk in file offset */
-+
-+ /* OK now check for the curveball where the start and end are in
-+ * the same chunk.
-+ */
-+
-+ if ((start + n) < dev->data_bytes_per_chunk) {
-+ n_copy = n;
-+
-+ /* Now calculate how many bytes to write back....
-+ * If we're overwriting and not writing to then end of
-+ * file then we need to write back as much as was there
-+ * before.
-+ */
-+
-+ chunk_start = (((loff_t)(chunk - 1)) *
-+ dev->data_bytes_per_chunk);
-+
-+ if (chunk_start > in->variant.file_variant.file_size)
-+ n_bytes_read = 0; /* Past end of file */
-+ else
-+ n_bytes_read =
-+ in->variant.file_variant.file_size -
-+ chunk_start;
-+
-+ if (n_bytes_read > dev->data_bytes_per_chunk)
-+ n_bytes_read = dev->data_bytes_per_chunk;
-+
-+ n_writeback =
-+ (n_bytes_read >
-+ (start + n)) ? n_bytes_read : (start + n);
-+
-+ if (n_writeback < 0 ||
-+ n_writeback > dev->data_bytes_per_chunk)
-+ BUG();
-+
-+ } else {
-+ n_copy = dev->data_bytes_per_chunk - start;
-+ n_writeback = dev->data_bytes_per_chunk;
-+ }
-+
-+ if (n_copy != dev->data_bytes_per_chunk ||
-+ !dev->param.cache_bypass_aligned ||
-+ dev->param.inband_tags) {
-+ /* An incomplete start or end chunk (or maybe both
-+ * start and end chunk), or we're using inband tags,
-+ * or we're forcing writes through the cache,
-+ * so we want to use the cache buffers.
-+ */
-+ if (dev->param.n_caches > 0) {
-+ struct yaffs_cache *cache;
-+
-+ /* If we can't find the data in the cache, then
-+ * load the cache */
-+ cache = yaffs_find_chunk_cache(in, chunk);
-+
-+ if (!cache &&
-+ yaffs_check_alloc_available(dev, 1)) {
-+ cache = yaffs_grab_chunk_cache(dev);
-+ cache->object = in;
-+ cache->chunk_id = chunk;
-+ cache->dirty = 0;
-+ cache->locked = 0;
-+ yaffs_rd_data_obj(in, chunk,
-+ cache->data);
-+ } else if (cache &&
-+ !cache->dirty &&
-+ !yaffs_check_alloc_available(dev,
-+ 1)) {
-+ /* Drop the cache if it was a read cache
-+ * item and no space check has been made
-+ * for it.
-+ */
-+ cache = NULL;
-+ }
-+
-+ if (cache) {
-+ yaffs_use_cache(dev, cache, 1);
-+ cache->locked = 1;
-+
-+ memcpy(&cache->data[start], buffer,
-+ n_copy);
-+
-+ cache->locked = 0;
-+ cache->n_bytes = n_writeback;
-+
-+ if (write_through) {
-+ chunk_written =
-+ yaffs_wr_data_obj
-+ (cache->object,
-+ cache->chunk_id,
-+ cache->data,
-+ cache->n_bytes, 1);
-+ cache->dirty = 0;
-+ }
-+ } else {
-+ chunk_written = -1; /* fail write */
-+ }
-+ } else {
-+ /* An incomplete start or end chunk (or maybe
-+ * both start and end chunk). Read into the
-+ * local buffer then copy over and write back.
-+ */
-+
-+ u8 *local_buffer = yaffs_get_temp_buffer(dev);
-+
-+ yaffs_rd_data_obj(in, chunk, local_buffer);
-+ memcpy(&local_buffer[start], buffer, n_copy);
-+
-+ chunk_written =
-+ yaffs_wr_data_obj(in, chunk,
-+ local_buffer,
-+ n_writeback, 0);
-+
-+ yaffs_release_temp_buffer(dev, local_buffer);
-+ }
-+ } else {
-+ /* A full chunk. Write directly from the buffer. */
-+
-+ chunk_written =
-+ yaffs_wr_data_obj(in, chunk, buffer,
-+ dev->data_bytes_per_chunk, 0);
-+
-+ /* Since we've overwritten the cached data,
-+ * we better invalidate it. */
-+ yaffs_invalidate_chunk_cache(in, chunk);
-+ }
-+
-+ if (chunk_written >= 0) {
-+ n -= n_copy;
-+ offset += n_copy;
-+ buffer += n_copy;
-+ n_done += n_copy;
-+ }
-+ }
-+
-+ /* Update file object */
-+
-+ if ((start_write + n_done) > in->variant.file_variant.file_size)
-+ in->variant.file_variant.file_size = (start_write + n_done);
-+
-+ in->dirty = 1;
-+ return n_done;
-+}
-+
-+int yaffs_wr_file(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
-+ int n_bytes, int write_through)
-+{
-+ yaffs2_handle_hole(in, offset);
-+ return yaffs_do_file_wr(in, buffer, offset, n_bytes, write_through);
-+}
-+
-+/* ---------------------- File resizing stuff ------------------ */
-+
-+static void yaffs_prune_chunks(struct yaffs_obj *in, loff_t new_size)
-+{
-+
-+ struct yaffs_dev *dev = in->my_dev;
-+ loff_t old_size = in->variant.file_variant.file_size;
-+ int i;
-+ int chunk_id;
-+ u32 dummy;
-+ int last_del;
-+ int start_del;
-+
-+ if (old_size > 0)
-+ yaffs_addr_to_chunk(dev, old_size - 1, &last_del, &dummy);
-+ else
-+ last_del = 0;
-+
-+ yaffs_addr_to_chunk(dev, new_size + dev->data_bytes_per_chunk - 1,
-+ &start_del, &dummy);
-+ last_del++;
-+ start_del++;
-+
-+ /* Delete backwards so that we don't end up with holes if
-+ * power is lost part-way through the operation.
-+ */
-+ for (i = last_del; i >= start_del; i--) {
-+ /* NB this could be optimised somewhat,
-+ * eg. could retrieve the tags and write them without
-+ * using yaffs_chunk_del
-+ */
-+
-+ chunk_id = yaffs_find_del_file_chunk(in, i, NULL);
-+
-+ if (chunk_id < 1)
-+ continue;
-+
-+ if (chunk_id <
-+ (dev->internal_start_block * dev->param.chunks_per_block) ||
-+ chunk_id >=
-+ ((dev->internal_end_block + 1) *
-+ dev->param.chunks_per_block)) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "Found daft chunk_id %d for %d",
-+ chunk_id, i);
-+ } else {
-+ in->n_data_chunks--;
-+ yaffs_chunk_del(dev, chunk_id, 1, __LINE__);
-+ }
-+ }
-+}
-+
-+void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size)
-+{
-+ int new_full;
-+ u32 new_partial;
-+ struct yaffs_dev *dev = obj->my_dev;
-+
-+ yaffs_addr_to_chunk(dev, new_size, &new_full, &new_partial);
-+
-+ yaffs_prune_chunks(obj, new_size);
-+
-+ if (new_partial != 0) {
-+ int last_chunk = 1 + new_full;
-+ u8 *local_buffer = yaffs_get_temp_buffer(dev);
-+
-+ /* Rewrite the last chunk with its new size and zero pad */
-+ yaffs_rd_data_obj(obj, last_chunk, local_buffer);
-+ memset(local_buffer + new_partial, 0,
-+ dev->data_bytes_per_chunk - new_partial);
-+
-+ yaffs_wr_data_obj(obj, last_chunk, local_buffer,
-+ new_partial, 1);
-+
-+ yaffs_release_temp_buffer(dev, local_buffer);
-+ }
-+
-+ obj->variant.file_variant.file_size = new_size;
-+
-+ yaffs_prune_tree(dev, &obj->variant.file_variant);
-+}
-+
-+int yaffs_resize_file(struct yaffs_obj *in, loff_t new_size)
-+{
-+ struct yaffs_dev *dev = in->my_dev;
-+ loff_t old_size = in->variant.file_variant.file_size;
-+
-+ yaffs_flush_file_cache(in);
-+ yaffs_invalidate_whole_cache(in);
-+
-+ yaffs_check_gc(dev, 0);
-+
-+ if (in->variant_type != YAFFS_OBJECT_TYPE_FILE)
-+ return YAFFS_FAIL;
-+
-+ if (new_size == old_size)
-+ return YAFFS_OK;
-+
-+ if (new_size > old_size) {
-+ yaffs2_handle_hole(in, new_size);
-+ in->variant.file_variant.file_size = new_size;
-+ } else {
-+ /* new_size < old_size */
-+ yaffs_resize_file_down(in, new_size);
-+ }
-+
-+ /* Write a new object header to reflect the resize.
-+ * show we've shrunk the file, if need be
-+ * Do this only if the file is not in the deleted directories
-+ * and is not shadowed.
-+ */
-+ if (in->parent &&
-+ !in->is_shadowed &&
-+ in->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
-+ in->parent->obj_id != YAFFS_OBJECTID_DELETED)
-+ yaffs_update_oh(in, NULL, 0, 0, 0, NULL);
-+
-+ return YAFFS_OK;
-+}
-+
-+int yaffs_flush_file(struct yaffs_obj *in, int update_time, int data_sync)
-+{
-+ if (!in->dirty)
-+ return YAFFS_OK;
-+
-+ yaffs_flush_file_cache(in);
-+
-+ if (data_sync)
-+ return YAFFS_OK;
-+
-+ if (update_time)
-+ yaffs_load_current_time(in, 0, 0);
-+
-+ return (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >= 0) ?
-+ YAFFS_OK : YAFFS_FAIL;
-+}
-+
-+
-+/* yaffs_del_file deletes the whole file data
-+ * and the inode associated with the file.
-+ * It does not delete the links associated with the file.
-+ */
-+static int yaffs_unlink_file_if_needed(struct yaffs_obj *in)
-+{
-+ int ret_val;
-+ int del_now = 0;
-+ struct yaffs_dev *dev = in->my_dev;
-+
-+ if (!in->my_inode)
-+ del_now = 1;
-+
-+ if (del_now) {
-+ ret_val =
-+ yaffs_change_obj_name(in, in->my_dev->del_dir,
-+ _Y("deleted"), 0, 0);
-+ yaffs_trace(YAFFS_TRACE_TRACING,
-+ "yaffs: immediate deletion of file %d",
-+ in->obj_id);
-+ in->deleted = 1;
-+ in->my_dev->n_deleted_files++;
-+ if (dev->param.disable_soft_del || dev->param.is_yaffs2)
-+ yaffs_resize_file(in, 0);
-+ yaffs_soft_del_file(in);
-+ } else {
-+ ret_val =
-+ yaffs_change_obj_name(in, in->my_dev->unlinked_dir,
-+ _Y("unlinked"), 0, 0);
-+ }
-+ return ret_val;
-+}
-+
-+static int yaffs_del_file(struct yaffs_obj *in)
-+{
-+ int ret_val = YAFFS_OK;
-+ int deleted; /* Need to cache value on stack if in is freed */
-+ struct yaffs_dev *dev = in->my_dev;
-+
-+ if (dev->param.disable_soft_del || dev->param.is_yaffs2)
-+ yaffs_resize_file(in, 0);
-+
-+ if (in->n_data_chunks > 0) {
-+ /* Use soft deletion if there is data in the file.
-+ * That won't be the case if it has been resized to zero.
-+ */
-+ if (!in->unlinked)
-+ ret_val = yaffs_unlink_file_if_needed(in);
-+
-+ deleted = in->deleted;
-+
-+ if (ret_val == YAFFS_OK && in->unlinked && !in->deleted) {
-+ in->deleted = 1;
-+ deleted = 1;
-+ in->my_dev->n_deleted_files++;
-+ yaffs_soft_del_file(in);
-+ }
-+ return deleted ? YAFFS_OK : YAFFS_FAIL;
-+ } else {
-+ /* The file has no data chunks so we toss it immediately */
-+ yaffs_free_tnode(in->my_dev, in->variant.file_variant.top);
-+ in->variant.file_variant.top = NULL;
-+ yaffs_generic_obj_del(in);
-+
-+ return YAFFS_OK;
-+ }
-+}
-+
-+int yaffs_is_non_empty_dir(struct yaffs_obj *obj)
-+{
-+ return (obj &&
-+ obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) &&
-+ !(list_empty(&obj->variant.dir_variant.children));
-+}
-+
-+static int yaffs_del_dir(struct yaffs_obj *obj)
-+{
-+ /* First check that the directory is empty. */
-+ if (yaffs_is_non_empty_dir(obj))
-+ return YAFFS_FAIL;
-+
-+ return yaffs_generic_obj_del(obj);
-+}
-+
-+static int yaffs_del_symlink(struct yaffs_obj *in)
-+{
-+ kfree(in->variant.symlink_variant.alias);
-+ in->variant.symlink_variant.alias = NULL;
-+
-+ return yaffs_generic_obj_del(in);
-+}
-+
-+static int yaffs_del_link(struct yaffs_obj *in)
-+{
-+ /* remove this hardlink from the list associated with the equivalent
-+ * object
-+ */
-+ list_del_init(&in->hard_links);
-+ return yaffs_generic_obj_del(in);
-+}
-+
-+int yaffs_del_obj(struct yaffs_obj *obj)
-+{
-+ int ret_val = -1;
-+
-+ switch (obj->variant_type) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ ret_val = yaffs_del_file(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ if (!list_empty(&obj->variant.dir_variant.dirty)) {
-+ yaffs_trace(YAFFS_TRACE_BACKGROUND,
-+ "Remove object %d from dirty directories",
-+ obj->obj_id);
-+ list_del_init(&obj->variant.dir_variant.dirty);
-+ }
-+ return yaffs_del_dir(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ ret_val = yaffs_del_symlink(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ ret_val = yaffs_del_link(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ ret_val = yaffs_generic_obj_del(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ ret_val = 0;
-+ break; /* should not happen. */
-+ }
-+ return ret_val;
-+}
-+
-+
-+static void yaffs_empty_dir_to_dir(struct yaffs_obj *from_dir,
-+ struct yaffs_obj *to_dir)
-+{
-+ struct yaffs_obj *obj;
-+ struct list_head *lh;
-+ struct list_head *n;
-+
-+ list_for_each_safe(lh, n, &from_dir->variant.dir_variant.children) {
-+ obj = list_entry(lh, struct yaffs_obj, siblings);
-+ yaffs_add_obj_to_dir(to_dir, obj);
-+ }
-+}
-+
-+struct yaffs_obj *yaffs_retype_obj(struct yaffs_obj *obj,
-+ enum yaffs_obj_type type)
-+{
-+ /* Tear down the old variant */
-+ switch (obj->variant_type) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ /* Nuke file data */
-+ yaffs_resize_file(obj, 0);
-+ yaffs_free_tnode(obj->my_dev, obj->variant.file_variant.top);
-+ obj->variant.file_variant.top = NULL;
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ /* Put the children in lost and found. */
-+ yaffs_empty_dir_to_dir(obj, obj->my_dev->lost_n_found);
-+ if (!list_empty(&obj->variant.dir_variant.dirty))
-+ list_del_init(&obj->variant.dir_variant.dirty);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ /* Nuke symplink data */
-+ kfree(obj->variant.symlink_variant.alias);
-+ obj->variant.symlink_variant.alias = NULL;
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ list_del_init(&obj->hard_links);
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ memset(&obj->variant, 0, sizeof(obj->variant));
-+
-+ /*Set up new variant if the memset is not enough. */
-+ switch (type) {
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ INIT_LIST_HEAD(&obj->variant.dir_variant.children);
-+ INIT_LIST_HEAD(&obj->variant.dir_variant.dirty);
-+ break;
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ default:
-+ break;
-+ }
-+
-+ obj->variant_type = type;
-+
-+ return obj;
-+
-+}
-+
-+static int yaffs_unlink_worker(struct yaffs_obj *obj)
-+{
-+ int del_now = 0;
-+
-+ if (!obj)
-+ return YAFFS_FAIL;
-+
-+ if (!obj->my_inode)
-+ del_now = 1;
-+
-+ yaffs_update_parent(obj->parent);
-+
-+ if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
-+ return yaffs_del_link(obj);
-+ } else if (!list_empty(&obj->hard_links)) {
-+ /* Curve ball: We're unlinking an object that has a hardlink.
-+ *
-+ * This problem arises because we are not strictly following
-+ * The Linux link/inode model.
-+ *
-+ * We can't really delete the object.
-+ * Instead, we do the following:
-+ * - Select a hardlink.
-+ * - Unhook it from the hard links
-+ * - Move it from its parent directory so that the rename works.
-+ * - Rename the object to the hardlink's name.
-+ * - Delete the hardlink
-+ */
-+
-+ struct yaffs_obj *hl;
-+ struct yaffs_obj *parent;
-+ int ret_val;
-+ YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
-+
-+ hl = list_entry(obj->hard_links.next, struct yaffs_obj,
-+ hard_links);
-+
-+ yaffs_get_obj_name(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
-+ parent = hl->parent;
-+
-+ list_del_init(&hl->hard_links);
-+
-+ yaffs_add_obj_to_dir(obj->my_dev->unlinked_dir, hl);
-+
-+ ret_val = yaffs_change_obj_name(obj, parent, name, 0, 0);
-+
-+ if (ret_val == YAFFS_OK)
-+ ret_val = yaffs_generic_obj_del(hl);
-+
-+ return ret_val;
-+
-+ } else if (del_now) {
-+ switch (obj->variant_type) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ return yaffs_del_file(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ list_del_init(&obj->variant.dir_variant.dirty);
-+ return yaffs_del_dir(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ return yaffs_del_symlink(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ return yaffs_generic_obj_del(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ default:
-+ return YAFFS_FAIL;
-+ }
-+ } else if (yaffs_is_non_empty_dir(obj)) {
-+ return YAFFS_FAIL;
-+ } else {
-+ return yaffs_change_obj_name(obj, obj->my_dev->unlinked_dir,
-+ _Y("unlinked"), 0, 0);
-+ }
-+}
-+
-+static int yaffs_unlink_obj(struct yaffs_obj *obj)
-+{
-+ if (obj && obj->unlink_allowed)
-+ return yaffs_unlink_worker(obj);
-+
-+ return YAFFS_FAIL;
-+}
-+
-+int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR *name)
-+{
-+ struct yaffs_obj *obj;
-+
-+ obj = yaffs_find_by_name(dir, name);
-+ return yaffs_unlink_obj(obj);
-+}
-+
-+/* Note:
-+ * If old_name is NULL then we take old_dir as the object to be renamed.
-+ */
-+int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR *old_name,
-+ struct yaffs_obj *new_dir, const YCHAR *new_name)
-+{
-+ struct yaffs_obj *obj = NULL;
-+ struct yaffs_obj *existing_target = NULL;
-+ int force = 0;
-+ int result;
-+ struct yaffs_dev *dev;
-+
-+ if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ BUG();
-+ return YAFFS_FAIL;
-+ }
-+ if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ BUG();
-+ return YAFFS_FAIL;
-+ }
-+
-+ dev = old_dir->my_dev;
-+
-+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-+ /* Special case for case insemsitive systems.
-+ * While look-up is case insensitive, the name isn't.
-+ * Therefore we might want to change x.txt to X.txt
-+ */
-+ if (old_dir == new_dir &&
-+ old_name && new_name &&
-+ strcmp(old_name, new_name) == 0)
-+ force = 1;
-+#endif
-+
-+ if (strnlen(new_name, YAFFS_MAX_NAME_LENGTH + 1) >
-+ YAFFS_MAX_NAME_LENGTH)
-+ /* ENAMETOOLONG */
-+ return YAFFS_FAIL;
-+
-+ if (old_name)
-+ obj = yaffs_find_by_name(old_dir, old_name);
-+ else{
-+ obj = old_dir;
-+ old_dir = obj->parent;
-+ }
-+
-+ if (obj && obj->rename_allowed) {
-+ /* Now handle an existing target, if there is one */
-+ existing_target = yaffs_find_by_name(new_dir, new_name);
-+ if (yaffs_is_non_empty_dir(existing_target)) {
-+ return YAFFS_FAIL; /* ENOTEMPTY */
-+ } else if (existing_target && existing_target != obj) {
-+ /* Nuke the target first, using shadowing,
-+ * but only if it isn't the same object.
-+ *
-+ * Note we must disable gc here otherwise it can mess
-+ * up the shadowing.
-+ *
-+ */
-+ dev->gc_disable = 1;
-+ yaffs_change_obj_name(obj, new_dir, new_name, force,
-+ existing_target->obj_id);
-+ existing_target->is_shadowed = 1;
-+ yaffs_unlink_obj(existing_target);
-+ dev->gc_disable = 0;
-+ }
-+
-+ result = yaffs_change_obj_name(obj, new_dir, new_name, 1, 0);
-+
-+ yaffs_update_parent(old_dir);
-+ if (new_dir != old_dir)
-+ yaffs_update_parent(new_dir);
-+
-+ return result;
-+ }
-+ return YAFFS_FAIL;
-+}
-+
-+/*----------------------- Initialisation Scanning ---------------------- */
-+
-+void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id,
-+ int backward_scanning)
-+{
-+ struct yaffs_obj *obj;
-+
-+ if (backward_scanning) {
-+ /* Handle YAFFS2 case (backward scanning)
-+ * If the shadowed object exists then ignore.
-+ */
-+ obj = yaffs_find_by_number(dev, obj_id);
-+ if (obj)
-+ return;
-+ }
-+
-+ /* Let's create it (if it does not exist) assuming it is a file so that
-+ * it can do shrinking etc.
-+ * We put it in unlinked dir to be cleaned up after the scanning
-+ */
-+ obj =
-+ yaffs_find_or_create_by_number(dev, obj_id, YAFFS_OBJECT_TYPE_FILE);
-+ if (!obj)
-+ return;
-+ obj->is_shadowed = 1;
-+ yaffs_add_obj_to_dir(dev->unlinked_dir, obj);
-+ obj->variant.file_variant.shrink_size = 0;
-+ obj->valid = 1; /* So that we don't read any other info. */
-+}
-+
-+void yaffs_link_fixup(struct yaffs_dev *dev, struct list_head *hard_list)
-+{
-+ struct list_head *lh;
-+ struct list_head *save;
-+ struct yaffs_obj *hl;
-+ struct yaffs_obj *in;
-+
-+ list_for_each_safe(lh, save, hard_list) {
-+ hl = list_entry(lh, struct yaffs_obj, hard_links);
-+ in = yaffs_find_by_number(dev,
-+ hl->variant.hardlink_variant.equiv_id);
-+
-+ if (in) {
-+ /* Add the hardlink pointers */
-+ hl->variant.hardlink_variant.equiv_obj = in;
-+ list_add(&hl->hard_links, &in->hard_links);
-+ } else {
-+ /* Todo Need to report/handle this better.
-+ * Got a problem... hardlink to a non-existant object
-+ */
-+ hl->variant.hardlink_variant.equiv_obj = NULL;
-+ INIT_LIST_HEAD(&hl->hard_links);
-+ }
-+ }
-+}
-+
-+static void yaffs_strip_deleted_objs(struct yaffs_dev *dev)
-+{
-+ /*
-+ * Sort out state of unlinked and deleted objects after scanning.
-+ */
-+ struct list_head *i;
-+ struct list_head *n;
-+ struct yaffs_obj *l;
-+
-+ if (dev->read_only)
-+ return;
-+
-+ /* Soft delete all the unlinked files */
-+ list_for_each_safe(i, n,
-+ &dev->unlinked_dir->variant.dir_variant.children) {
-+ l = list_entry(i, struct yaffs_obj, siblings);
-+ yaffs_del_obj(l);
-+ }
-+
-+ list_for_each_safe(i, n, &dev->del_dir->variant.dir_variant.children) {
-+ l = list_entry(i, struct yaffs_obj, siblings);
-+ yaffs_del_obj(l);
-+ }
-+}
-+
-+/*
-+ * This code iterates through all the objects making sure that they are rooted.
-+ * Any unrooted objects are re-rooted in lost+found.
-+ * An object needs to be in one of:
-+ * - Directly under deleted, unlinked
-+ * - Directly or indirectly under root.
-+ *
-+ * Note:
-+ * This code assumes that we don't ever change the current relationships
-+ * between directories:
-+ * root_dir->parent == unlinked_dir->parent == del_dir->parent == NULL
-+ * lost-n-found->parent == root_dir
-+ *
-+ * This fixes the problem where directories might have inadvertently been
-+ * deleted leaving the object "hanging" without being rooted in the
-+ * directory tree.
-+ */
-+
-+static int yaffs_has_null_parent(struct yaffs_dev *dev, struct yaffs_obj *obj)
-+{
-+ return (obj == dev->del_dir ||
-+ obj == dev->unlinked_dir || obj == dev->root_dir);
-+}
-+
-+static void yaffs_fix_hanging_objs(struct yaffs_dev *dev)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_obj *parent;
-+ int i;
-+ struct list_head *lh;
-+ struct list_head *n;
-+ int depth_limit;
-+ int hanging;
-+
-+ if (dev->read_only)
-+ return;
-+
-+ /* Iterate through the objects in each hash entry,
-+ * looking at each object.
-+ * Make sure it is rooted.
-+ */
-+
-+ for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-+ list_for_each_safe(lh, n, &dev->obj_bucket[i].list) {
-+ obj = list_entry(lh, struct yaffs_obj, hash_link);
-+ parent = obj->parent;
-+
-+ if (yaffs_has_null_parent(dev, obj)) {
-+ /* These directories are not hanging */
-+ hanging = 0;
-+ } else if (!parent ||
-+ parent->variant_type !=
-+ YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ hanging = 1;
-+ } else if (yaffs_has_null_parent(dev, parent)) {
-+ hanging = 0;
-+ } else {
-+ /*
-+ * Need to follow the parent chain to
-+ * see if it is hanging.
-+ */
-+ hanging = 0;
-+ depth_limit = 100;
-+
-+ while (parent != dev->root_dir &&
-+ parent->parent &&
-+ parent->parent->variant_type ==
-+ YAFFS_OBJECT_TYPE_DIRECTORY &&
-+ depth_limit > 0) {
-+ parent = parent->parent;
-+ depth_limit--;
-+ }
-+ if (parent != dev->root_dir)
-+ hanging = 1;
-+ }
-+ if (hanging) {
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ "Hanging object %d moved to lost and found",
-+ obj->obj_id);
-+ yaffs_add_obj_to_dir(dev->lost_n_found, obj);
-+ }
-+ }
-+ }
-+}
-+
-+/*
-+ * Delete directory contents for cleaning up lost and found.
-+ */
-+static void yaffs_del_dir_contents(struct yaffs_obj *dir)
-+{
-+ struct yaffs_obj *obj;
-+ struct list_head *lh;
-+ struct list_head *n;
-+
-+ if (dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
-+ BUG();
-+
-+ list_for_each_safe(lh, n, &dir->variant.dir_variant.children) {
-+ obj = list_entry(lh, struct yaffs_obj, siblings);
-+ if (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
-+ yaffs_del_dir_contents(obj);
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ "Deleting lost_found object %d",
-+ obj->obj_id);
-+ yaffs_unlink_obj(obj);
-+ }
-+}
-+
-+static void yaffs_empty_l_n_f(struct yaffs_dev *dev)
-+{
-+ yaffs_del_dir_contents(dev->lost_n_found);
-+}
-+
-+
-+struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory,
-+ const YCHAR *name)
-+{
-+ int sum;
-+ struct list_head *i;
-+ YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
-+ struct yaffs_obj *l;
-+
-+ if (!name)
-+ return NULL;
-+
-+ if (!directory) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "tragedy: yaffs_find_by_name: null pointer directory"
-+ );
-+ BUG();
-+ return NULL;
-+ }
-+ if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "tragedy: yaffs_find_by_name: non-directory"
-+ );
-+ BUG();
-+ }
-+
-+ sum = yaffs_calc_name_sum(name);
-+
-+ list_for_each(i, &directory->variant.dir_variant.children) {
-+ l = list_entry(i, struct yaffs_obj, siblings);
-+
-+ if (l->parent != directory)
-+ BUG();
-+
-+ yaffs_check_obj_details_loaded(l);
-+
-+ /* Special case for lost-n-found */
-+ if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
-+ if (!strcmp(name, YAFFS_LOSTNFOUND_NAME))
-+ return l;
-+ } else if (l->sum == sum || l->hdr_chunk <= 0) {
-+ /* LostnFound chunk called Objxxx
-+ * Do a real check
-+ */
-+ yaffs_get_obj_name(l, buffer,
-+ YAFFS_MAX_NAME_LENGTH + 1);
-+ if (!strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH))
-+ return l;
-+ }
-+ }
-+ return NULL;
-+}
-+
-+/* GetEquivalentObject dereferences any hard links to get to the
-+ * actual object.
-+ */
-+
-+struct yaffs_obj *yaffs_get_equivalent_obj(struct yaffs_obj *obj)
-+{
-+ if (obj && obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
-+ obj = obj->variant.hardlink_variant.equiv_obj;
-+ yaffs_check_obj_details_loaded(obj);
-+ }
-+ return obj;
-+}
-+
-+/*
-+ * A note or two on object names.
-+ * * If the object name is missing, we then make one up in the form objnnn
-+ *
-+ * * ASCII names are stored in the object header's name field from byte zero
-+ * * Unicode names are historically stored starting from byte zero.
-+ *
-+ * Then there are automatic Unicode names...
-+ * The purpose of these is to save names in a way that can be read as
-+ * ASCII or Unicode names as appropriate, thus allowing a Unicode and ASCII
-+ * system to share files.
-+ *
-+ * These automatic unicode are stored slightly differently...
-+ * - If the name can fit in the ASCII character space then they are saved as
-+ * ascii names as per above.
-+ * - If the name needs Unicode then the name is saved in Unicode
-+ * starting at oh->name[1].
-+
-+ */
-+static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name,
-+ int buffer_size)
-+{
-+ /* Create an object name if we could not find one. */
-+ if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) {
-+ YCHAR local_name[20];
-+ YCHAR num_string[20];
-+ YCHAR *x = &num_string[19];
-+ unsigned v = obj->obj_id;
-+ num_string[19] = 0;
-+ while (v > 0) {
-+ x--;
-+ *x = '0' + (v % 10);
-+ v /= 10;
-+ }
-+ /* make up a name */
-+ strcpy(local_name, YAFFS_LOSTNFOUND_PREFIX);
-+ strcat(local_name, x);
-+ strncpy(name, local_name, buffer_size - 1);
-+ }
-+}
-+
-+int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size)
-+{
-+ memset(name, 0, buffer_size * sizeof(YCHAR));
-+ yaffs_check_obj_details_loaded(obj);
-+ if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
-+ strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1);
-+ } else if (obj->short_name[0]) {
-+ strcpy(name, obj->short_name);
-+ } else if (obj->hdr_chunk > 0) {
-+ int result;
-+ u8 *buffer = yaffs_get_temp_buffer(obj->my_dev);
-+
-+ struct yaffs_obj_hdr *oh = (struct yaffs_obj_hdr *)buffer;
-+
-+ memset(buffer, 0, obj->my_dev->data_bytes_per_chunk);
-+
-+ if (obj->hdr_chunk > 0) {
-+ result = yaffs_rd_chunk_tags_nand(obj->my_dev,
-+ obj->hdr_chunk,
-+ buffer, NULL);
-+ }
-+ yaffs_load_name_from_oh(obj->my_dev, name, oh->name,
-+ buffer_size);
-+
-+ yaffs_release_temp_buffer(obj->my_dev, buffer);
-+ }
-+
-+ yaffs_fix_null_name(obj, name, buffer_size);
-+
-+ return strnlen(name, YAFFS_MAX_NAME_LENGTH);
-+}
-+
-+loff_t yaffs_get_obj_length(struct yaffs_obj *obj)
-+{
-+ /* Dereference any hard linking */
-+ obj = yaffs_get_equivalent_obj(obj);
-+
-+ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
-+ return obj->variant.file_variant.file_size;
-+ if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
-+ if (!obj->variant.symlink_variant.alias)
-+ return 0;
-+ return strnlen(obj->variant.symlink_variant.alias,
-+ YAFFS_MAX_ALIAS_LENGTH);
-+ } else {
-+ /* Only a directory should drop through to here */
-+ return obj->my_dev->data_bytes_per_chunk;
-+ }
-+}
-+
-+int yaffs_get_obj_link_count(struct yaffs_obj *obj)
-+{
-+ int count = 0;
-+ struct list_head *i;
-+
-+ if (!obj->unlinked)
-+ count++; /* the object itself */
-+
-+ list_for_each(i, &obj->hard_links)
-+ count++; /* add the hard links; */
-+
-+ return count;
-+}
-+
-+int yaffs_get_obj_inode(struct yaffs_obj *obj)
-+{
-+ obj = yaffs_get_equivalent_obj(obj);
-+
-+ return obj->obj_id;
-+}
-+
-+unsigned yaffs_get_obj_type(struct yaffs_obj *obj)
-+{
-+ obj = yaffs_get_equivalent_obj(obj);
-+
-+ switch (obj->variant_type) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ return DT_REG;
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ return DT_DIR;
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ return DT_LNK;
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ return DT_REG;
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ if (S_ISFIFO(obj->yst_mode))
-+ return DT_FIFO;
-+ if (S_ISCHR(obj->yst_mode))
-+ return DT_CHR;
-+ if (S_ISBLK(obj->yst_mode))
-+ return DT_BLK;
-+ if (S_ISSOCK(obj->yst_mode))
-+ return DT_SOCK;
-+ return DT_REG;
-+ break;
-+ default:
-+ return DT_REG;
-+ break;
-+ }
-+}
-+
-+YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj)
-+{
-+ obj = yaffs_get_equivalent_obj(obj);
-+ if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK)
-+ return yaffs_clone_str(obj->variant.symlink_variant.alias);
-+ else
-+ return yaffs_clone_str(_Y(""));
-+}
-+
-+/*--------------------------- Initialisation code -------------------------- */
-+
-+static int yaffs_check_dev_fns(struct yaffs_dev *dev)
-+{
-+ struct yaffs_driver *drv = &dev->drv;
-+ struct yaffs_tags_handler *tagger = &dev->tagger;
-+
-+ /* Common functions, gotta have */
-+ if (!drv->drv_read_chunk_fn ||
-+ !drv->drv_write_chunk_fn ||
-+ !drv->drv_erase_fn)
-+ return 0;
-+
-+ if (dev->param.is_yaffs2 &&
-+ (!drv->drv_mark_bad_fn || !drv->drv_check_bad_fn))
-+ return 0;
-+
-+ /* Install the default tags marshalling functions if needed. */
-+ yaffs_tags_compat_install(dev);
-+ yaffs_tags_marshall_install(dev);
-+
-+ /* Check we now have the marshalling functions required. */
-+ if (!tagger->write_chunk_tags_fn ||
-+ !tagger->read_chunk_tags_fn ||
-+ !tagger->query_block_fn ||
-+ !tagger->mark_bad_fn)
-+ return 0;
-+
-+ return 1;
-+}
-+
-+static int yaffs_create_initial_dir(struct yaffs_dev *dev)
-+{
-+ /* Initialise the unlinked, deleted, root and lost+found directories */
-+ dev->lost_n_found = dev->root_dir = NULL;
-+ dev->unlinked_dir = dev->del_dir = NULL;
-+ dev->unlinked_dir =
-+ yaffs_create_fake_dir(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR);
-+ dev->del_dir =
-+ yaffs_create_fake_dir(dev, YAFFS_OBJECTID_DELETED, S_IFDIR);
-+ dev->root_dir =
-+ yaffs_create_fake_dir(dev, YAFFS_OBJECTID_ROOT,
-+ YAFFS_ROOT_MODE | S_IFDIR);
-+ dev->lost_n_found =
-+ yaffs_create_fake_dir(dev, YAFFS_OBJECTID_LOSTNFOUND,
-+ YAFFS_LOSTNFOUND_MODE | S_IFDIR);
-+
-+ if (dev->lost_n_found && dev->root_dir && dev->unlinked_dir
-+ && dev->del_dir) {
-+ yaffs_add_obj_to_dir(dev->root_dir, dev->lost_n_found);
-+ return YAFFS_OK;
-+ }
-+ return YAFFS_FAIL;
-+}
-+
-+/* Low level init.
-+ * Typically only used by yaffs_guts_initialise, but also used by the
-+ * Low level yaffs driver tests.
-+ */
-+
-+int yaffs_guts_ll_init(struct yaffs_dev *dev)
-+{
-+
-+
-+ yaffs_trace(YAFFS_TRACE_TRACING, "yaffs: yaffs_ll_init()");
-+
-+ if (!dev) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs: Need a device"
-+ );
-+ return YAFFS_FAIL;
-+ }
-+
-+ if (dev->ll_init)
-+ return YAFFS_OK;
-+
-+ dev->internal_start_block = dev->param.start_block;
-+ dev->internal_end_block = dev->param.end_block;
-+ dev->block_offset = 0;
-+ dev->chunk_offset = 0;
-+ dev->n_free_chunks = 0;
-+
-+ dev->gc_block = 0;
-+
-+ if (dev->param.start_block == 0) {
-+ dev->internal_start_block = dev->param.start_block + 1;
-+ dev->internal_end_block = dev->param.end_block + 1;
-+ dev->block_offset = 1;
-+ dev->chunk_offset = dev->param.chunks_per_block;
-+ }
-+
-+ /* Check geometry parameters. */
-+
-+ if ((!dev->param.inband_tags && dev->param.is_yaffs2 &&
-+ dev->param.total_bytes_per_chunk < 1024) ||
-+ (!dev->param.is_yaffs2 &&
-+ dev->param.total_bytes_per_chunk < 512) ||
-+ (dev->param.inband_tags && !dev->param.is_yaffs2) ||
-+ dev->param.chunks_per_block < 2 ||
-+ dev->param.n_reserved_blocks < 2 ||
-+ dev->internal_start_block <= 0 ||
-+ dev->internal_end_block <= 0 ||
-+ dev->internal_end_block <=
-+ (dev->internal_start_block + dev->param.n_reserved_blocks + 2)
-+ ) {
-+ /* otherwise it is too small */
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "NAND geometry problems: chunk size %d, type is yaffs%s, inband_tags %d ",
-+ dev->param.total_bytes_per_chunk,
-+ dev->param.is_yaffs2 ? "2" : "",
-+ dev->param.inband_tags);
-+ return YAFFS_FAIL;
-+ }
-+
-+ /* Sort out space for inband tags, if required */
-+ if (dev->param.inband_tags)
-+ dev->data_bytes_per_chunk =
-+ dev->param.total_bytes_per_chunk -
-+ sizeof(struct yaffs_packed_tags2_tags_only);
-+ else
-+ dev->data_bytes_per_chunk = dev->param.total_bytes_per_chunk;
-+
-+ /* Got the right mix of functions? */
-+ if (!yaffs_check_dev_fns(dev)) {
-+ /* Function missing */
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "device function(s) missing or wrong");
-+
-+ return YAFFS_FAIL;
-+ }
-+
-+ if (yaffs_init_nand(dev) != YAFFS_OK) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "InitialiseNAND failed");
-+ return YAFFS_FAIL;
-+ }
-+
-+ return YAFFS_OK;
-+}
-+
-+
-+int yaffs_guts_format_dev(struct yaffs_dev *dev)
-+{
-+ int i;
-+ enum yaffs_block_state state;
-+ u32 dummy;
-+
-+ if(yaffs_guts_ll_init(dev) != YAFFS_OK)
-+ return YAFFS_FAIL;
-+
-+ if(dev->is_mounted)
-+ return YAFFS_FAIL;
-+
-+ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-+ yaffs_query_init_block_state(dev, i, &state, &dummy);
-+ if (state != YAFFS_BLOCK_STATE_DEAD)
-+ yaffs_erase_block(dev, i);
-+ }
-+
-+ return YAFFS_OK;
-+}
-+
-+
-+int yaffs_guts_initialise(struct yaffs_dev *dev)
-+{
-+ int init_failed = 0;
-+ unsigned x;
-+ int bits;
-+
-+ if(yaffs_guts_ll_init(dev) != YAFFS_OK)
-+ return YAFFS_FAIL;
-+
-+ if (dev->is_mounted) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "device already mounted");
-+ return YAFFS_FAIL;
-+ }
-+
-+ dev->is_mounted = 1;
-+
-+ /* OK now calculate a few things for the device */
-+
-+ /*
-+ * Calculate all the chunk size manipulation numbers:
-+ */
-+ x = dev->data_bytes_per_chunk;
-+ /* We always use dev->chunk_shift and dev->chunk_div */
-+ dev->chunk_shift = calc_shifts(x);
-+ x >>= dev->chunk_shift;
-+ dev->chunk_div = x;
-+ /* We only use chunk mask if chunk_div is 1 */
-+ dev->chunk_mask = (1 << dev->chunk_shift) - 1;
-+
-+ /*
-+ * Calculate chunk_grp_bits.
-+ * We need to find the next power of 2 > than internal_end_block
-+ */
-+
-+ x = dev->param.chunks_per_block * (dev->internal_end_block + 1);
-+
-+ bits = calc_shifts_ceiling(x);
-+
-+ /* Set up tnode width if wide tnodes are enabled. */
-+ if (!dev->param.wide_tnodes_disabled) {
-+ /* bits must be even so that we end up with 32-bit words */
-+ if (bits & 1)
-+ bits++;
-+ if (bits < 16)
-+ dev->tnode_width = 16;
-+ else
-+ dev->tnode_width = bits;
-+ } else {
-+ dev->tnode_width = 16;
-+ }
-+
-+ dev->tnode_mask = (1 << dev->tnode_width) - 1;
-+
-+ /* Level0 Tnodes are 16 bits or wider (if wide tnodes are enabled),
-+ * so if the bitwidth of the
-+ * chunk range we're using is greater than 16 we need
-+ * to figure out chunk shift and chunk_grp_size
-+ */
-+
-+ if (bits <= dev->tnode_width)
-+ dev->chunk_grp_bits = 0;
-+ else
-+ dev->chunk_grp_bits = bits - dev->tnode_width;
-+
-+ dev->tnode_size = (dev->tnode_width * YAFFS_NTNODES_LEVEL0) / 8;
-+ if (dev->tnode_size < sizeof(struct yaffs_tnode))
-+ dev->tnode_size = sizeof(struct yaffs_tnode);
-+
-+ dev->chunk_grp_size = 1 << dev->chunk_grp_bits;
-+
-+ if (dev->param.chunks_per_block < dev->chunk_grp_size) {
-+ /* We have a problem because the soft delete won't work if
-+ * the chunk group size > chunks per block.
-+ * This can be remedied by using larger "virtual blocks".
-+ */
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "chunk group too large");
-+
-+ return YAFFS_FAIL;
-+ }
-+
-+ /* Finished verifying the device, continue with initialisation */
-+
-+ /* More device initialisation */
-+ dev->all_gcs = 0;
-+ dev->passive_gc_count = 0;
-+ dev->oldest_dirty_gc_count = 0;
-+ dev->bg_gcs = 0;
-+ dev->gc_block_finder = 0;
-+ dev->buffered_block = -1;
-+ dev->doing_buffered_block_rewrite = 0;
-+ dev->n_deleted_files = 0;
-+ dev->n_bg_deletions = 0;
-+ dev->n_unlinked_files = 0;
-+ dev->n_ecc_fixed = 0;
-+ dev->n_ecc_unfixed = 0;
-+ dev->n_tags_ecc_fixed = 0;
-+ dev->n_tags_ecc_unfixed = 0;
-+ dev->n_erase_failures = 0;
-+ dev->n_erased_blocks = 0;
-+ dev->gc_disable = 0;
-+ dev->has_pending_prioritised_gc = 1;
-+ /* Assume the worst for now, will get fixed on first GC */
-+ INIT_LIST_HEAD(&dev->dirty_dirs);
-+ dev->oldest_dirty_seq = 0;
-+ dev->oldest_dirty_block = 0;
-+
-+ /* Initialise temporary buffers and caches. */
-+ if (!yaffs_init_tmp_buffers(dev))
-+ init_failed = 1;
-+
-+ dev->cache = NULL;
-+ dev->gc_cleanup_list = NULL;
-+
-+ if (!init_failed && dev->param.n_caches > 0) {
-+ int i;
-+ void *buf;
-+ int cache_bytes =
-+ dev->param.n_caches * sizeof(struct yaffs_cache);
-+
-+ if (dev->param.n_caches > YAFFS_MAX_SHORT_OP_CACHES)
-+ dev->param.n_caches = YAFFS_MAX_SHORT_OP_CACHES;
-+
-+ dev->cache = kmalloc(cache_bytes, GFP_NOFS);
-+
-+ buf = (u8 *) dev->cache;
-+
-+ if (dev->cache)
-+ memset(dev->cache, 0, cache_bytes);
-+
-+ for (i = 0; i < dev->param.n_caches && buf; i++) {
-+ dev->cache[i].object = NULL;
-+ dev->cache[i].last_use = 0;
-+ dev->cache[i].dirty = 0;
-+ dev->cache[i].data = buf =
-+ kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
-+ }
-+ if (!buf)
-+ init_failed = 1;
-+
-+ dev->cache_last_use = 0;
-+ }
-+
-+ dev->cache_hits = 0;
-+
-+ if (!init_failed) {
-+ dev->gc_cleanup_list =
-+ kmalloc(dev->param.chunks_per_block * sizeof(u32),
-+ GFP_NOFS);
-+ if (!dev->gc_cleanup_list)
-+ init_failed = 1;
-+ }
-+
-+ if (dev->param.is_yaffs2)
-+ dev->param.use_header_file_size = 1;
-+
-+ if (!init_failed && !yaffs_init_blocks(dev))
-+ init_failed = 1;
-+
-+ yaffs_init_tnodes_and_objs(dev);
-+
-+ if (!init_failed && !yaffs_create_initial_dir(dev))
-+ init_failed = 1;
-+
-+ if (!init_failed && dev->param.is_yaffs2 &&
-+ !dev->param.disable_summary &&
-+ !yaffs_summary_init(dev))
-+ init_failed = 1;
-+
-+ if (!init_failed) {
-+ /* Now scan the flash. */
-+ if (dev->param.is_yaffs2) {
-+ if (yaffs2_checkpt_restore(dev)) {
-+ yaffs_check_obj_details_loaded(dev->root_dir);
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT |
-+ YAFFS_TRACE_MOUNT,
-+ "yaffs: restored from checkpoint"
-+ );
-+ } else {
-+
-+ /* Clean up the mess caused by an aborted
-+ * checkpoint load then scan backwards.
-+ */
-+ yaffs_deinit_blocks(dev);
-+
-+ yaffs_deinit_tnodes_and_objs(dev);
-+
-+ dev->n_erased_blocks = 0;
-+ dev->n_free_chunks = 0;
-+ dev->alloc_block = -1;
-+ dev->alloc_page = -1;
-+ dev->n_deleted_files = 0;
-+ dev->n_unlinked_files = 0;
-+ dev->n_bg_deletions = 0;
-+
-+ if (!init_failed && !yaffs_init_blocks(dev))
-+ init_failed = 1;
-+
-+ yaffs_init_tnodes_and_objs(dev);
-+
-+ if (!init_failed
-+ && !yaffs_create_initial_dir(dev))
-+ init_failed = 1;
-+
-+ if (!init_failed && !yaffs2_scan_backwards(dev))
-+ init_failed = 1;
-+ }
-+ } else if (!yaffs1_scan(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);
-+ }
-+
-+ if (init_failed) {
-+ /* Clean up the mess */
-+ yaffs_trace(YAFFS_TRACE_TRACING,
-+ "yaffs: yaffs_guts_initialise() aborted.");
-+
-+ yaffs_deinitialise(dev);
-+ return YAFFS_FAIL;
-+ }
-+
-+ /* Zero out stats */
-+ dev->n_page_reads = 0;
-+ dev->n_page_writes = 0;
-+ dev->n_erasures = 0;
-+ dev->n_gc_copies = 0;
-+ dev->n_retried_writes = 0;
-+
-+ dev->n_retired_blocks = 0;
-+
-+ yaffs_verify_free_chunks(dev);
-+ yaffs_verify_blocks(dev);
-+
-+ /* Clean up any aborted checkpoint data */
-+ if (!dev->is_checkpointed && dev->blocks_in_checkpt > 0)
-+ yaffs2_checkpt_invalidate(dev);
-+
-+ yaffs_trace(YAFFS_TRACE_TRACING,
-+ "yaffs: yaffs_guts_initialise() done.");
-+ return YAFFS_OK;
-+}
-+
-+void yaffs_deinitialise(struct yaffs_dev *dev)
-+{
-+ if (dev->is_mounted) {
-+ int i;
-+
-+ yaffs_deinit_blocks(dev);
-+ yaffs_deinit_tnodes_and_objs(dev);
-+ yaffs_summary_deinit(dev);
-+
-+ if (dev->param.n_caches > 0 && dev->cache) {
-+
-+ for (i = 0; i < dev->param.n_caches; i++) {
-+ kfree(dev->cache[i].data);
-+ dev->cache[i].data = NULL;
-+ }
-+
-+ kfree(dev->cache);
-+ dev->cache = NULL;
-+ }
-+
-+ kfree(dev->gc_cleanup_list);
-+
-+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
-+ kfree(dev->temp_buffer[i].buffer);
-+
-+ dev->is_mounted = 0;
-+
-+ yaffs_deinit_nand(dev);
-+ }
-+}
-+
-+int yaffs_count_free_chunks(struct yaffs_dev *dev)
-+{
-+ int n_free = 0;
-+ int b;
-+ struct yaffs_block_info *blk;
-+
-+ blk = dev->block_info;
-+ for (b = dev->internal_start_block; b <= dev->internal_end_block; b++) {
-+ switch (blk->block_state) {
-+ case YAFFS_BLOCK_STATE_EMPTY:
-+ case YAFFS_BLOCK_STATE_ALLOCATING:
-+ case YAFFS_BLOCK_STATE_COLLECTING:
-+ case YAFFS_BLOCK_STATE_FULL:
-+ n_free +=
-+ (dev->param.chunks_per_block - blk->pages_in_use +
-+ blk->soft_del_pages);
-+ break;
-+ default:
-+ break;
-+ }
-+ blk++;
-+ }
-+ return n_free;
-+}
-+
-+int yaffs_get_n_free_chunks(struct yaffs_dev *dev)
-+{
-+ /* This is what we report to the outside world */
-+ int n_free;
-+ int n_dirty_caches;
-+ int blocks_for_checkpt;
-+ int i;
-+
-+ n_free = dev->n_free_chunks;
-+ n_free += dev->n_deleted_files;
-+
-+ /* Now count and subtract the number of dirty chunks in the cache. */
-+
-+ for (n_dirty_caches = 0, i = 0; i < dev->param.n_caches; i++) {
-+ if (dev->cache[i].dirty)
-+ n_dirty_caches++;
-+ }
-+
-+ n_free -= n_dirty_caches;
-+
-+ n_free -=
-+ ((dev->param.n_reserved_blocks + 1) * dev->param.chunks_per_block);
-+
-+ /* Now figure checkpoint space and report that... */
-+ blocks_for_checkpt = yaffs_calc_checkpt_blocks_required(dev);
-+
-+ n_free -= (blocks_for_checkpt * dev->param.chunks_per_block);
-+
-+ if (n_free < 0)
-+ n_free = 0;
-+
-+ return n_free;
-+}
-+
-+
-+
-+/*
-+ * Marshalling functions to get loff_t file sizes into and out of
-+ * object headers.
-+ */
-+void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize)
-+{
-+ oh->file_size_low = (fsize & 0xFFFFFFFF);
-+ oh->file_size_high = ((fsize >> 32) & 0xFFFFFFFF);
-+}
-+
-+loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh)
-+{
-+ loff_t retval;
-+
-+ if (sizeof(loff_t) >= 8 && ~(oh->file_size_high))
-+ retval = (((loff_t) oh->file_size_high) << 32) |
-+ (((loff_t) oh->file_size_low) & 0xFFFFFFFF);
-+ else
-+ retval = (loff_t) oh->file_size_low;
-+
-+ return retval;
-+}
-+
-+
-+void yaffs_count_blocks_by_state(struct yaffs_dev *dev, int bs[10])
-+{
-+ int i;
-+ struct yaffs_block_info *bi;
-+ int s;
-+
-+ for(i = 0; i < 10; i++)
-+ bs[i] = 0;
-+
-+ for(i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-+ bi = yaffs_get_block_info(dev, i);
-+ s = bi->block_state;
-+ if(s > YAFFS_BLOCK_STATE_DEAD || s < YAFFS_BLOCK_STATE_UNKNOWN)
-+ bs[0]++;
-+ else
-+ bs[s]++;
-+ }
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_guts.h linux-3.15-rc5/fs/yaffs2/yaffs_guts.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_guts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_guts.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,1007 @@
-+/*
-+ * 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_GUTS_H__
-+#define __YAFFS_GUTS_H__
-+
-+#include "yportenv.h"
-+
-+#define YAFFS_OK 1
-+#define YAFFS_FAIL 0
-+
-+/* Give us a Y=0x59,
-+ * Give us an A=0x41,
-+ * Give us an FF=0xff
-+ * Give us an S=0x53
-+ * And what have we got...
-+ */
-+#define YAFFS_MAGIC 0x5941ff53
-+
-+/*
-+ * Tnodes form a tree with the tnodes in "levels"
-+ * Levels greater than 0 hold 8 slots which point to other tnodes.
-+ * Those at level 0 hold 16 slots which point to chunks in NAND.
-+ *
-+ * A maximum level of 8 thust supports files of size up to:
-+ *
-+ * 2^(3*MAX_LEVEL+4)
-+ *
-+ * Thus a max level of 8 supports files with up to 2^^28 chunks which gives
-+ * a maximum file size of around 512Gbytees with 2k chunks.
-+ */
-+#define YAFFS_NTNODES_LEVEL0 16
-+#define YAFFS_TNODES_LEVEL0_BITS 4
-+#define YAFFS_TNODES_LEVEL0_MASK 0xf
-+
-+#define YAFFS_NTNODES_INTERNAL (YAFFS_NTNODES_LEVEL0 / 2)
-+#define YAFFS_TNODES_INTERNAL_BITS (YAFFS_TNODES_LEVEL0_BITS - 1)
-+#define YAFFS_TNODES_INTERNAL_MASK 0x7
-+#define YAFFS_TNODES_MAX_LEVEL 8
-+#define YAFFS_TNODES_MAX_BITS (YAFFS_TNODES_LEVEL0_BITS + \
-+ YAFFS_TNODES_INTERNAL_BITS * \
-+ YAFFS_TNODES_MAX_LEVEL)
-+#define YAFFS_MAX_CHUNK_ID ((1 << YAFFS_TNODES_MAX_BITS) - 1)
-+
-+#define YAFFS_MAX_FILE_SIZE_32 0x7fffffff
-+
-+/* Constants for YAFFS1 mode */
-+#define YAFFS_BYTES_PER_SPARE 16
-+#define YAFFS_BYTES_PER_CHUNK 512
-+#define YAFFS_CHUNK_SIZE_SHIFT 9
-+#define YAFFS_CHUNKS_PER_BLOCK 32
-+#define YAFFS_BYTES_PER_BLOCK (YAFFS_CHUNKS_PER_BLOCK*YAFFS_BYTES_PER_CHUNK)
-+
-+#define YAFFS_MIN_YAFFS2_CHUNK_SIZE 1024
-+#define YAFFS_MIN_YAFFS2_SPARE_SIZE 32
-+
-+
-+
-+#define YAFFS_ALLOCATION_NOBJECTS 100
-+#define YAFFS_ALLOCATION_NTNODES 100
-+#define YAFFS_ALLOCATION_NLINKS 100
-+
-+#define YAFFS_NOBJECT_BUCKETS 256
-+
-+#define YAFFS_OBJECT_SPACE 0x40000
-+#define YAFFS_MAX_OBJECT_ID (YAFFS_OBJECT_SPACE - 1)
-+
-+/* Binary data version stamps */
-+#define YAFFS_SUMMARY_VERSION 1
-+#define YAFFS_CHECKPOINT_VERSION 7
-+
-+#ifdef CONFIG_YAFFS_UNICODE
-+#define YAFFS_MAX_NAME_LENGTH 127
-+#define YAFFS_MAX_ALIAS_LENGTH 79
-+#else
-+#define YAFFS_MAX_NAME_LENGTH 255
-+#define YAFFS_MAX_ALIAS_LENGTH 159
-+#endif
-+
-+#define YAFFS_SHORT_NAME_LENGTH 15
-+
-+/* Some special object ids for pseudo objects */
-+#define YAFFS_OBJECTID_ROOT 1
-+#define YAFFS_OBJECTID_LOSTNFOUND 2
-+#define YAFFS_OBJECTID_UNLINKED 3
-+#define YAFFS_OBJECTID_DELETED 4
-+
-+/* Fake object Id for summary data */
-+#define YAFFS_OBJECTID_SUMMARY 0x10
-+
-+/* Pseudo object ids for checkpointing */
-+#define YAFFS_OBJECTID_CHECKPOINT_DATA 0x20
-+#define YAFFS_SEQUENCE_CHECKPOINT_DATA 0x21
-+
-+#define YAFFS_MAX_SHORT_OP_CACHES 20
-+
-+#define YAFFS_N_TEMP_BUFFERS 6
-+
-+/* We limit the number attempts at sucessfully saving a chunk of data.
-+ * Small-page devices have 32 pages per block; large-page devices have 64.
-+ * Default to something in the order of 5 to 10 blocks worth of chunks.
-+ */
-+#define YAFFS_WR_ATTEMPTS (5*64)
-+
-+/* Sequence numbers are used in YAFFS2 to determine block allocation order.
-+ * The range is limited slightly to help distinguish bad numbers from good.
-+ * This also allows us to perhaps in the future use special numbers for
-+ * special purposes.
-+ * EFFFFF00 allows the allocation of 8 blocks/second (~1Mbytes) for 15 years,
-+ * and is a larger number than the lifetime of a 2GB device.
-+ */
-+#define YAFFS_LOWEST_SEQUENCE_NUMBER 0x00001000
-+#define YAFFS_HIGHEST_SEQUENCE_NUMBER 0xefffff00
-+
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK 0xffff0000
-+
-+/* ChunkCache is used for short read/write operations.*/
-+struct yaffs_cache {
-+ struct yaffs_obj *object;
-+ int chunk_id;
-+ int last_use;
-+ int dirty;
-+ int n_bytes; /* Only valid if the cache is dirty */
-+ int locked; /* Can't push out or flush while locked. */
-+ u8 *data;
-+};
-+
-+/* yaffs1 tags structures in RAM
-+ * NB This uses bitfield. Bitfields should not straddle a u32 boundary
-+ * otherwise the structure size will get blown out.
-+ */
-+
-+struct yaffs_tags {
-+ u32 chunk_id:20;
-+ u32 serial_number:2;
-+ u32 n_bytes_lsb:10;
-+ u32 obj_id:18;
-+ u32 ecc:12;
-+ u32 n_bytes_msb:2;
-+};
-+
-+union yaffs_tags_union {
-+ struct yaffs_tags as_tags;
-+ u8 as_bytes[8];
-+};
-+
-+
-+/* Stuff used for extended tags in YAFFS2 */
-+
-+enum yaffs_ecc_result {
-+ YAFFS_ECC_RESULT_UNKNOWN,
-+ YAFFS_ECC_RESULT_NO_ERROR,
-+ YAFFS_ECC_RESULT_FIXED,
-+ YAFFS_ECC_RESULT_UNFIXED
-+};
-+
-+enum yaffs_obj_type {
-+ YAFFS_OBJECT_TYPE_UNKNOWN,
-+ YAFFS_OBJECT_TYPE_FILE,
-+ YAFFS_OBJECT_TYPE_SYMLINK,
-+ YAFFS_OBJECT_TYPE_DIRECTORY,
-+ YAFFS_OBJECT_TYPE_HARDLINK,
-+ YAFFS_OBJECT_TYPE_SPECIAL
-+};
-+
-+#define YAFFS_OBJECT_TYPE_MAX YAFFS_OBJECT_TYPE_SPECIAL
-+
-+struct yaffs_ext_tags {
-+ unsigned chunk_used; /* Status of the chunk: used or unused */
-+ unsigned obj_id; /* If 0 this is not used */
-+ unsigned chunk_id; /* If 0 this is a header, else a data chunk */
-+ unsigned n_bytes; /* Only valid for data chunks */
-+
-+ /* The following stuff only has meaning when we read */
-+ enum yaffs_ecc_result ecc_result;
-+ unsigned block_bad;
-+
-+ /* YAFFS 1 stuff */
-+ unsigned is_deleted; /* The chunk is marked deleted */
-+ unsigned serial_number; /* Yaffs1 2-bit serial number */
-+
-+ /* YAFFS2 stuff */
-+ unsigned seq_number; /* The sequence number of this block */
-+
-+ /* Extra info if this is an object header (YAFFS2 only) */
-+
-+ unsigned extra_available; /* Extra info available if not zero */
-+ unsigned extra_parent_id; /* The parent object */
-+ unsigned extra_is_shrink; /* Is it a shrink header? */
-+ unsigned extra_shadows; /* Does this shadow another object? */
-+
-+ enum yaffs_obj_type extra_obj_type; /* What object type? */
-+
-+ loff_t extra_file_size; /* Length if it is a file */
-+ unsigned extra_equiv_id; /* Equivalent object for a hard link */
-+};
-+
-+/* Spare structure for YAFFS1 */
-+struct yaffs_spare {
-+ u8 tb0;
-+ u8 tb1;
-+ u8 tb2;
-+ u8 tb3;
-+ u8 page_status; /* set to 0 to delete the chunk */
-+ u8 block_status;
-+ u8 tb4;
-+ u8 tb5;
-+ u8 ecc1[3];
-+ u8 tb6;
-+ u8 tb7;
-+ u8 ecc2[3];
-+};
-+
-+/*Special structure for passing through to mtd */
-+struct yaffs_nand_spare {
-+ struct yaffs_spare spare;
-+ int eccres1;
-+ int eccres2;
-+};
-+
-+/* Block data in RAM */
-+
-+enum yaffs_block_state {
-+ YAFFS_BLOCK_STATE_UNKNOWN = 0,
-+
-+ YAFFS_BLOCK_STATE_SCANNING,
-+ /* Being scanned */
-+
-+ YAFFS_BLOCK_STATE_NEEDS_SCAN,
-+ /* The block might have something on it (ie it is allocating or full,
-+ * perhaps empty) but it needs to be scanned to determine its true
-+ * state.
-+ * This state is only valid during scanning.
-+ * NB We tolerate empty because the pre-scanner might be incapable of
-+ * deciding
-+ * However, if this state is returned on a YAFFS2 device,
-+ * then we expect a sequence number
-+ */
-+
-+ YAFFS_BLOCK_STATE_EMPTY,
-+ /* This block is empty */
-+
-+ YAFFS_BLOCK_STATE_ALLOCATING,
-+ /* This block is partially allocated.
-+ * At least one page holds valid data.
-+ * This is the one currently being used for page
-+ * allocation. Should never be more than one of these.
-+ * If a block is only partially allocated at mount it is treated as
-+ * full.
-+ */
-+
-+ YAFFS_BLOCK_STATE_FULL,
-+ /* All the pages in this block have been allocated.
-+ * If a block was only partially allocated when mounted we treat
-+ * it as fully allocated.
-+ */
-+
-+ YAFFS_BLOCK_STATE_DIRTY,
-+ /* The block was full and now all chunks have been deleted.
-+ * Erase me, reuse me.
-+ */
-+
-+ YAFFS_BLOCK_STATE_CHECKPOINT,
-+ /* This block is assigned to holding checkpoint data. */
-+
-+ YAFFS_BLOCK_STATE_COLLECTING,
-+ /* This block is being garbage collected */
-+
-+ YAFFS_BLOCK_STATE_DEAD
-+ /* This block has failed and is not in use */
-+};
-+
-+#define YAFFS_NUMBER_OF_BLOCK_STATES (YAFFS_BLOCK_STATE_DEAD + 1)
-+
-+struct yaffs_block_info {
-+
-+ s32 soft_del_pages:10; /* number of soft deleted pages */
-+ s32 pages_in_use:10; /* number of pages in use */
-+ u32 block_state:4; /* One of the above block states. */
-+ /* NB use unsigned because enum is sometimes
-+ * an int */
-+ u32 needs_retiring:1; /* Data has failed on this block, */
-+ /*need to get valid data off and retire*/
-+ u32 skip_erased_check:1;/* Skip the erased check on this block */
-+ u32 gc_prioritise:1; /* An ECC check or blank check has failed.
-+ Block should be prioritised for GC */
-+ u32 chunk_error_strikes:3; /* How many times we've had ecc etc
-+ failures on this block and tried to reuse it */
-+ u32 has_summary:1; /* The block has a summary */
-+
-+ u32 has_shrink_hdr:1; /* This block has at least one shrink header */
-+ u32 seq_number; /* block sequence number for yaffs2 */
-+
-+};
-+
-+/* -------------------------- Object structure -------------------------------*/
-+/* This is the object structure as stored on NAND */
-+
-+struct yaffs_obj_hdr {
-+ enum yaffs_obj_type type;
-+
-+ /* Apply to everything */
-+ int parent_obj_id;
-+ u16 sum_no_longer_used; /* checksum of name. No longer used */
-+ YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
-+
-+ /* The following apply to all object types except for hard links */
-+ u32 yst_mode; /* protection */
-+
-+ u32 yst_uid;
-+ u32 yst_gid;
-+ u32 yst_atime;
-+ u32 yst_mtime;
-+ u32 yst_ctime;
-+
-+ /* File size applies to files only */
-+ u32 file_size_low;
-+
-+ /* Equivalent object id applies to hard links only. */
-+ int equiv_id;
-+
-+ /* Alias is for symlinks only. */
-+ YCHAR alias[YAFFS_MAX_ALIAS_LENGTH + 1];
-+
-+ u32 yst_rdev; /* stuff for block and char devices (major/min) */
-+
-+ u32 win_ctime[2];
-+ u32 win_atime[2];
-+ u32 win_mtime[2];
-+
-+ u32 inband_shadowed_obj_id;
-+ u32 inband_is_shrink;
-+
-+ u32 file_size_high;
-+ u32 reserved[1];
-+ int shadows_obj; /* This object header shadows the
-+ specified object if > 0 */
-+
-+ /* is_shrink applies to object headers written when wemake a hole. */
-+ u32 is_shrink;
-+
-+};
-+
-+/*--------------------------- Tnode -------------------------- */
-+
-+struct yaffs_tnode {
-+ struct yaffs_tnode *internal[YAFFS_NTNODES_INTERNAL];
-+};
-+
-+/*------------------------ Object -----------------------------*/
-+/* An object can be one of:
-+ * - a directory (no data, has children links
-+ * - a regular file (data.... not prunes :->).
-+ * - a symlink [symbolic link] (the alias).
-+ * - a hard link
-+ */
-+
-+struct yaffs_file_var {
-+ loff_t file_size;
-+ loff_t scanned_size;
-+ loff_t shrink_size;
-+ int top_level;
-+ struct yaffs_tnode *top;
-+};
-+
-+struct yaffs_dir_var {
-+ struct list_head children; /* list of child links */
-+ struct list_head dirty; /* Entry for list of dirty directories */
-+};
-+
-+struct yaffs_symlink_var {
-+ YCHAR *alias;
-+};
-+
-+struct yaffs_hardlink_var {
-+ struct yaffs_obj *equiv_obj;
-+ u32 equiv_id;
-+};
-+
-+union yaffs_obj_var {
-+ struct yaffs_file_var file_variant;
-+ struct yaffs_dir_var dir_variant;
-+ struct yaffs_symlink_var symlink_variant;
-+ struct yaffs_hardlink_var hardlink_variant;
-+};
-+
-+struct yaffs_obj {
-+ u8 deleted:1; /* This should only apply to unlinked files. */
-+ u8 soft_del:1; /* it has also been soft deleted */
-+ u8 unlinked:1; /* An unlinked file.*/
-+ u8 fake:1; /* A fake object has no presence on NAND. */
-+ u8 rename_allowed:1; /* Some objects cannot be renamed. */
-+ u8 unlink_allowed:1;
-+ u8 dirty:1; /* the object needs to be written to flash */
-+ u8 valid:1; /* When the file system is being loaded up, this
-+ * object might be created before the data
-+ * is available
-+ * ie. file data chunks encountered before
-+ * the header.
-+ */
-+ u8 lazy_loaded:1; /* This object has been lazy loaded and
-+ * is missing some detail */
-+
-+ u8 defered_free:1; /* Object is removed from NAND, but is
-+ * still in the inode cache.
-+ * Free of object is defered.
-+ * until the inode is released.
-+ */
-+ u8 being_created:1; /* This object is still being created
-+ * so skip some verification checks. */
-+ u8 is_shadowed:1; /* This object is shadowed on the way
-+ * to being renamed. */
-+
-+ u8 xattr_known:1; /* We know if this has object has xattribs
-+ * or not. */
-+ u8 has_xattr:1; /* This object has xattribs.
-+ * Only valid if xattr_known. */
-+
-+ u8 serial; /* serial number of chunk in NAND.*/
-+ u16 sum; /* sum of the name to speed searching */
-+
-+ struct yaffs_dev *my_dev; /* The device I'm on */
-+
-+ struct list_head hash_link; /* list of objects in hash bucket */
-+
-+ struct list_head hard_links; /* hard linked object chain*/
-+
-+ /* directory structure stuff */
-+ /* also used for linking up the free list */
-+ struct yaffs_obj *parent;
-+ struct list_head siblings;
-+
-+ /* Where's my object header in NAND? */
-+ int hdr_chunk;
-+
-+ int n_data_chunks; /* Number of data chunks for this file. */
-+
-+ u32 obj_id; /* the object id value */
-+
-+ u32 yst_mode;
-+
-+ YCHAR short_name[YAFFS_SHORT_NAME_LENGTH + 1];
-+
-+#ifdef CONFIG_YAFFS_WINCE
-+ u32 win_ctime[2];
-+ u32 win_mtime[2];
-+ u32 win_atime[2];
-+#else
-+ u32 yst_uid;
-+ u32 yst_gid;
-+ u32 yst_atime;
-+ u32 yst_mtime;
-+ u32 yst_ctime;
-+#endif
-+
-+ u32 yst_rdev;
-+
-+ void *my_inode;
-+
-+ enum yaffs_obj_type variant_type;
-+
-+ union yaffs_obj_var variant;
-+
-+};
-+
-+struct yaffs_obj_bucket {
-+ struct list_head list;
-+ int count;
-+};
-+
-+/* yaffs_checkpt_obj holds the definition of an object as dumped
-+ * by checkpointing.
-+ */
-+
-+struct yaffs_checkpt_obj {
-+ int struct_type;
-+ u32 obj_id;
-+ u32 parent_id;
-+ int hdr_chunk;
-+ enum yaffs_obj_type variant_type:3;
-+ u8 deleted:1;
-+ u8 soft_del:1;
-+ u8 unlinked:1;
-+ u8 fake:1;
-+ u8 rename_allowed:1;
-+ u8 unlink_allowed:1;
-+ u8 serial;
-+ int n_data_chunks;
-+ loff_t size_or_equiv_obj;
-+};
-+
-+/*--------------------- Temporary buffers ----------------
-+ *
-+ * These are chunk-sized working buffers. Each device has a few.
-+ */
-+
-+struct yaffs_buffer {
-+ u8 *buffer;
-+ int in_use;
-+};
-+
-+/*----------------- Device ---------------------------------*/
-+
-+struct yaffs_param {
-+ const YCHAR *name;
-+
-+ /*
-+ * Entry parameters set up way early. Yaffs sets up the rest.
-+ * The structure should be zeroed out before use so that unused
-+ * and default values are zero.
-+ */
-+
-+ int inband_tags; /* Use unband tags */
-+ u32 total_bytes_per_chunk; /* Should be >= 512, does not need to
-+ be a power of 2 */
-+ int chunks_per_block; /* does not need to be a power of 2 */
-+ int spare_bytes_per_chunk; /* spare area size */
-+ int start_block; /* Start block we're allowed to use */
-+ int end_block; /* End block we're allowed to use */
-+ int n_reserved_blocks; /* Tuneable so that we can reduce
-+ * reserved blocks on NOR and RAM. */
-+
-+ int n_caches; /* If <= 0, then short op caching is disabled,
-+ * else the number of short op caches.
-+ */
-+ int cache_bypass_aligned; /* If non-zero then bypass the cache for
-+ * aligned writes.
-+ */
-+
-+ int use_nand_ecc; /* Flag to decide whether or not to use
-+ * NAND driver ECC on data (yaffs1) */
-+ int tags_9bytes; /* Use 9 byte tags */
-+ int no_tags_ecc; /* Flag to decide whether or not to do ECC
-+ * on packed tags (yaffs2) */
-+
-+ int is_yaffs2; /* Use yaffs2 mode on this device */
-+
-+ int empty_lost_n_found; /* Auto-empty lost+found directory on mount */
-+
-+ int refresh_period; /* How often to check for a block refresh */
-+
-+ /* Checkpoint control. Can be set before or after initialisation */
-+ u8 skip_checkpt_rd;
-+ u8 skip_checkpt_wr;
-+
-+ int enable_xattr; /* Enable xattribs */
-+
-+ int max_objects; /*
-+ * Set to limit the number of objects created.
-+ * 0 = no limit.
-+ */
-+
-+ /* The remove_obj_fn function must be supplied by OS flavours that
-+ * need it.
-+ * yaffs direct uses it to implement the faster readdir.
-+ * Linux uses it to protect the directory during unlocking.
-+ */
-+ void (*remove_obj_fn) (struct yaffs_obj *obj);
-+
-+ /* Callback to mark the superblock dirty */
-+ void (*sb_dirty_fn) (struct yaffs_dev *dev);
-+
-+ /* Callback to control garbage collection. */
-+ unsigned (*gc_control_fn) (struct yaffs_dev *dev);
-+
-+ /* Debug control flags. Don't use unless you know what you're doing */
-+ int use_header_file_size; /* Flag to determine if we should use
-+ * file sizes from the header */
-+ int disable_lazy_load; /* Disable lazy loading on this device */
-+ int wide_tnodes_disabled; /* Set to disable wide tnodes */
-+ int disable_soft_del; /* yaffs 1 only: Set to disable the use of
-+ * softdeletion. */
-+
-+ int defered_dir_update; /* Set to defer directory updates */
-+
-+#ifdef CONFIG_YAFFS_AUTO_UNICODE
-+ int auto_unicode;
-+#endif
-+ int always_check_erased; /* Force chunk erased check always on */
-+
-+ int disable_summary;
-+ int disable_bad_block_marking;
-+
-+};
-+
-+struct yaffs_driver {
-+ int (*drv_write_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
-+ const u8 *data, int data_len,
-+ const u8 *oob, int oob_len);
-+ int (*drv_read_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
-+ u8 *data, int data_len,
-+ u8 *oob, int oob_len,
-+ enum yaffs_ecc_result *ecc_result);
-+ int (*drv_erase_fn) (struct yaffs_dev *dev, int block_no);
-+ int (*drv_mark_bad_fn) (struct yaffs_dev *dev, int block_no);
-+ int (*drv_check_bad_fn) (struct yaffs_dev *dev, int block_no);
-+ int (*drv_initialise_fn) (struct yaffs_dev *dev);
-+ int (*drv_deinitialise_fn) (struct yaffs_dev *dev);
-+};
-+
-+struct yaffs_tags_handler {
-+ int (*write_chunk_tags_fn) (struct yaffs_dev *dev,
-+ int nand_chunk, const u8 *data,
-+ const struct yaffs_ext_tags *tags);
-+ int (*read_chunk_tags_fn) (struct yaffs_dev *dev,
-+ int nand_chunk, u8 *data,
-+ struct yaffs_ext_tags *tags);
-+
-+ int (*query_block_fn) (struct yaffs_dev *dev, int block_no,
-+ enum yaffs_block_state *state,
-+ u32 *seq_number);
-+ int (*mark_bad_fn) (struct yaffs_dev *dev, int block_no);
-+};
-+
-+struct yaffs_dev {
-+ struct yaffs_param param;
-+ struct yaffs_driver drv;
-+ struct yaffs_tags_handler tagger;
-+
-+ /* Context storage. Holds extra OS specific data for this device */
-+
-+ void *os_context;
-+ void *driver_context;
-+
-+ struct list_head dev_list;
-+
-+ int ll_init;
-+ /* Runtime parameters. Set up by YAFFS. */
-+ int data_bytes_per_chunk;
-+
-+ /* Non-wide tnode stuff */
-+ u16 chunk_grp_bits; /* Number of bits that need to be resolved if
-+ * the tnodes are not wide enough.
-+ */
-+ u16 chunk_grp_size; /* == 2^^chunk_grp_bits */
-+
-+ /* Stuff to support wide tnodes */
-+ u32 tnode_width;
-+ u32 tnode_mask;
-+ u32 tnode_size;
-+
-+ /* Stuff for figuring out file offset to chunk conversions */
-+ u32 chunk_shift; /* Shift value */
-+ u32 chunk_div; /* Divisor after shifting: 1 for 2^n sizes */
-+ u32 chunk_mask; /* Mask to use for power-of-2 case */
-+
-+ int is_mounted;
-+ int read_only;
-+ int is_checkpointed;
-+
-+ /* Stuff to support block offsetting to support start block zero */
-+ int internal_start_block;
-+ int internal_end_block;
-+ int block_offset;
-+ int chunk_offset;
-+
-+ /* Runtime checkpointing stuff */
-+ int checkpt_page_seq; /* running sequence number of checkpt pages */
-+ int checkpt_byte_count;
-+ int checkpt_byte_offs;
-+ u8 *checkpt_buffer;
-+ int checkpt_open_write;
-+ int blocks_in_checkpt;
-+ int checkpt_cur_chunk;
-+ int checkpt_cur_block;
-+ int checkpt_next_block;
-+ int *checkpt_block_list;
-+ int checkpt_max_blocks;
-+ u32 checkpt_sum;
-+ u32 checkpt_xor;
-+
-+ int checkpoint_blocks_required; /* Number of blocks needed to store
-+ * current checkpoint set */
-+
-+ /* Block Info */
-+ struct yaffs_block_info *block_info;
-+ u8 *chunk_bits; /* bitmap of chunks in use */
-+ u8 block_info_alt:1; /* allocated using alternative alloc */
-+ u8 chunk_bits_alt:1; /* allocated using alternative alloc */
-+ int chunk_bit_stride; /* Number of bytes of chunk_bits per block.
-+ * Must be consistent with chunks_per_block.
-+ */
-+
-+ int n_erased_blocks;
-+ int alloc_block; /* Current block being allocated off */
-+ u32 alloc_page;
-+ int alloc_block_finder; /* Used to search for next allocation block */
-+
-+ /* Object and Tnode memory management */
-+ void *allocator;
-+ int n_obj;
-+ int n_tnodes;
-+
-+ int n_hardlinks;
-+
-+ struct yaffs_obj_bucket obj_bucket[YAFFS_NOBJECT_BUCKETS];
-+ u32 bucket_finder;
-+
-+ int n_free_chunks;
-+
-+ /* Garbage collection control */
-+ u32 *gc_cleanup_list; /* objects to delete at the end of a GC. */
-+ u32 n_clean_ups;
-+
-+ unsigned has_pending_prioritised_gc; /* We think this device might
-+ have pending prioritised gcs */
-+ unsigned gc_disable;
-+ unsigned gc_block_finder;
-+ unsigned gc_dirtiest;
-+ unsigned gc_pages_in_use;
-+ unsigned gc_not_done;
-+ unsigned gc_block;
-+ unsigned gc_chunk;
-+ unsigned gc_skip;
-+ struct yaffs_summary_tags *gc_sum_tags;
-+
-+ /* Special directories */
-+ struct yaffs_obj *root_dir;
-+ struct yaffs_obj *lost_n_found;
-+
-+ int buffered_block; /* Which block is buffered here? */
-+ int doing_buffered_block_rewrite;
-+
-+ struct yaffs_cache *cache;
-+ int cache_last_use;
-+
-+ /* Stuff for background deletion and unlinked files. */
-+ struct yaffs_obj *unlinked_dir; /* Directory where unlinked and deleted
-+ files live. */
-+ struct yaffs_obj *del_dir; /* Directory where deleted objects are
-+ sent to disappear. */
-+ struct yaffs_obj *unlinked_deletion; /* Current file being
-+ background deleted. */
-+ int n_deleted_files; /* Count of files awaiting deletion; */
-+ int n_unlinked_files; /* Count of unlinked files. */
-+ int n_bg_deletions; /* Count of background deletions. */
-+
-+ /* Temporary buffer management */
-+ struct yaffs_buffer temp_buffer[YAFFS_N_TEMP_BUFFERS];
-+ int max_temp;
-+ int temp_in_use;
-+ int unmanaged_buffer_allocs;
-+ int unmanaged_buffer_deallocs;
-+
-+ /* yaffs2 runtime stuff */
-+ unsigned seq_number; /* Sequence number of currently
-+ allocating block */
-+ unsigned oldest_dirty_seq;
-+ unsigned oldest_dirty_block;
-+
-+ /* Block refreshing */
-+ int refresh_skip; /* A skip down counter.
-+ * Refresh happens when this gets to zero. */
-+
-+ /* Dirty directory handling */
-+ struct list_head dirty_dirs; /* List of dirty directories */
-+
-+ /* Summary */
-+ int chunks_per_summary;
-+ struct yaffs_summary_tags *sum_tags;
-+
-+ /* Statistics */
-+ u32 n_page_writes;
-+ u32 n_page_reads;
-+ u32 n_erasures;
-+ u32 n_bad_queries;
-+ u32 n_bad_markings;
-+ u32 n_erase_failures;
-+ u32 n_gc_copies;
-+ u32 all_gcs;
-+ u32 passive_gc_count;
-+ u32 oldest_dirty_gc_count;
-+ u32 n_gc_blocks;
-+ u32 bg_gcs;
-+ u32 n_retried_writes;
-+ u32 n_retired_blocks;
-+ u32 n_ecc_fixed;
-+ u32 n_ecc_unfixed;
-+ u32 n_tags_ecc_fixed;
-+ u32 n_tags_ecc_unfixed;
-+ u32 n_deletions;
-+ u32 n_unmarked_deletions;
-+ u32 refresh_count;
-+ u32 cache_hits;
-+ u32 tags_used;
-+ u32 summary_used;
-+
-+};
-+
-+/* The CheckpointDevice structure holds the device information that changes
-+ *at runtime and must be preserved over unmount/mount cycles.
-+ */
-+struct yaffs_checkpt_dev {
-+ int struct_type;
-+ int n_erased_blocks;
-+ int alloc_block; /* Current block being allocated off */
-+ u32 alloc_page;
-+ int n_free_chunks;
-+
-+ int n_deleted_files; /* Count of files awaiting deletion; */
-+ int n_unlinked_files; /* Count of unlinked files. */
-+ int n_bg_deletions; /* Count of background deletions. */
-+
-+ /* yaffs2 runtime stuff */
-+ unsigned seq_number; /* Sequence number of currently
-+ * allocating block */
-+
-+};
-+
-+struct yaffs_checkpt_validity {
-+ int struct_type;
-+ u32 magic;
-+ u32 version;
-+ u32 head;
-+};
-+
-+struct yaffs_shadow_fixer {
-+ int obj_id;
-+ int shadowed_id;
-+ struct yaffs_shadow_fixer *next;
-+};
-+
-+/* Structure for doing xattr modifications */
-+struct yaffs_xattr_mod {
-+ int set; /* If 0 then this is a deletion */
-+ const YCHAR *name;
-+ const void *data;
-+ int size;
-+ int flags;
-+ int result;
-+};
-+
-+/*----------------------- YAFFS Functions -----------------------*/
-+
-+int yaffs_guts_initialise(struct yaffs_dev *dev);
-+void yaffs_deinitialise(struct yaffs_dev *dev);
-+
-+int yaffs_get_n_free_chunks(struct yaffs_dev *dev);
-+
-+int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name,
-+ struct yaffs_obj *new_dir, const YCHAR * new_name);
-+
-+int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR * name);
-+int yaffs_del_obj(struct yaffs_obj *obj);
-+struct yaffs_obj *yaffs_retype_obj(struct yaffs_obj *obj,
-+ enum yaffs_obj_type type);
-+
-+
-+int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR * name, int buffer_size);
-+loff_t yaffs_get_obj_length(struct yaffs_obj *obj);
-+int yaffs_get_obj_inode(struct yaffs_obj *obj);
-+unsigned yaffs_get_obj_type(struct yaffs_obj *obj);
-+int yaffs_get_obj_link_count(struct yaffs_obj *obj);
-+
-+/* File operations */
-+int yaffs_file_rd(struct yaffs_obj *obj, u8 * buffer, loff_t offset,
-+ int n_bytes);
-+int yaffs_wr_file(struct yaffs_obj *obj, const u8 * buffer, loff_t offset,
-+ int n_bytes, int write_trhrough);
-+int yaffs_resize_file(struct yaffs_obj *obj, loff_t new_size);
-+
-+struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent,
-+ const YCHAR *name, u32 mode, u32 uid,
-+ u32 gid);
-+
-+int yaffs_flush_file(struct yaffs_obj *obj, int update_time, int data_sync);
-+
-+/* Flushing and checkpointing */
-+void yaffs_flush_whole_cache(struct yaffs_dev *dev);
-+
-+int yaffs_checkpoint_save(struct yaffs_dev *dev);
-+int yaffs_checkpoint_restore(struct yaffs_dev *dev);
-+
-+/* Directory operations */
-+struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR *name,
-+ u32 mode, u32 uid, u32 gid);
-+struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *the_dir,
-+ const YCHAR *name);
-+struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number);
-+
-+/* Link operations */
-+struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR *name,
-+ struct yaffs_obj *equiv_obj);
-+
-+struct yaffs_obj *yaffs_get_equivalent_obj(struct yaffs_obj *obj);
-+
-+/* Symlink operations */
-+struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent,
-+ const YCHAR *name, u32 mode, u32 uid,
-+ u32 gid, const YCHAR *alias);
-+YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj);
-+
-+/* Special inodes (fifos, sockets and devices) */
-+struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent,
-+ const YCHAR *name, u32 mode, u32 uid,
-+ u32 gid, u32 rdev);
-+
-+int yaffs_set_xattrib(struct yaffs_obj *obj, const YCHAR *name,
-+ const void *value, int size, int flags);
-+int yaffs_get_xattrib(struct yaffs_obj *obj, const YCHAR *name, void *value,
-+ int size);
-+int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size);
-+int yaffs_remove_xattrib(struct yaffs_obj *obj, const YCHAR *name);
-+
-+/* Special directories */
-+struct yaffs_obj *yaffs_root(struct yaffs_dev *dev);
-+struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev);
-+
-+void yaffs_handle_defered_free(struct yaffs_obj *obj);
-+
-+void yaffs_update_dirty_dirs(struct yaffs_dev *dev);
-+
-+int yaffs_bg_gc(struct yaffs_dev *dev, unsigned urgency);
-+
-+/* Debug dump */
-+int yaffs_dump_obj(struct yaffs_obj *obj);
-+
-+void yaffs_guts_test(struct yaffs_dev *dev);
-+int yaffs_guts_ll_init(struct yaffs_dev *dev);
-+
-+
-+/* A few useful functions to be used within the core files*/
-+void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash,
-+ int lyn);
-+int yaffs_check_ff(u8 *buffer, int n_bytes);
-+void yaffs_handle_chunk_error(struct yaffs_dev *dev,
-+ struct yaffs_block_info *bi);
-+
-+u8 *yaffs_get_temp_buffer(struct yaffs_dev *dev);
-+void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 *buffer);
-+
-+struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev,
-+ int number,
-+ enum yaffs_obj_type type);
-+int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
-+ int nand_chunk, int in_scan);
-+void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR *name);
-+void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
-+ const struct yaffs_obj_hdr *oh);
-+void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj);
-+YCHAR *yaffs_clone_str(const YCHAR *str);
-+void yaffs_link_fixup(struct yaffs_dev *dev, struct list_head *hard_list);
-+void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no);
-+int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name,
-+ int force, int is_shrink, int shadows,
-+ struct yaffs_xattr_mod *xop);
-+void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id,
-+ int backward_scanning);
-+int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks);
-+struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev);
-+struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev,
-+ struct yaffs_file_var *file_struct,
-+ u32 chunk_id,
-+ struct yaffs_tnode *passed_tn);
-+
-+int yaffs_do_file_wr(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
-+ int n_bytes, int write_trhrough);
-+void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size);
-+void yaffs_skip_rest_of_block(struct yaffs_dev *dev);
-+
-+int yaffs_count_free_chunks(struct yaffs_dev *dev);
-+
-+struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
-+ struct yaffs_file_var *file_struct,
-+ u32 chunk_id);
-+
-+u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
-+ unsigned pos);
-+
-+int yaffs_is_non_empty_dir(struct yaffs_obj *obj);
-+
-+int yaffs_guts_format_dev(struct yaffs_dev *dev);
-+
-+void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
-+ int *chunk_out, u32 *offset_out);
-+/*
-+ * Marshalling functions to get loff_t file sizes into aand out of
-+ * object headers.
-+ */
-+void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize);
-+loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh);
-+loff_t yaffs_max_file_size(struct yaffs_dev *dev);
-+
-+/*
-+ * Debug function to count number of blocks in each state
-+ * NB Needs to be called with correct number of integers
-+ */
-+
-+void yaffs_count_blocks_by_state(struct yaffs_dev *dev, int bs[10]);
-+
-+int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
-+ struct yaffs_ext_tags *tags);
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_linux.h linux-3.15-rc5/fs/yaffs2/yaffs_linux.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_linux.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_linux.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,48 @@
-+/*
-+ * 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_LINUX_H__
-+#define __YAFFS_LINUX_H__
-+
-+#include "yportenv.h"
-+
-+struct yaffs_linux_context {
-+ struct list_head context_list; /* List of these we have mounted */
-+ struct yaffs_dev *dev;
-+ struct super_block *super;
-+ struct task_struct *bg_thread; /* Background thread for this device */
-+ int bg_running;
-+ struct mutex gross_lock; /* Gross locking mutex*/
-+ u8 *spare_buffer; /* For mtdif2 use. Don't know the buffer size
-+ * at compile time so we have to allocate it.
-+ */
-+ struct list_head search_contexts;
-+ struct task_struct *readdir_process;
-+ unsigned mount_id;
-+ int dirty;
-+};
-+
-+#define yaffs_dev_to_lc(dev) ((struct yaffs_linux_context *)((dev)->os_context))
-+#define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+#define WRITE_SIZE_STR "writesize"
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
-+#else
-+#define WRITE_SIZE_STR "oobblock"
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
-+#endif
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_mtdif.c linux-3.15-rc5/fs/yaffs2/yaffs_mtdif.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_mtdif.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_mtdif.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,309 @@
-+/*
-+ * 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 "yportenv.h"
-+
-+#include "yaffs_mtdif.h"
-+
-+#include "linux/mtd/mtd.h"
-+#include "linux/types.h"
-+#include "linux/time.h"
-+#include "linux/major.h"
-+#include "linux/mtd/nand.h"
-+#include "linux/kernel.h"
-+#include "linux/version.h"
-+#include "linux/types.h"
-+
-+#include "yaffs_trace.h"
-+#include "yaffs_guts.h"
-+#include "yaffs_linux.h"
-+
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
-+#define MTD_OPS_AUTO_OOB MTD_OOB_AUTO
-+#endif
-+
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
-+#define mtd_erase(m, ei) (m)->erase(m, ei)
-+#define mtd_write_oob(m, addr, pops) (m)->write_oob(m, addr, pops)
-+#define mtd_read_oob(m, addr, pops) (m)->read_oob(m, addr, pops)
-+#define mtd_block_isbad(m, offs) (m)->block_isbad(m, offs)
-+#define mtd_block_markbad(m, offs) (m)->block_markbad(m, offs)
-+#endif
-+
-+
-+
-+int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
-+{
-+ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-+ u32 addr =
-+ ((loff_t) block_no) * dev->param.total_bytes_per_chunk *
-+ dev->param.chunks_per_block;
-+ struct erase_info ei;
-+ int retval = 0;
-+
-+ ei.mtd = mtd;
-+ ei.addr = addr;
-+ ei.len = dev->param.total_bytes_per_chunk * dev->param.chunks_per_block;
-+ ei.time = 1000;
-+ ei.retries = 2;
-+ ei.callback = NULL;
-+ ei.priv = (u_long) dev;
-+
-+ retval = mtd_erase(mtd, &ei);
-+
-+ if (retval == 0)
-+ return YAFFS_OK;
-+
-+ return YAFFS_FAIL;
-+}
-+
-+
-+static int yaffs_mtd_write(struct yaffs_dev *dev, int nand_chunk,
-+ const u8 *data, int data_len,
-+ const u8 *oob, int oob_len)
-+{
-+ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-+ loff_t addr;
-+ struct mtd_oob_ops ops;
-+ int retval;
-+
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "yaffs_mtd_write(%p, %d, %p, %d, %p, %d)\n",
-+ dev, nand_chunk, data, data_len, oob, oob_len);
-+
-+ if (!data || !data_len) {
-+ data = NULL;
-+ data_len = 0;
-+ }
-+
-+ if (!oob || !oob_len) {
-+ oob = NULL;
-+ oob_len = 0;
-+ }
-+
-+ addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
-+ memset(&ops, 0, sizeof(ops));
-+ ops.mode = MTD_OPS_AUTO_OOB;
-+ ops.len = (data) ? data_len : 0;
-+ ops.ooblen = oob_len;
-+ ops.datbuf = (u8 *)data;
-+ ops.oobbuf = (u8 *)oob;
-+
-+ retval = mtd_write_oob(mtd, addr, &ops);
-+ if (retval) {
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "write_oob failed, chunk %d, mtd error %d",
-+ nand_chunk, retval);
-+ }
-+ return retval ? YAFFS_FAIL : YAFFS_OK;
-+}
-+
-+static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk,
-+ u8 *data, int data_len,
-+ u8 *oob, int oob_len,
-+ enum yaffs_ecc_result *ecc_result)
-+{
-+ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-+ loff_t addr;
-+ struct mtd_oob_ops ops;
-+ int retval;
-+
-+ addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
-+ memset(&ops, 0, sizeof(ops));
-+ ops.mode = MTD_OPS_AUTO_OOB;
-+ ops.len = (data) ? data_len : 0;
-+ ops.ooblen = oob_len;
-+ ops.datbuf = data;
-+ ops.oobbuf = oob;
-+
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
-+ /* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
-+ * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
-+ */
-+ ops.len = (ops.datbuf) ? ops.len : ops.ooblen;
-+#endif
-+ /* Read page and oob using MTD.
-+ * Check status and determine ECC result.
-+ */
-+ retval = mtd_read_oob(mtd, addr, &ops);
-+ if (retval)
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "read_oob failed, chunk %d, mtd error %d",
-+ nand_chunk, retval);
-+
-+ switch (retval) {
-+ case 0:
-+ /* no error */
-+ if(ecc_result)
-+ *ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
-+ break;
-+
-+ case -EUCLEAN:
-+ /* MTD's ECC fixed the data */
-+ if(ecc_result)
-+ *ecc_result = YAFFS_ECC_RESULT_FIXED;
-+ dev->n_ecc_fixed++;
-+ break;
-+
-+ case -EBADMSG:
-+ default:
-+ /* MTD's ECC could not fix the data */
-+ dev->n_ecc_unfixed++;
-+ if(ecc_result)
-+ *ecc_result = YAFFS_ECC_RESULT_UNFIXED;
-+ return YAFFS_FAIL;
-+ }
-+
-+ return YAFFS_OK;
-+}
-+
-+static int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no)
-+{
-+ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-+
-+ loff_t addr;
-+ struct erase_info ei;
-+ int retval = 0;
-+ u32 block_size;
-+
-+ block_size = dev->param.total_bytes_per_chunk *
-+ dev->param.chunks_per_block;
-+ addr = ((loff_t) block_no) * block_size;
-+
-+ ei.mtd = mtd;
-+ ei.addr = addr;
-+ ei.len = block_size;
-+ ei.time = 1000;
-+ ei.retries = 2;
-+ ei.callback = NULL;
-+ ei.priv = (u_long) dev;
-+
-+ retval = mtd_erase(mtd, &ei);
-+
-+ if (retval == 0)
-+ return YAFFS_OK;
-+
-+ return YAFFS_FAIL;
-+}
-+
-+static int yaffs_mtd_mark_bad(struct yaffs_dev *dev, int block_no)
-+{
-+ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-+ int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk;
-+ int retval;
-+
-+ yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", block_no);
-+
-+ retval = mtd_block_markbad(mtd, (loff_t) blocksize * block_no);
-+ return (retval) ? YAFFS_FAIL : YAFFS_OK;
-+}
-+
-+static int yaffs_mtd_check_bad(struct yaffs_dev *dev, int block_no)
-+{
-+ struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-+ int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk;
-+ int retval;
-+
-+ yaffs_trace(YAFFS_TRACE_MTD, "checking block %d bad", block_no);
-+
-+ retval = mtd_block_isbad(mtd, (loff_t) blocksize * block_no);
-+ return (retval) ? YAFFS_FAIL : YAFFS_OK;
-+}
-+
-+static int yaffs_mtd_initialise(struct yaffs_dev *dev)
-+{
-+ return YAFFS_OK;
-+}
-+
-+static int yaffs_mtd_deinitialise(struct yaffs_dev *dev)
-+{
-+ return YAFFS_OK;
-+}
-+
-+
-+void yaffs_mtd_drv_install(struct yaffs_dev *dev)
-+{
-+ struct yaffs_driver *drv = &dev->drv;
-+
-+ drv->drv_write_chunk_fn = yaffs_mtd_write;
-+ drv->drv_read_chunk_fn = yaffs_mtd_read;
-+ drv->drv_erase_fn = yaffs_mtd_erase;
-+ drv->drv_mark_bad_fn = yaffs_mtd_mark_bad;
-+ drv->drv_check_bad_fn = yaffs_mtd_check_bad;
-+ drv->drv_initialise_fn = yaffs_mtd_initialise;
-+ drv->drv_deinitialise_fn = yaffs_mtd_deinitialise;
-+}
-+
-+
-+struct mtd_info * yaffs_get_mtd_device(dev_t sdev)
-+{
-+ struct mtd_info *mtd;
-+
-+ mtd = yaffs_get_mtd_device(sdev);
-+
-+ /* Check it's an mtd device..... */
-+ if (MAJOR(sdev) != MTD_BLOCK_MAJOR)
-+ return NULL; /* This isn't an mtd device */
-+
-+ /* Check it's NAND */
-+ if (mtd->type != MTD_NANDFLASH) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs: MTD device is not NAND it's type %d",
-+ mtd->type);
-+ return NULL;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_OS, " %s %d", WRITE_SIZE_STR, WRITE_SIZE(mtd));
-+ yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize);
-+ yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+ yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size);
-+#else
-+ yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size);
-+#endif
-+
-+ return mtd;
-+}
-+
-+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags)
-+{
-+ if (yaffs_version == 2) {
-+ if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+ mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+ !inband_tags) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "MTD device does not have the right page sizes"
-+ );
-+ return -1;
-+ }
-+ } else {
-+ if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
-+ mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "MTD device does not support have the right page sizes"
-+ );
-+ return -1;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+
-+void yaffs_put_mtd_device(struct mtd_info *mtd)
-+{
-+ if(mtd)
-+ put_mtd_device(mtd);
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_mtdif.h linux-3.15-rc5/fs/yaffs2/yaffs_mtdif.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_mtdif.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_mtdif.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,25 @@
-+/*
-+ * 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_MTDIF_H__
-+#define __YAFFS_MTDIF_H__
-+
-+#include "yaffs_guts.h"
-+
-+void yaffs_mtd_drv_install(struct yaffs_dev *dev);
-+struct mtd_info * yaffs_get_mtd_device(dev_t sdev);
-+void yaffs_put_mtd_device(struct mtd_info *mtd);
-+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags);
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_nameval.c linux-3.15-rc5/fs/yaffs2/yaffs_nameval.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_nameval.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_nameval.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,208 @@
-+/*
-+ * 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.
-+ */
-+
-+/*
-+ * This simple implementation of a name-value store assumes a small number of
-+* values and fits into a small finite buffer.
-+ *
-+ * Each attribute is stored as a record:
-+ * sizeof(int) bytes record size.
-+ * strnlen+1 bytes name null terminated.
-+ * nbytes value.
-+ * ----------
-+ * total size stored in record size
-+ *
-+ * This code has not been tested with unicode yet.
-+ */
-+
-+#include "yaffs_nameval.h"
-+
-+#include "yportenv.h"
-+
-+static int nval_find(const char *xb, int xb_size, const YCHAR *name,
-+ int *exist_size)
-+{
-+ int pos = 0;
-+ int size;
-+
-+ memcpy(&size, xb, sizeof(int));
-+ while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
-+ if (!strncmp((YCHAR *) (xb + pos + sizeof(int)),
-+ name, size)) {
-+ if (exist_size)
-+ *exist_size = size;
-+ return pos;
-+ }
-+ pos += size;
-+ if (pos < xb_size - sizeof(int))
-+ memcpy(&size, xb + pos, sizeof(int));
-+ else
-+ size = 0;
-+ }
-+ if (exist_size)
-+ *exist_size = 0;
-+ return -ENODATA;
-+}
-+
-+static int nval_used(const char *xb, int xb_size)
-+{
-+ int pos = 0;
-+ int size;
-+
-+ memcpy(&size, xb + pos, sizeof(int));
-+ while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
-+ pos += size;
-+ if (pos < xb_size - sizeof(int))
-+ memcpy(&size, xb + pos, sizeof(int));
-+ else
-+ size = 0;
-+ }
-+ return pos;
-+}
-+
-+int nval_del(char *xb, int xb_size, const YCHAR *name)
-+{
-+ int pos = nval_find(xb, xb_size, name, NULL);
-+ int size;
-+
-+ if (pos < 0 || pos >= xb_size)
-+ return -ENODATA;
-+
-+ /* Find size, shift rest over this record,
-+ * then zero out the rest of buffer */
-+ memcpy(&size, xb + pos, sizeof(int));
-+ memcpy(xb + pos, xb + pos + size, xb_size - (pos + size));
-+ memset(xb + (xb_size - size), 0, size);
-+ return 0;
-+}
-+
-+int nval_set(char *xb, int xb_size, const YCHAR *name, const char *buf,
-+ int bsize, int flags)
-+{
-+ int pos;
-+ int namelen = strnlen(name, xb_size);
-+ int reclen;
-+ int size_exist = 0;
-+ int space;
-+ int start;
-+
-+ pos = nval_find(xb, xb_size, name, &size_exist);
-+
-+ if (flags & XATTR_CREATE && pos >= 0)
-+ return -EEXIST;
-+ if (flags & XATTR_REPLACE && pos < 0)
-+ return -ENODATA;
-+
-+ start = nval_used(xb, xb_size);
-+ space = xb_size - start + size_exist;
-+
-+ reclen = (sizeof(int) + namelen + 1 + bsize);
-+
-+ if (reclen > space)
-+ return -ENOSPC;
-+
-+ if (pos >= 0) {
-+ nval_del(xb, xb_size, name);
-+ start = nval_used(xb, xb_size);
-+ }
-+
-+ pos = start;
-+
-+ memcpy(xb + pos, &reclen, sizeof(int));
-+ pos += sizeof(int);
-+ strncpy((YCHAR *) (xb + pos), name, reclen);
-+ pos += (namelen + 1);
-+ memcpy(xb + pos, buf, bsize);
-+ return 0;
-+}
-+
-+int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf,
-+ int bsize)
-+{
-+ int pos = nval_find(xb, xb_size, name, NULL);
-+ int size;
-+
-+ if (pos >= 0 && pos < xb_size) {
-+
-+ memcpy(&size, xb + pos, sizeof(int));
-+ pos += sizeof(int); /* advance past record length */
-+ size -= sizeof(int);
-+
-+ /* Advance over name string */
-+ while (xb[pos] && size > 0 && pos < xb_size) {
-+ pos++;
-+ size--;
-+ }
-+ /*Advance over NUL */
-+ pos++;
-+ size--;
-+
-+ /* If bsize is zero then this is a size query.
-+ * Return the size, but don't copy.
-+ */
-+ if (!bsize)
-+ return size;
-+
-+ if (size <= bsize) {
-+ memcpy(buf, xb + pos, size);
-+ return size;
-+ }
-+ }
-+ if (pos >= 0)
-+ return -ERANGE;
-+
-+ return -ENODATA;
-+}
-+
-+int nval_list(const char *xb, int xb_size, char *buf, int bsize)
-+{
-+ int pos = 0;
-+ int size;
-+ int name_len;
-+ int ncopied = 0;
-+ int filled = 0;
-+
-+ memcpy(&size, xb + pos, sizeof(int));
-+ while (size > sizeof(int) &&
-+ size <= xb_size &&
-+ (pos + size) < xb_size &&
-+ !filled) {
-+ pos += sizeof(int);
-+ size -= sizeof(int);
-+ name_len = strnlen((YCHAR *) (xb + pos), size);
-+ if (ncopied + name_len + 1 < bsize) {
-+ memcpy(buf, xb + pos, name_len * sizeof(YCHAR));
-+ buf += name_len;
-+ *buf = '\0';
-+ buf++;
-+ if (sizeof(YCHAR) > 1) {
-+ *buf = '\0';
-+ buf++;
-+ }
-+ ncopied += (name_len + 1);
-+ } else {
-+ filled = 1;
-+ }
-+ pos += size;
-+ if (pos < xb_size - sizeof(int))
-+ memcpy(&size, xb + pos, sizeof(int));
-+ else
-+ size = 0;
-+ }
-+ return ncopied;
-+}
-+
-+int nval_hasvalues(const char *xb, int xb_size)
-+{
-+ return nval_used(xb, xb_size) > 0;
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_nameval.h linux-3.15-rc5/fs/yaffs2/yaffs_nameval.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_nameval.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_nameval.h 2014-05-17 01:53:27.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 __NAMEVAL_H__
-+#define __NAMEVAL_H__
-+
-+#include "yportenv.h"
-+
-+int nval_del(char *xb, int xb_size, const YCHAR * name);
-+int nval_set(char *xb, int xb_size, const YCHAR * name, const char *buf,
-+ int bsize, int flags);
-+int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf,
-+ int bsize);
-+int nval_list(const char *xb, int xb_size, char *buf, int bsize);
-+int nval_hasvalues(const char *xb, int xb_size);
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_nand.c linux-3.15-rc5/fs/yaffs2/yaffs_nand.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_nand.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_nand.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,122 @@
-+/*
-+ * 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_nand.h"
-+#include "yaffs_tagscompat.h"
-+
-+#include "yaffs_getblockinfo.h"
-+#include "yaffs_summary.h"
-+
-+static int apply_chunk_offset(struct yaffs_dev *dev, int chunk)
-+{
-+ return chunk - dev->chunk_offset;
-+}
-+
-+int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
-+ u8 *buffer, struct yaffs_ext_tags *tags)
-+{
-+ int result;
-+ struct yaffs_ext_tags local_tags;
-+ int flash_chunk = apply_chunk_offset(dev, nand_chunk);
-+
-+ dev->n_page_reads++;
-+
-+ /* If there are no tags provided use local tags. */
-+ if (!tags)
-+ tags = &local_tags;
-+
-+ result = dev->tagger.read_chunk_tags_fn(dev, flash_chunk, buffer, tags);
-+ if (tags && tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
-+
-+ struct yaffs_block_info *bi;
-+ bi = yaffs_get_block_info(dev,
-+ nand_chunk /
-+ dev->param.chunks_per_block);
-+ yaffs_handle_chunk_error(dev, bi);
-+ }
-+ return result;
-+}
-+
-+int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
-+ int nand_chunk,
-+ const u8 *buffer, struct yaffs_ext_tags *tags)
-+{
-+ int result;
-+ int flash_chunk = apply_chunk_offset(dev, nand_chunk);
-+
-+ dev->n_page_writes++;
-+
-+ if (!tags) {
-+ yaffs_trace(YAFFS_TRACE_ERROR, "Writing with no tags");
-+ BUG();
-+ return YAFFS_FAIL;
-+ }
-+
-+ tags->seq_number = dev->seq_number;
-+ tags->chunk_used = 1;
-+ yaffs_trace(YAFFS_TRACE_WRITE,
-+ "Writing chunk %d tags %d %d",
-+ nand_chunk, tags->obj_id, tags->chunk_id);
-+
-+ result = dev->tagger.write_chunk_tags_fn(dev, flash_chunk,
-+ buffer, tags);
-+
-+ yaffs_summary_add(dev, tags, nand_chunk);
-+
-+ return result;
-+}
-+
-+int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
-+{
-+ block_no -= dev->block_offset;
-+ dev->n_bad_markings++;
-+
-+ if (dev->param.disable_bad_block_marking)
-+ return YAFFS_OK;
-+
-+ return dev->tagger.mark_bad_fn(dev, block_no);
-+}
-+
-+
-+int yaffs_query_init_block_state(struct yaffs_dev *dev,
-+ int block_no,
-+ enum yaffs_block_state *state,
-+ u32 *seq_number)
-+{
-+ block_no -= dev->block_offset;
-+ return dev->tagger.query_block_fn(dev, block_no, state, seq_number);
-+}
-+
-+int yaffs_erase_block(struct yaffs_dev *dev, int block_no)
-+{
-+ int result;
-+
-+ block_no -= dev->block_offset;
-+ dev->n_erasures++;
-+ result = dev->drv.drv_erase_fn(dev, block_no);
-+ return result;
-+}
-+
-+int yaffs_init_nand(struct yaffs_dev *dev)
-+{
-+ if (dev->drv.drv_initialise_fn)
-+ return dev->drv.drv_initialise_fn(dev);
-+ return YAFFS_OK;
-+}
-+
-+int yaffs_deinit_nand(struct yaffs_dev *dev)
-+{
-+ if (dev->drv.drv_deinitialise_fn)
-+ return dev->drv.drv_deinitialise_fn(dev);
-+ return YAFFS_OK;
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_nand.h linux-3.15-rc5/fs/yaffs2/yaffs_nand.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_nand.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_nand.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,39 @@
-+/*
-+ * 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_NAND_H__
-+#define __YAFFS_NAND_H__
-+#include "yaffs_guts.h"
-+
-+int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
-+ u8 *buffer, struct yaffs_ext_tags *tags);
-+
-+int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
-+ int nand_chunk,
-+ const u8 *buffer, struct yaffs_ext_tags *tags);
-+
-+int yaffs_mark_bad(struct yaffs_dev *dev, int block_no);
-+
-+int yaffs_query_init_block_state(struct yaffs_dev *dev,
-+ int block_no,
-+ enum yaffs_block_state *state,
-+ unsigned *seq_number);
-+
-+int yaffs_erase_block(struct yaffs_dev *dev, int flash_block);
-+
-+int yaffs_init_nand(struct yaffs_dev *dev);
-+int yaffs_deinit_nand(struct yaffs_dev *dev);
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_packedtags1.c linux-3.15-rc5/fs/yaffs2/yaffs_packedtags1.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_packedtags1.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_packedtags1.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,56 @@
-+/*
-+ * 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_packedtags1.h"
-+#include "yportenv.h"
-+
-+static const u8 all_ff[20] = {
-+ 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff
-+};
-+
-+void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
-+ const struct yaffs_ext_tags *t)
-+{
-+ pt->chunk_id = t->chunk_id;
-+ pt->serial_number = t->serial_number;
-+ pt->n_bytes = t->n_bytes;
-+ pt->obj_id = t->obj_id;
-+ pt->ecc = 0;
-+ pt->deleted = (t->is_deleted) ? 0 : 1;
-+ pt->unused_stuff = 0;
-+ pt->should_be_ff = 0xffffffff;
-+}
-+
-+void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
-+ const struct yaffs_packed_tags1 *pt)
-+{
-+
-+ if (memcmp(all_ff, pt, sizeof(struct yaffs_packed_tags1))) {
-+ t->block_bad = 0;
-+ if (pt->should_be_ff != 0xffffffff)
-+ t->block_bad = 1;
-+ t->chunk_used = 1;
-+ t->obj_id = pt->obj_id;
-+ t->chunk_id = pt->chunk_id;
-+ t->n_bytes = pt->n_bytes;
-+ t->ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
-+ t->is_deleted = (pt->deleted) ? 0 : 1;
-+ t->serial_number = pt->serial_number;
-+ } else {
-+ memset(t, 0, sizeof(struct yaffs_ext_tags));
-+ }
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_packedtags1.h linux-3.15-rc5/fs/yaffs2/yaffs_packedtags1.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_packedtags1.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_packedtags1.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,39 @@
-+/*
-+ * 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.
-+ */
-+
-+/* This is used to pack YAFFS1 tags, not YAFFS2 tags. */
-+
-+#ifndef __YAFFS_PACKEDTAGS1_H__
-+#define __YAFFS_PACKEDTAGS1_H__
-+
-+#include "yaffs_guts.h"
-+
-+struct yaffs_packed_tags1 {
-+ u32 chunk_id:20;
-+ u32 serial_number:2;
-+ u32 n_bytes:10;
-+ u32 obj_id:18;
-+ u32 ecc:12;
-+ u32 deleted:1;
-+ u32 unused_stuff:1;
-+ unsigned should_be_ff;
-+
-+};
-+
-+void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
-+ const struct yaffs_ext_tags *t);
-+void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
-+ const struct yaffs_packed_tags1 *pt);
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_packedtags2.c linux-3.15-rc5/fs/yaffs2/yaffs_packedtags2.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_packedtags2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_packedtags2.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,197 @@
-+/*
-+ * 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_packedtags2.h"
-+#include "yportenv.h"
-+#include "yaffs_trace.h"
-+
-+/* This code packs a set of extended tags into a binary structure for
-+ * NAND storage
-+ */
-+
-+/* Some of the information is "extra" struff which can be packed in to
-+ * speed scanning
-+ * This is defined by having the EXTRA_HEADER_INFO_FLAG set.
-+ */
-+
-+/* Extra flags applied to chunk_id */
-+
-+#define EXTRA_HEADER_INFO_FLAG 0x80000000
-+#define EXTRA_SHRINK_FLAG 0x40000000
-+#define EXTRA_SHADOWS_FLAG 0x20000000
-+#define EXTRA_SPARE_FLAGS 0x10000000
-+
-+#define ALL_EXTRA_FLAGS 0xf0000000
-+
-+/* Also, the top 4 bits of the object Id are set to the object type. */
-+#define EXTRA_OBJECT_TYPE_SHIFT (28)
-+#define EXTRA_OBJECT_TYPE_MASK ((0x0f) << EXTRA_OBJECT_TYPE_SHIFT)
-+
-+static void yaffs_dump_packed_tags2_tags_only(
-+ const struct yaffs_packed_tags2_tags_only *ptt)
-+{
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "packed tags obj %d chunk %d byte %d seq %d",
-+ ptt->obj_id, ptt->chunk_id, ptt->n_bytes, ptt->seq_number);
-+}
-+
-+static void yaffs_dump_packed_tags2(const struct yaffs_packed_tags2 *pt)
-+{
-+ yaffs_dump_packed_tags2_tags_only(&pt->t);
-+}
-+
-+static void yaffs_dump_tags2(const struct yaffs_ext_tags *t)
-+{
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d",
-+ t->ecc_result, t->block_bad, t->chunk_used, t->obj_id,
-+ t->chunk_id, t->n_bytes, t->is_deleted, t->serial_number,
-+ t->seq_number);
-+
-+}
-+
-+static int yaffs_check_tags_extra_packable(const struct yaffs_ext_tags *t)
-+{
-+ if (t->chunk_id != 0 || !t->extra_available)
-+ return 0;
-+
-+ /* Check if the file size is too long to store */
-+ if (t->extra_obj_type == YAFFS_OBJECT_TYPE_FILE &&
-+ (t->extra_file_size >> 31) != 0)
-+ return 0;
-+ return 1;
-+}
-+
-+void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt,
-+ const struct yaffs_ext_tags *t)
-+{
-+ ptt->chunk_id = t->chunk_id;
-+ ptt->seq_number = t->seq_number;
-+ ptt->n_bytes = t->n_bytes;
-+ ptt->obj_id = t->obj_id;
-+
-+ /* Only store extra tags for object headers.
-+ * If it is a file then only store if the file size is short\
-+ * enough to fit.
-+ */
-+ if (yaffs_check_tags_extra_packable(t)) {
-+ /* Store the extra header info instead */
-+ /* We save the parent object in the chunk_id */
-+ ptt->chunk_id = EXTRA_HEADER_INFO_FLAG | t->extra_parent_id;
-+ if (t->extra_is_shrink)
-+ ptt->chunk_id |= EXTRA_SHRINK_FLAG;
-+ if (t->extra_shadows)
-+ ptt->chunk_id |= EXTRA_SHADOWS_FLAG;
-+
-+ ptt->obj_id &= ~EXTRA_OBJECT_TYPE_MASK;
-+ ptt->obj_id |= (t->extra_obj_type << EXTRA_OBJECT_TYPE_SHIFT);
-+
-+ if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
-+ ptt->n_bytes = t->extra_equiv_id;
-+ else if (t->extra_obj_type == YAFFS_OBJECT_TYPE_FILE)
-+ ptt->n_bytes = (unsigned) t->extra_file_size;
-+ else
-+ ptt->n_bytes = 0;
-+ }
-+
-+ yaffs_dump_packed_tags2_tags_only(ptt);
-+ yaffs_dump_tags2(t);
-+}
-+
-+void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
-+ const struct yaffs_ext_tags *t, int tags_ecc)
-+{
-+ yaffs_pack_tags2_tags_only(&pt->t, t);
-+
-+ if (tags_ecc)
-+ yaffs_ecc_calc_other((unsigned char *)&pt->t,
-+ sizeof(struct yaffs_packed_tags2_tags_only),
-+ &pt->ecc);
-+}
-+
-+void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
-+ struct yaffs_packed_tags2_tags_only *ptt)
-+{
-+ memset(t, 0, sizeof(struct yaffs_ext_tags));
-+
-+ if (ptt->seq_number == 0xffffffff)
-+ return;
-+
-+ t->block_bad = 0;
-+ t->chunk_used = 1;
-+ t->obj_id = ptt->obj_id;
-+ t->chunk_id = ptt->chunk_id;
-+ t->n_bytes = ptt->n_bytes;
-+ t->is_deleted = 0;
-+ t->serial_number = 0;
-+ t->seq_number = ptt->seq_number;
-+
-+ /* Do extra header info stuff */
-+ if (ptt->chunk_id & EXTRA_HEADER_INFO_FLAG) {
-+ t->chunk_id = 0;
-+ t->n_bytes = 0;
-+
-+ t->extra_available = 1;
-+ t->extra_parent_id = ptt->chunk_id & (~(ALL_EXTRA_FLAGS));
-+ t->extra_is_shrink = ptt->chunk_id & EXTRA_SHRINK_FLAG ? 1 : 0;
-+ t->extra_shadows = ptt->chunk_id & EXTRA_SHADOWS_FLAG ? 1 : 0;
-+ t->extra_obj_type = ptt->obj_id >> EXTRA_OBJECT_TYPE_SHIFT;
-+ t->obj_id &= ~EXTRA_OBJECT_TYPE_MASK;
-+
-+ if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
-+ t->extra_equiv_id = ptt->n_bytes;
-+ else
-+ t->extra_file_size = ptt->n_bytes;
-+ }
-+ yaffs_dump_packed_tags2_tags_only(ptt);
-+ yaffs_dump_tags2(t);
-+}
-+
-+void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
-+ int tags_ecc)
-+{
-+ enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+ if (pt->t.seq_number != 0xffffffff && tags_ecc) {
-+ /* Chunk is in use and we need to do ECC */
-+
-+ struct yaffs_ecc_other ecc;
-+ int result;
-+ yaffs_ecc_calc_other((unsigned char *)&pt->t,
-+ sizeof(struct yaffs_packed_tags2_tags_only),
-+ &ecc);
-+ result =
-+ yaffs_ecc_correct_other((unsigned char *)&pt->t,
-+ sizeof(struct yaffs_packed_tags2_tags_only),
-+ &pt->ecc, &ecc);
-+ switch (result) {
-+ case 0:
-+ ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
-+ break;
-+ case 1:
-+ ecc_result = YAFFS_ECC_RESULT_FIXED;
-+ break;
-+ case -1:
-+ ecc_result = YAFFS_ECC_RESULT_UNFIXED;
-+ break;
-+ default:
-+ ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
-+ }
-+ }
-+ yaffs_unpack_tags2_tags_only(t, &pt->t);
-+
-+ t->ecc_result = ecc_result;
-+
-+ yaffs_dump_packed_tags2(pt);
-+ yaffs_dump_tags2(t);
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_packedtags2.h linux-3.15-rc5/fs/yaffs2/yaffs_packedtags2.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_packedtags2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_packedtags2.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,47 @@
-+/*
-+ * 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.
-+ */
-+
-+/* This is used to pack YAFFS2 tags, not YAFFS1tags. */
-+
-+#ifndef __YAFFS_PACKEDTAGS2_H__
-+#define __YAFFS_PACKEDTAGS2_H__
-+
-+#include "yaffs_guts.h"
-+#include "yaffs_ecc.h"
-+
-+struct yaffs_packed_tags2_tags_only {
-+ unsigned seq_number;
-+ unsigned obj_id;
-+ unsigned chunk_id;
-+ unsigned n_bytes;
-+};
-+
-+struct yaffs_packed_tags2 {
-+ struct yaffs_packed_tags2_tags_only t;
-+ struct yaffs_ecc_other ecc;
-+};
-+
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
-+ const struct yaffs_ext_tags *t, int tags_ecc);
-+void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
-+ int tags_ecc);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *pt,
-+ const struct yaffs_ext_tags *t);
-+void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
-+ struct yaffs_packed_tags2_tags_only *pt);
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_summary.c linux-3.15-rc5/fs/yaffs2/yaffs_summary.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_summary.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_summary.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,312 @@
-+/*
-+ * 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.
-+ */
-+
-+/* Summaries write the useful part of the tags for the chunks in a block into an
-+ * an array which is written to the last n chunks of the block.
-+ * Reading the summaries gives all the tags for the block in one read. Much
-+ * faster.
-+ *
-+ * Chunks holding summaries are marked with tags making it look like
-+ * they are part of a fake file.
-+ *
-+ * The summary could also be used during gc.
-+ *
-+ */
-+
-+#include "yaffs_summary.h"
-+#include "yaffs_packedtags2.h"
-+#include "yaffs_nand.h"
-+#include "yaffs_getblockinfo.h"
-+#include "yaffs_bitmap.h"
-+
-+/*
-+ * The summary is built up in an array of summary tags.
-+ * This gets written to the last one or two (maybe more) chunks in a block.
-+ * A summary header is written as the first part of each chunk of summary data.
-+ * The summary header must match or the summary is rejected.
-+ */
-+
-+/* Summary tags don't need the sequence number because that is redundant. */
-+struct yaffs_summary_tags {
-+ unsigned obj_id;
-+ unsigned chunk_id;
-+ unsigned n_bytes;
-+};
-+
-+/* Summary header */
-+struct yaffs_summary_header {
-+ unsigned version; /* Must match current version */
-+ unsigned block; /* Must be this block */
-+ unsigned seq; /* Must be this sequence number */
-+ unsigned sum; /* Just add up all the bytes in the tags */
-+};
-+
-+
-+static void yaffs_summary_clear(struct yaffs_dev *dev)
-+{
-+ if (!dev->sum_tags)
-+ return;
-+ memset(dev->sum_tags, 0, dev->chunks_per_summary *
-+ sizeof(struct yaffs_summary_tags));
-+}
-+
-+
-+void yaffs_summary_deinit(struct yaffs_dev *dev)
-+{
-+ kfree(dev->sum_tags);
-+ dev->sum_tags = NULL;
-+ kfree(dev->gc_sum_tags);
-+ dev->gc_sum_tags = NULL;
-+ dev->chunks_per_summary = 0;
-+}
-+
-+int yaffs_summary_init(struct yaffs_dev *dev)
-+{
-+ int sum_bytes;
-+ int chunks_used; /* Number of chunks used by summary */
-+ int sum_tags_bytes;
-+
-+ sum_bytes = dev->param.chunks_per_block *
-+ sizeof(struct yaffs_summary_tags);
-+
-+ chunks_used = (sum_bytes + dev->data_bytes_per_chunk - 1)/
-+ (dev->data_bytes_per_chunk -
-+ sizeof(struct yaffs_summary_header));
-+
-+ dev->chunks_per_summary = dev->param.chunks_per_block - chunks_used;
-+ sum_tags_bytes = sizeof(struct yaffs_summary_tags) *
-+ dev->chunks_per_summary;
-+ dev->sum_tags = kmalloc(sum_tags_bytes, GFP_NOFS);
-+ dev->gc_sum_tags = kmalloc(sum_tags_bytes, GFP_NOFS);
-+ if (!dev->sum_tags || !dev->gc_sum_tags) {
-+ yaffs_summary_deinit(dev);
-+ return YAFFS_FAIL;
-+ }
-+
-+ yaffs_summary_clear(dev);
-+
-+ return YAFFS_OK;
-+}
-+
-+static unsigned yaffs_summary_sum(struct yaffs_dev *dev)
-+{
-+ u8 *sum_buffer = (u8 *)dev->sum_tags;
-+ int i;
-+ unsigned sum = 0;
-+
-+ i = sizeof(struct yaffs_summary_tags) *
-+ dev->chunks_per_summary;
-+ while (i > 0) {
-+ sum += *sum_buffer;
-+ sum_buffer++;
-+ i--;
-+ }
-+
-+ return sum;
-+}
-+
-+static int yaffs_summary_write(struct yaffs_dev *dev, int blk)
-+{
-+ struct yaffs_ext_tags tags;
-+ u8 *buffer;
-+ u8 *sum_buffer = (u8 *)dev->sum_tags;
-+ int n_bytes;
-+ int chunk_in_nand;
-+ int chunk_in_block;
-+ int result;
-+ int this_tx;
-+ struct yaffs_summary_header hdr;
-+ int sum_bytes_per_chunk = dev->data_bytes_per_chunk - sizeof(hdr);
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
-+
-+ buffer = yaffs_get_temp_buffer(dev);
-+ n_bytes = sizeof(struct yaffs_summary_tags) *
-+ dev->chunks_per_summary;
-+ memset(&tags, 0, sizeof(struct yaffs_ext_tags));
-+ tags.obj_id = YAFFS_OBJECTID_SUMMARY;
-+ tags.chunk_id = 1;
-+ chunk_in_block = dev->chunks_per_summary;
-+ chunk_in_nand = dev->alloc_block * dev->param.chunks_per_block +
-+ dev->chunks_per_summary;
-+ hdr.version = YAFFS_SUMMARY_VERSION;
-+ hdr.block = blk;
-+ hdr.seq = bi->seq_number;
-+ hdr.sum = yaffs_summary_sum(dev);
-+
-+ do {
-+ this_tx = n_bytes;
-+ if (this_tx > sum_bytes_per_chunk)
-+ this_tx = sum_bytes_per_chunk;
-+ memcpy(buffer, &hdr, sizeof(hdr));
-+ memcpy(buffer + sizeof(hdr), sum_buffer, this_tx);
-+ tags.n_bytes = this_tx + sizeof(hdr);
-+ result = yaffs_wr_chunk_tags_nand(dev, chunk_in_nand,
-+ buffer, &tags);
-+
-+ if (result != YAFFS_OK)
-+ break;
-+ yaffs_set_chunk_bit(dev, blk, chunk_in_block);
-+ bi->pages_in_use++;
-+ dev->n_free_chunks--;
-+
-+ n_bytes -= this_tx;
-+ sum_buffer += this_tx;
-+ chunk_in_nand++;
-+ chunk_in_block++;
-+ tags.chunk_id++;
-+ } while (result == YAFFS_OK && n_bytes > 0);
-+ yaffs_release_temp_buffer(dev, buffer);
-+
-+
-+ if (result == YAFFS_OK)
-+ bi->has_summary = 1;
-+
-+
-+ return result;
-+}
-+
-+int yaffs_summary_read(struct yaffs_dev *dev,
-+ struct yaffs_summary_tags *st,
-+ int blk)
-+{
-+ struct yaffs_ext_tags tags;
-+ u8 *buffer;
-+ u8 *sum_buffer = (u8 *)st;
-+ int n_bytes;
-+ int chunk_id;
-+ int chunk_in_nand;
-+ int chunk_in_block;
-+ int result;
-+ int this_tx;
-+ struct yaffs_summary_header hdr;
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
-+ int sum_bytes_per_chunk = dev->data_bytes_per_chunk - sizeof(hdr);
-+ int sum_tags_bytes;
-+
-+ sum_tags_bytes = sizeof(struct yaffs_summary_tags) *
-+ dev->chunks_per_summary;
-+ buffer = yaffs_get_temp_buffer(dev);
-+ n_bytes = sizeof(struct yaffs_summary_tags) * dev->chunks_per_summary;
-+ chunk_in_block = dev->chunks_per_summary;
-+ chunk_in_nand = blk * dev->param.chunks_per_block +
-+ dev->chunks_per_summary;
-+ chunk_id = 1;
-+ do {
-+ this_tx = n_bytes;
-+ if (this_tx > sum_bytes_per_chunk)
-+ this_tx = sum_bytes_per_chunk;
-+ result = yaffs_rd_chunk_tags_nand(dev, chunk_in_nand,
-+ buffer, &tags);
-+
-+ if (tags.chunk_id != chunk_id ||
-+ tags.obj_id != YAFFS_OBJECTID_SUMMARY ||
-+ tags.chunk_used == 0 ||
-+ tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
-+ tags.n_bytes != (this_tx + sizeof(hdr)))
-+ result = YAFFS_FAIL;
-+ if (result != YAFFS_OK)
-+ break;
-+
-+ if (st == dev->sum_tags) {
-+ /* If we're scanning then update the block info */
-+ yaffs_set_chunk_bit(dev, blk, chunk_in_block);
-+ bi->pages_in_use++;
-+ }
-+ memcpy(&hdr, buffer, sizeof(hdr));
-+ memcpy(sum_buffer, buffer + sizeof(hdr), this_tx);
-+ n_bytes -= this_tx;
-+ sum_buffer += this_tx;
-+ chunk_in_nand++;
-+ chunk_in_block++;
-+ chunk_id++;
-+ } while (result == YAFFS_OK && n_bytes > 0);
-+ yaffs_release_temp_buffer(dev, buffer);
-+
-+ if (result == YAFFS_OK) {
-+ /* Verify header */
-+ if (hdr.version != YAFFS_SUMMARY_VERSION ||
-+ hdr.seq != bi->seq_number ||
-+ hdr.sum != yaffs_summary_sum(dev))
-+ result = YAFFS_FAIL;
-+ }
-+
-+ if (st == dev->sum_tags && result == YAFFS_OK)
-+ bi->has_summary = 1;
-+
-+ return result;
-+}
-+
-+int yaffs_summary_add(struct yaffs_dev *dev,
-+ struct yaffs_ext_tags *tags,
-+ int chunk_in_nand)
-+{
-+ struct yaffs_packed_tags2_tags_only tags_only;
-+ struct yaffs_summary_tags *sum_tags;
-+ int block_in_nand = chunk_in_nand / dev->param.chunks_per_block;
-+ int chunk_in_block = chunk_in_nand % dev->param.chunks_per_block;
-+
-+ if (!dev->sum_tags)
-+ return YAFFS_OK;
-+
-+ if (chunk_in_block >= 0 && chunk_in_block < dev->chunks_per_summary) {
-+ yaffs_pack_tags2_tags_only(&tags_only, tags);
-+ sum_tags = &dev->sum_tags[chunk_in_block];
-+ sum_tags->chunk_id = tags_only.chunk_id;
-+ sum_tags->n_bytes = tags_only.n_bytes;
-+ sum_tags->obj_id = tags_only.obj_id;
-+
-+ if (chunk_in_block == dev->chunks_per_summary - 1) {
-+ /* Time to write out the summary */
-+ yaffs_summary_write(dev, block_in_nand);
-+ yaffs_summary_clear(dev);
-+ yaffs_skip_rest_of_block(dev);
-+ }
-+ }
-+ return YAFFS_OK;
-+}
-+
-+int yaffs_summary_fetch(struct yaffs_dev *dev,
-+ struct yaffs_ext_tags *tags,
-+ int chunk_in_block)
-+{
-+ struct yaffs_packed_tags2_tags_only tags_only;
-+ struct yaffs_summary_tags *sum_tags;
-+ if (chunk_in_block >= 0 && chunk_in_block < dev->chunks_per_summary) {
-+ sum_tags = &dev->sum_tags[chunk_in_block];
-+ tags_only.chunk_id = sum_tags->chunk_id;
-+ tags_only.n_bytes = sum_tags->n_bytes;
-+ tags_only.obj_id = sum_tags->obj_id;
-+ yaffs_unpack_tags2_tags_only(tags, &tags_only);
-+ return YAFFS_OK;
-+ }
-+ return YAFFS_FAIL;
-+}
-+
-+void yaffs_summary_gc(struct yaffs_dev *dev, int blk)
-+{
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
-+ int i;
-+
-+ if (!bi->has_summary)
-+ return;
-+
-+ for (i = dev->chunks_per_summary;
-+ i < dev->param.chunks_per_block;
-+ i++) {
-+ if (yaffs_check_chunk_bit(dev, blk, i)) {
-+ yaffs_clear_chunk_bit(dev, blk, i);
-+ bi->pages_in_use--;
-+ dev->n_free_chunks++;
-+ }
-+ }
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_summary.h linux-3.15-rc5/fs/yaffs2/yaffs_summary.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_summary.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_summary.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,37 @@
-+/*
-+ * 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_SUMMARY_H__
-+#define __YAFFS_SUMMARY_H__
-+
-+#include "yaffs_packedtags2.h"
-+
-+
-+int yaffs_summary_init(struct yaffs_dev *dev);
-+void yaffs_summary_deinit(struct yaffs_dev *dev);
-+
-+int yaffs_summary_add(struct yaffs_dev *dev,
-+ struct yaffs_ext_tags *tags,
-+ int chunk_in_block);
-+int yaffs_summary_fetch(struct yaffs_dev *dev,
-+ struct yaffs_ext_tags *tags,
-+ int chunk_in_block);
-+int yaffs_summary_read(struct yaffs_dev *dev,
-+ struct yaffs_summary_tags *st,
-+ int blk);
-+void yaffs_summary_gc(struct yaffs_dev *dev, int blk);
-+
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_tagscompat.c linux-3.15-rc5/fs/yaffs2/yaffs_tagscompat.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_tagscompat.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_tagscompat.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,381 @@
-+/*
-+ * 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_tagscompat.h"
-+#include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
-+#include "yaffs_trace.h"
-+
-+static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
-+
-+
-+/********** Tags ECC calculations *********/
-+
-+
-+void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
-+{
-+ /* Calculate an ecc */
-+ unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
-+ unsigned i, j;
-+ unsigned ecc = 0;
-+ unsigned bit = 0;
-+
-+ tags->ecc = 0;
-+
-+ for (i = 0; i < 8; i++) {
-+ for (j = 1; j & 0xff; j <<= 1) {
-+ bit++;
-+ if (b[i] & j)
-+ ecc ^= bit;
-+ }
-+ }
-+ tags->ecc = ecc;
-+}
-+
-+int yaffs_check_tags_ecc(struct yaffs_tags *tags)
-+{
-+ unsigned ecc = tags->ecc;
-+
-+ yaffs_calc_tags_ecc(tags);
-+
-+ ecc ^= tags->ecc;
-+
-+ if (ecc && ecc <= 64) {
-+ /* TODO: Handle the failure better. Retire? */
-+ unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
-+
-+ ecc--;
-+
-+ b[ecc / 8] ^= (1 << (ecc & 7));
-+
-+ /* Now recvalc the ecc */
-+ yaffs_calc_tags_ecc(tags);
-+
-+ return 1; /* recovered error */
-+ } else if (ecc) {
-+ /* Wierd ecc failure value */
-+ /* TODO Need to do somethiong here */
-+ return -1; /* unrecovered error */
-+ }
-+ return 0;
-+}
-+
-+/********** Tags **********/
-+
-+static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr,
-+ struct yaffs_tags *tags_ptr)
-+{
-+ union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr;
-+
-+ yaffs_calc_tags_ecc(tags_ptr);
-+
-+ spare_ptr->tb0 = tu->as_bytes[0];
-+ spare_ptr->tb1 = tu->as_bytes[1];
-+ spare_ptr->tb2 = tu->as_bytes[2];
-+ spare_ptr->tb3 = tu->as_bytes[3];
-+ spare_ptr->tb4 = tu->as_bytes[4];
-+ spare_ptr->tb5 = tu->as_bytes[5];
-+ spare_ptr->tb6 = tu->as_bytes[6];
-+ spare_ptr->tb7 = tu->as_bytes[7];
-+}
-+
-+static void yaffs_get_tags_from_spare(struct yaffs_dev *dev,
-+ struct yaffs_spare *spare_ptr,
-+ struct yaffs_tags *tags_ptr)
-+{
-+ union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr;
-+ int result;
-+
-+ tu->as_bytes[0] = spare_ptr->tb0;
-+ tu->as_bytes[1] = spare_ptr->tb1;
-+ tu->as_bytes[2] = spare_ptr->tb2;
-+ tu->as_bytes[3] = spare_ptr->tb3;
-+ tu->as_bytes[4] = spare_ptr->tb4;
-+ tu->as_bytes[5] = spare_ptr->tb5;
-+ tu->as_bytes[6] = spare_ptr->tb6;
-+ tu->as_bytes[7] = spare_ptr->tb7;
-+
-+ result = yaffs_check_tags_ecc(tags_ptr);
-+ if (result > 0)
-+ dev->n_tags_ecc_fixed++;
-+ else if (result < 0)
-+ dev->n_tags_ecc_unfixed++;
-+}
-+
-+static void yaffs_spare_init(struct yaffs_spare *spare)
-+{
-+ memset(spare, 0xff, sizeof(struct yaffs_spare));
-+}
-+
-+static int yaffs_wr_nand(struct yaffs_dev *dev,
-+ int nand_chunk, const u8 *data,
-+ struct yaffs_spare *spare)
-+{
-+ int data_size = dev->data_bytes_per_chunk;
-+
-+ return dev->drv.drv_write_chunk_fn(dev, nand_chunk,
-+ data, data_size,
-+ (u8 *) spare, sizeof(*spare));
-+}
-+
-+static int yaffs_rd_chunk_nand(struct yaffs_dev *dev,
-+ int nand_chunk,
-+ u8 *data,
-+ struct yaffs_spare *spare,
-+ enum yaffs_ecc_result *ecc_result,
-+ int correct_errors)
-+{
-+ int ret_val;
-+ struct yaffs_spare local_spare;
-+ int data_size;
-+ int spare_size;
-+ int ecc_result1, ecc_result2;
-+ u8 calc_ecc[3];
-+
-+ if (!spare) {
-+ /* If we don't have a real spare, then we use a local one. */
-+ /* Need this for the calculation of the ecc */
-+ spare = &local_spare;
-+ }
-+ data_size = dev->data_bytes_per_chunk;
-+ spare_size = sizeof(struct yaffs_spare);
-+
-+ if (dev->param.use_nand_ecc)
-+ return dev->drv.drv_read_chunk_fn(dev, nand_chunk,
-+ data, data_size,
-+ (u8 *) spare, spare_size,
-+ ecc_result);
-+
-+
-+ /* Handle the ECC at this level. */
-+
-+ ret_val = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
-+ data, data_size,
-+ (u8 *)spare, spare_size,
-+ NULL);
-+ if (!data || !correct_errors)
-+ return ret_val;
-+
-+ /* Do ECC correction if needed. */
-+ yaffs_ecc_calc(data, calc_ecc);
-+ ecc_result1 = yaffs_ecc_correct(data, spare->ecc1, calc_ecc);
-+ yaffs_ecc_calc(&data[256], calc_ecc);
-+ ecc_result2 = yaffs_ecc_correct(&data[256], spare->ecc2, calc_ecc);
-+
-+ if (ecc_result1 > 0) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "**>>yaffs ecc error fix performed on chunk %d:0",
-+ nand_chunk);
-+ dev->n_ecc_fixed++;
-+ } else if (ecc_result1 < 0) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "**>>yaffs ecc error unfixed on chunk %d:0",
-+ nand_chunk);
-+ dev->n_ecc_unfixed++;
-+ }
-+
-+ if (ecc_result2 > 0) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "**>>yaffs ecc error fix performed on chunk %d:1",
-+ nand_chunk);
-+ dev->n_ecc_fixed++;
-+ } else if (ecc_result2 < 0) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "**>>yaffs ecc error unfixed on chunk %d:1",
-+ nand_chunk);
-+ dev->n_ecc_unfixed++;
-+ }
-+
-+ if (ecc_result1 || ecc_result2) {
-+ /* We had a data problem on this page */
-+ yaffs_handle_rd_data_error(dev, nand_chunk);
-+ }
-+
-+ if (ecc_result1 < 0 || ecc_result2 < 0)
-+ *ecc_result = YAFFS_ECC_RESULT_UNFIXED;
-+ else if (ecc_result1 > 0 || ecc_result2 > 0)
-+ *ecc_result = YAFFS_ECC_RESULT_FIXED;
-+ else
-+ *ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+ return ret_val;
-+}
-+
-+/*
-+ * Functions for robustisizing
-+ */
-+
-+static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk)
-+{
-+ int flash_block = nand_chunk / dev->param.chunks_per_block;
-+
-+ /* Mark the block for retirement */
-+ yaffs_get_block_info(dev, flash_block + dev->block_offset)->
-+ needs_retiring = 1;
-+ yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-+ "**>>Block %d marked for retirement",
-+ flash_block);
-+
-+ /* TODO:
-+ * Just do a garbage collection on the affected block
-+ * then retire the block
-+ * NB recursion
-+ */
-+}
-+
-+static int yaffs_tags_compat_wr(struct yaffs_dev *dev,
-+ int nand_chunk,
-+ const u8 *data, const struct yaffs_ext_tags *ext_tags)
-+{
-+ struct yaffs_spare spare;
-+ struct yaffs_tags tags;
-+
-+ yaffs_spare_init(&spare);
-+
-+ if (ext_tags->is_deleted)
-+ spare.page_status = 0;
-+ else {
-+ tags.obj_id = ext_tags->obj_id;
-+ tags.chunk_id = ext_tags->chunk_id;
-+
-+ tags.n_bytes_lsb = ext_tags->n_bytes & (1024 - 1);
-+
-+ if (dev->data_bytes_per_chunk >= 1024)
-+ tags.n_bytes_msb = (ext_tags->n_bytes >> 10) & 3;
-+ else
-+ tags.n_bytes_msb = 3;
-+
-+ tags.serial_number = ext_tags->serial_number;
-+
-+ if (!dev->param.use_nand_ecc && data) {
-+ yaffs_ecc_calc(data, spare.ecc1);
-+ yaffs_ecc_calc(&data[256], spare.ecc2);
-+ }
-+
-+ yaffs_load_tags_to_spare(&spare, &tags);
-+ }
-+ return yaffs_wr_nand(dev, nand_chunk, data, &spare);
-+}
-+
-+static int yaffs_tags_compat_rd(struct yaffs_dev *dev,
-+ int nand_chunk,
-+ u8 *data, struct yaffs_ext_tags *ext_tags)
-+{
-+ struct yaffs_spare spare;
-+ struct yaffs_tags tags;
-+ enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
-+ static struct yaffs_spare spare_ff;
-+ static int init;
-+ int deleted;
-+
-+ if (!init) {
-+ memset(&spare_ff, 0xff, sizeof(spare_ff));
-+ init = 1;
-+ }
-+
-+ if (!yaffs_rd_chunk_nand(dev, nand_chunk,
-+ data, &spare, &ecc_result, 1))
-+ return YAFFS_FAIL;
-+
-+ /* ext_tags may be NULL */
-+ if (!ext_tags)
-+ return YAFFS_OK;
-+
-+ deleted = (hweight8(spare.page_status) < 7) ? 1 : 0;
-+
-+ ext_tags->is_deleted = deleted;
-+ ext_tags->ecc_result = ecc_result;
-+ ext_tags->block_bad = 0; /* We're reading it */
-+ /* therefore it is not a bad block */
-+ ext_tags->chunk_used =
-+ memcmp(&spare_ff, &spare, sizeof(spare_ff)) ? 1 : 0;
-+
-+ if (ext_tags->chunk_used) {
-+ yaffs_get_tags_from_spare(dev, &spare, &tags);
-+ ext_tags->obj_id = tags.obj_id;
-+ ext_tags->chunk_id = tags.chunk_id;
-+ ext_tags->n_bytes = tags.n_bytes_lsb;
-+
-+ if (dev->data_bytes_per_chunk >= 1024)
-+ ext_tags->n_bytes |=
-+ (((unsigned)tags.n_bytes_msb) << 10);
-+
-+ ext_tags->serial_number = tags.serial_number;
-+ }
-+
-+ return YAFFS_OK;
-+}
-+
-+static int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
-+{
-+ struct yaffs_spare spare;
-+
-+ memset(&spare, 0xff, sizeof(struct yaffs_spare));
-+
-+ spare.block_status = 'Y';
-+
-+ yaffs_wr_nand(dev, flash_block * dev->param.chunks_per_block, NULL,
-+ &spare);
-+ yaffs_wr_nand(dev, flash_block * dev->param.chunks_per_block + 1,
-+ NULL, &spare);
-+
-+ return YAFFS_OK;
-+}
-+
-+static int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
-+ int block_no,
-+ enum yaffs_block_state *state,
-+ u32 *seq_number)
-+{
-+ struct yaffs_spare spare0, spare1;
-+ static struct yaffs_spare spare_ff;
-+ static int init;
-+ enum yaffs_ecc_result dummy;
-+
-+ if (!init) {
-+ memset(&spare_ff, 0xff, sizeof(spare_ff));
-+ init = 1;
-+ }
-+
-+ *seq_number = 0;
-+
-+ /* Look for bad block markers in the first two chunks */
-+ yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block,
-+ NULL, &spare0, &dummy, 0);
-+ yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block + 1,
-+ NULL, &spare1, &dummy, 0);
-+
-+ if (hweight8(spare0.block_status & spare1.block_status) < 7)
-+ *state = YAFFS_BLOCK_STATE_DEAD;
-+ else if (memcmp(&spare_ff, &spare0, sizeof(spare_ff)) == 0)
-+ *state = YAFFS_BLOCK_STATE_EMPTY;
-+ else
-+ *state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
-+
-+ return YAFFS_OK;
-+}
-+
-+void yaffs_tags_compat_install(struct yaffs_dev *dev)
-+{
-+ if(dev->param.is_yaffs2)
-+ return;
-+ if(!dev->tagger.write_chunk_tags_fn)
-+ dev->tagger.write_chunk_tags_fn = yaffs_tags_compat_wr;
-+ if(!dev->tagger.read_chunk_tags_fn)
-+ dev->tagger.read_chunk_tags_fn = yaffs_tags_compat_rd;
-+ if(!dev->tagger.query_block_fn)
-+ dev->tagger.query_block_fn = yaffs_tags_compat_query_block;
-+ if(!dev->tagger.mark_bad_fn)
-+ dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_tagscompat.h linux-3.15-rc5/fs/yaffs2/yaffs_tagscompat.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_tagscompat.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_tagscompat.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,44 @@
-+/*
-+ * 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_TAGSCOMPAT_H__
-+#define __YAFFS_TAGSCOMPAT_H__
-+
-+
-+#include "yaffs_guts.h"
-+
-+#if 0
-+
-+
-+int yaffs_tags_compat_wr(struct yaffs_dev *dev,
-+ int nand_chunk,
-+ const u8 *data, const struct yaffs_ext_tags *tags);
-+int yaffs_tags_compat_rd(struct yaffs_dev *dev,
-+ int nand_chunk,
-+ u8 *data, struct yaffs_ext_tags *tags);
-+int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int block_no);
-+int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
-+ int block_no,
-+ enum yaffs_block_state *state,
-+ u32 *seq_number);
-+
-+#endif
-+
-+
-+void yaffs_tags_compat_install(struct yaffs_dev *dev);
-+void yaffs_calc_tags_ecc(struct yaffs_tags *tags);
-+int yaffs_check_tags_ecc(struct yaffs_tags *tags);
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_tagsmarshall.c linux-3.15-rc5/fs/yaffs2/yaffs_tagsmarshall.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_tagsmarshall.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_tagsmarshall.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,199 @@
-+/*
-+ * 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_trace.h"
-+#include "yaffs_packedtags2.h"
-+
-+static int yaffs_tags_marshall_write(struct yaffs_dev *dev,
-+ int nand_chunk, const u8 *data,
-+ const struct yaffs_ext_tags *tags)
-+{
-+ struct yaffs_packed_tags2 pt;
-+ int retval;
-+
-+ int packed_tags_size =
-+ dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
-+ void *packed_tags_ptr =
-+ dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
-+
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "yaffs_tags_marshall_write chunk %d data %p tags %p",
-+ nand_chunk, data, tags);
-+
-+ /* For yaffs2 writing there must be both data and tags.
-+ * If we're using inband tags, then the tags are stuffed into
-+ * the end of the data buffer.
-+ */
-+ if (!data || !tags)
-+ BUG();
-+ else if (dev->param.inband_tags) {
-+ struct yaffs_packed_tags2_tags_only *pt2tp;
-+ pt2tp =
-+ (struct yaffs_packed_tags2_tags_only *)(data +
-+ dev->
-+ data_bytes_per_chunk);
-+ yaffs_pack_tags2_tags_only(pt2tp, tags);
-+ } else {
-+ yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
-+ }
-+
-+ retval = dev->drv.drv_write_chunk_fn(dev, nand_chunk,
-+ data, dev->param.total_bytes_per_chunk,
-+ (dev->param.inband_tags) ? NULL : packed_tags_ptr,
-+ (dev->param.inband_tags) ? 0 : packed_tags_size);
-+
-+ return retval;
-+}
-+
-+static int yaffs_tags_marshall_read(struct yaffs_dev *dev,
-+ int nand_chunk, u8 *data,
-+ struct yaffs_ext_tags *tags)
-+{
-+ int retval = 0;
-+ int local_data = 0;
-+ u8 spare_buffer[100];
-+ enum yaffs_ecc_result ecc_result;
-+
-+ struct yaffs_packed_tags2 pt;
-+
-+ int packed_tags_size =
-+ dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
-+ void *packed_tags_ptr =
-+ dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
-+
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "yaffs_tags_marshall_read chunk %d data %p tags %p",
-+ nand_chunk, data, tags);
-+
-+ if (dev->param.inband_tags) {
-+ if (!data) {
-+ local_data = 1;
-+ data = yaffs_get_temp_buffer(dev);
-+ }
-+ }
-+
-+ if (dev->param.inband_tags || (data && !tags))
-+ retval = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
-+ data, dev->param.total_bytes_per_chunk,
-+ NULL, 0,
-+ &ecc_result);
-+ else if (tags)
-+ retval = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
-+ data, dev->param.total_bytes_per_chunk,
-+ spare_buffer, packed_tags_size,
-+ &ecc_result);
-+ else
-+ BUG();
-+
-+
-+ if (dev->param.inband_tags) {
-+ if (tags) {
-+ struct yaffs_packed_tags2_tags_only *pt2tp;
-+ pt2tp =
-+ (struct yaffs_packed_tags2_tags_only *)
-+ &data[dev->data_bytes_per_chunk];
-+ yaffs_unpack_tags2_tags_only(tags, pt2tp);
-+ }
-+ } else if (tags) {
-+ memcpy(packed_tags_ptr, spare_buffer, packed_tags_size);
-+ yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
-+ }
-+
-+ if (local_data)
-+ yaffs_release_temp_buffer(dev, data);
-+
-+ if (tags && ecc_result == YAFFS_ECC_RESULT_UNFIXED) {
-+ tags->ecc_result = YAFFS_ECC_RESULT_UNFIXED;
-+ dev->n_ecc_unfixed++;
-+ }
-+
-+ if (tags && ecc_result == -YAFFS_ECC_RESULT_FIXED) {
-+ if (tags->ecc_result <= YAFFS_ECC_RESULT_NO_ERROR)
-+ tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
-+ dev->n_ecc_fixed++;
-+ }
-+
-+ if (ecc_result < YAFFS_ECC_RESULT_UNFIXED)
-+ return YAFFS_OK;
-+ else
-+ return YAFFS_FAIL;
-+}
-+
-+static int yaffs_tags_marshall_query_block(struct yaffs_dev *dev, int block_no,
-+ enum yaffs_block_state *state,
-+ u32 *seq_number)
-+{
-+ int retval;
-+
-+ yaffs_trace(YAFFS_TRACE_MTD, "yaffs_tags_marshall_query_block %d",
-+ block_no);
-+
-+ retval = dev->drv.drv_check_bad_fn(dev, block_no);
-+
-+ if (retval== YAFFS_FAIL) {
-+ yaffs_trace(YAFFS_TRACE_MTD, "block is bad");
-+
-+ *state = YAFFS_BLOCK_STATE_DEAD;
-+ *seq_number = 0;
-+ } else {
-+ struct yaffs_ext_tags t;
-+
-+ yaffs_tags_marshall_read(dev,
-+ block_no * dev->param.chunks_per_block,
-+ NULL, &t);
-+
-+ if (t.chunk_used) {
-+ *seq_number = t.seq_number;
-+ *state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
-+ } else {
-+ *seq_number = 0;
-+ *state = YAFFS_BLOCK_STATE_EMPTY;
-+ }
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_MTD,
-+ "block query returns seq %d state %d",
-+ *seq_number, *state);
-+
-+ if (retval == 0)
-+ return YAFFS_OK;
-+ else
-+ return YAFFS_FAIL;
-+}
-+
-+static int yaffs_tags_marshall_mark_bad(struct yaffs_dev *dev, int block_no)
-+{
-+ return dev->drv.drv_mark_bad_fn(dev, block_no);
-+
-+}
-+
-+
-+void yaffs_tags_marshall_install(struct yaffs_dev *dev)
-+{
-+ if (!dev->param.is_yaffs2)
-+ return;
-+
-+ if (!dev->tagger.write_chunk_tags_fn)
-+ dev->tagger.write_chunk_tags_fn = yaffs_tags_marshall_write;
-+
-+ if (!dev->tagger.read_chunk_tags_fn)
-+ dev->tagger.read_chunk_tags_fn = yaffs_tags_marshall_read;
-+
-+ if (!dev->tagger.query_block_fn)
-+ dev->tagger.query_block_fn = yaffs_tags_marshall_query_block;
-+
-+ if (!dev->tagger.mark_bad_fn)
-+ dev->tagger.mark_bad_fn = yaffs_tags_marshall_mark_bad;
-+
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_tagsmarshall.h linux-3.15-rc5/fs/yaffs2/yaffs_tagsmarshall.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_tagsmarshall.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_tagsmarshall.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,22 @@
-+/*
-+ * 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_TAGSMARSHALL_H__
-+#define __YAFFS_TAGSMARSHALL_H__
-+
-+#include "yaffs_guts.h"
-+void yaffs_tags_marshall_install(struct yaffs_dev *dev);
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_trace.h linux-3.15-rc5/fs/yaffs2/yaffs_trace.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_trace.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_trace.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,57 @@
-+/*
-+ * 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 __YTRACE_H__
-+#define __YTRACE_H__
-+
-+extern unsigned int yaffs_trace_mask;
-+extern unsigned int yaffs_wr_attempts;
-+
-+/*
-+ * Tracing flags.
-+ * The flags masked in YAFFS_TRACE_ALWAYS are always traced.
-+ */
-+
-+#define YAFFS_TRACE_OS 0x00000002
-+#define YAFFS_TRACE_ALLOCATE 0x00000004
-+#define YAFFS_TRACE_SCAN 0x00000008
-+#define YAFFS_TRACE_BAD_BLOCKS 0x00000010
-+#define YAFFS_TRACE_ERASE 0x00000020
-+#define YAFFS_TRACE_GC 0x00000040
-+#define YAFFS_TRACE_WRITE 0x00000080
-+#define YAFFS_TRACE_TRACING 0x00000100
-+#define YAFFS_TRACE_DELETION 0x00000200
-+#define YAFFS_TRACE_BUFFERS 0x00000400
-+#define YAFFS_TRACE_NANDACCESS 0x00000800
-+#define YAFFS_TRACE_GC_DETAIL 0x00001000
-+#define YAFFS_TRACE_SCAN_DEBUG 0x00002000
-+#define YAFFS_TRACE_MTD 0x00004000
-+#define YAFFS_TRACE_CHECKPOINT 0x00008000
-+
-+#define YAFFS_TRACE_VERIFY 0x00010000
-+#define YAFFS_TRACE_VERIFY_NAND 0x00020000
-+#define YAFFS_TRACE_VERIFY_FULL 0x00040000
-+#define YAFFS_TRACE_VERIFY_ALL 0x000f0000
-+
-+#define YAFFS_TRACE_SYNC 0x00100000
-+#define YAFFS_TRACE_BACKGROUND 0x00200000
-+#define YAFFS_TRACE_LOCK 0x00400000
-+#define YAFFS_TRACE_MOUNT 0x00800000
-+
-+#define YAFFS_TRACE_ERROR 0x40000000
-+#define YAFFS_TRACE_BUG 0x80000000
-+#define YAFFS_TRACE_ALWAYS 0xf0000000
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_verify.c linux-3.15-rc5/fs/yaffs2/yaffs_verify.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_verify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_verify.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,529 @@
-+/*
-+ * 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_verify.h"
-+#include "yaffs_trace.h"
-+#include "yaffs_bitmap.h"
-+#include "yaffs_getblockinfo.h"
-+#include "yaffs_nand.h"
-+
-+int yaffs_skip_verification(struct yaffs_dev *dev)
-+{
-+ (void) dev;
-+ return !(yaffs_trace_mask &
-+ (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
-+}
-+
-+static int yaffs_skip_full_verification(struct yaffs_dev *dev)
-+{
-+ (void) dev;
-+ return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
-+}
-+
-+static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
-+{
-+ (void) dev;
-+ return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
-+}
-+
-+static const char * const block_state_name[] = {
-+ "Unknown",
-+ "Needs scan",
-+ "Scanning",
-+ "Empty",
-+ "Allocating",
-+ "Full",
-+ "Dirty",
-+ "Checkpoint",
-+ "Collecting",
-+ "Dead"
-+};
-+
-+void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
-+{
-+ int actually_used;
-+ int in_use;
-+
-+ if (yaffs_skip_verification(dev))
-+ return;
-+
-+ /* Report illegal runtime states */
-+ if (bi->block_state >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Block %d has undefined state %d",
-+ n, bi->block_state);
-+
-+ switch (bi->block_state) {
-+ case YAFFS_BLOCK_STATE_UNKNOWN:
-+ case YAFFS_BLOCK_STATE_SCANNING:
-+ case YAFFS_BLOCK_STATE_NEEDS_SCAN:
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Block %d has bad run-state %s",
-+ n, block_state_name[bi->block_state]);
-+ }
-+
-+ /* Check pages in use and soft deletions are legal */
-+
-+ actually_used = bi->pages_in_use - bi->soft_del_pages;
-+
-+ if (bi->pages_in_use < 0 ||
-+ bi->pages_in_use > dev->param.chunks_per_block ||
-+ bi->soft_del_pages < 0 ||
-+ bi->soft_del_pages > dev->param.chunks_per_block ||
-+ actually_used < 0 || actually_used > dev->param.chunks_per_block)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Block %d has illegal values pages_in_used %d soft_del_pages %d",
-+ n, bi->pages_in_use, bi->soft_del_pages);
-+
-+ /* Check chunk bitmap legal */
-+ in_use = yaffs_count_chunk_bits(dev, n);
-+ if (in_use != bi->pages_in_use)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Block %d has inconsistent values pages_in_use %d counted chunk bits %d",
-+ n, bi->pages_in_use, in_use);
-+}
-+
-+void yaffs_verify_collected_blk(struct yaffs_dev *dev,
-+ struct yaffs_block_info *bi, int n)
-+{
-+ yaffs_verify_blk(dev, bi, n);
-+
-+ /* After collection the block should be in the erased state */
-+
-+ if (bi->block_state != YAFFS_BLOCK_STATE_COLLECTING &&
-+ bi->block_state != YAFFS_BLOCK_STATE_EMPTY) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "Block %d is in state %d after gc, should be erased",
-+ n, bi->block_state);
-+ }
-+}
-+
-+void yaffs_verify_blocks(struct yaffs_dev *dev)
-+{
-+ int i;
-+ int state_count[YAFFS_NUMBER_OF_BLOCK_STATES];
-+ int illegal_states = 0;
-+
-+ if (yaffs_skip_verification(dev))
-+ return;
-+
-+ memset(state_count, 0, sizeof(state_count));
-+
-+ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
-+ yaffs_verify_blk(dev, bi, i);
-+
-+ if (bi->block_state < YAFFS_NUMBER_OF_BLOCK_STATES)
-+ state_count[bi->block_state]++;
-+ else
-+ illegal_states++;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_VERIFY, "Block summary");
-+
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "%d blocks have illegal states",
-+ illegal_states);
-+ if (state_count[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Too many allocating blocks");
-+
-+ for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "%s %d blocks",
-+ block_state_name[i], state_count[i]);
-+
-+ if (dev->blocks_in_checkpt != state_count[YAFFS_BLOCK_STATE_CHECKPOINT])
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Checkpoint block count wrong dev %d count %d",
-+ dev->blocks_in_checkpt,
-+ state_count[YAFFS_BLOCK_STATE_CHECKPOINT]);
-+
-+ if (dev->n_erased_blocks != state_count[YAFFS_BLOCK_STATE_EMPTY])
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Erased block count wrong dev %d count %d",
-+ dev->n_erased_blocks,
-+ state_count[YAFFS_BLOCK_STATE_EMPTY]);
-+
-+ if (state_count[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Too many collecting blocks %d (max is 1)",
-+ state_count[YAFFS_BLOCK_STATE_COLLECTING]);
-+}
-+
-+/*
-+ * Verify the object header. oh must be valid, but obj and tags may be NULL in
-+ * which case those tests will not be performed.
-+ */
-+void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
-+ struct yaffs_ext_tags *tags, int parent_check)
-+{
-+ if (obj && yaffs_skip_verification(obj->my_dev))
-+ return;
-+
-+ if (!(tags && obj && oh)) {
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Verifying object header tags %p obj %p oh %p",
-+ tags, obj, oh);
-+ return;
-+ }
-+
-+ if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+ oh->type > YAFFS_OBJECT_TYPE_MAX)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d header type is illegal value 0x%x",
-+ tags->obj_id, oh->type);
-+
-+ if (tags->obj_id != obj->obj_id)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d header mismatch obj_id %d",
-+ tags->obj_id, obj->obj_id);
-+
-+ /*
-+ * Check that the object's parent ids match if parent_check requested.
-+ *
-+ * Tests do not apply to the root object.
-+ */
-+
-+ if (parent_check && tags->obj_id > 1 && !obj->parent)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d header mismatch parent_id %d obj->parent is NULL",
-+ tags->obj_id, oh->parent_obj_id);
-+
-+ if (parent_check && obj->parent &&
-+ oh->parent_obj_id != obj->parent->obj_id &&
-+ (oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED ||
-+ obj->parent->obj_id != YAFFS_OBJECTID_DELETED))
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d header mismatch parent_id %d parent_obj_id %d",
-+ tags->obj_id, oh->parent_obj_id,
-+ obj->parent->obj_id);
-+
-+ if (tags->obj_id > 1 && oh->name[0] == 0) /* Null name */
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d header name is NULL",
-+ obj->obj_id);
-+
-+ if (tags->obj_id > 1 && ((u8) (oh->name[0])) == 0xff) /* Junk name */
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d header name is 0xff",
-+ obj->obj_id);
-+}
-+
-+void yaffs_verify_file(struct yaffs_obj *obj)
-+{
-+ u32 x;
-+ int required_depth;
-+ int actual_depth;
-+ int last_chunk;
-+ u32 offset_in_chunk;
-+ u32 the_chunk;
-+
-+ u32 i;
-+ struct yaffs_dev *dev;
-+ struct yaffs_ext_tags tags;
-+ struct yaffs_tnode *tn;
-+ u32 obj_id;
-+
-+ if (!obj)
-+ return;
-+
-+ if (yaffs_skip_verification(obj->my_dev))
-+ return;
-+
-+ dev = obj->my_dev;
-+ obj_id = obj->obj_id;
-+
-+
-+ /* Check file size is consistent with tnode depth */
-+ yaffs_addr_to_chunk(dev, obj->variant.file_variant.file_size,
-+ &last_chunk, &offset_in_chunk);
-+ last_chunk++;
-+ x = last_chunk >> YAFFS_TNODES_LEVEL0_BITS;
-+ required_depth = 0;
-+ while (x > 0) {
-+ x >>= YAFFS_TNODES_INTERNAL_BITS;
-+ required_depth++;
-+ }
-+
-+ actual_depth = obj->variant.file_variant.top_level;
-+
-+ /* Check that the chunks in the tnode tree are all correct.
-+ * We do this by scanning through the tnode tree and
-+ * checking the tags for every chunk match.
-+ */
-+
-+ if (yaffs_skip_nand_verification(dev))
-+ return;
-+
-+ for (i = 1; i <= last_chunk; i++) {
-+ tn = yaffs_find_tnode_0(dev, &obj->variant.file_variant, i);
-+
-+ if (!tn)
-+ continue;
-+
-+ the_chunk = yaffs_get_group_base(dev, tn, i);
-+ if (the_chunk > 0) {
-+ yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
-+ &tags);
-+ if (tags.obj_id != obj_id || tags.chunk_id != i)
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)",
-+ obj_id, i, the_chunk,
-+ tags.obj_id, tags.chunk_id);
-+ }
-+ }
-+}
-+
-+void yaffs_verify_link(struct yaffs_obj *obj)
-+{
-+ if (obj && yaffs_skip_verification(obj->my_dev))
-+ return;
-+
-+ /* Verify sane equivalent object */
-+}
-+
-+void yaffs_verify_symlink(struct yaffs_obj *obj)
-+{
-+ if (obj && yaffs_skip_verification(obj->my_dev))
-+ return;
-+
-+ /* Verify symlink string */
-+}
-+
-+void yaffs_verify_special(struct yaffs_obj *obj)
-+{
-+ if (obj && yaffs_skip_verification(obj->my_dev))
-+ return;
-+}
-+
-+void yaffs_verify_obj(struct yaffs_obj *obj)
-+{
-+ struct yaffs_dev *dev;
-+ u32 chunk_min;
-+ u32 chunk_max;
-+ u32 chunk_id_ok;
-+ u32 chunk_in_range;
-+ u32 chunk_wrongly_deleted;
-+ u32 chunk_valid;
-+
-+ if (!obj)
-+ return;
-+
-+ if (obj->being_created)
-+ return;
-+
-+ dev = obj->my_dev;
-+
-+ if (yaffs_skip_verification(dev))
-+ return;
-+
-+ /* Check sane object header chunk */
-+
-+ chunk_min = dev->internal_start_block * dev->param.chunks_per_block;
-+ chunk_max =
-+ (dev->internal_end_block + 1) * dev->param.chunks_per_block - 1;
-+
-+ chunk_in_range = (((unsigned)(obj->hdr_chunk)) >= chunk_min &&
-+ ((unsigned)(obj->hdr_chunk)) <= chunk_max);
-+ chunk_id_ok = chunk_in_range || (obj->hdr_chunk == 0);
-+ chunk_valid = chunk_in_range &&
-+ yaffs_check_chunk_bit(dev,
-+ obj->hdr_chunk / dev->param.chunks_per_block,
-+ obj->hdr_chunk % dev->param.chunks_per_block);
-+ chunk_wrongly_deleted = chunk_in_range && !chunk_valid;
-+
-+ if (!obj->fake && (!chunk_id_ok || chunk_wrongly_deleted))
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d has chunk_id %d %s %s",
-+ obj->obj_id, obj->hdr_chunk,
-+ chunk_id_ok ? "" : ",out of range",
-+ chunk_wrongly_deleted ? ",marked as deleted" : "");
-+
-+ if (chunk_valid && !yaffs_skip_nand_verification(dev)) {
-+ struct yaffs_ext_tags tags;
-+ struct yaffs_obj_hdr *oh;
-+ u8 *buffer = yaffs_get_temp_buffer(dev);
-+
-+ oh = (struct yaffs_obj_hdr *)buffer;
-+
-+ yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, buffer, &tags);
-+
-+ yaffs_verify_oh(obj, oh, &tags, 1);
-+
-+ yaffs_release_temp_buffer(dev, buffer);
-+ }
-+
-+ /* Verify it has a parent */
-+ if (obj && !obj->fake && (!obj->parent || obj->parent->my_dev != dev)) {
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d has parent pointer %p which does not look like an object",
-+ obj->obj_id, obj->parent);
-+ }
-+
-+ /* Verify parent is a directory */
-+ if (obj->parent &&
-+ obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d's parent is not a directory (type %d)",
-+ obj->obj_id, obj->parent->variant_type);
-+ }
-+
-+ switch (obj->variant_type) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ yaffs_verify_file(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ yaffs_verify_symlink(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ yaffs_verify_dir(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ yaffs_verify_link(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ yaffs_verify_special(obj);
-+ break;
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ default:
-+ yaffs_trace(YAFFS_TRACE_VERIFY,
-+ "Obj %d has illegaltype %d",
-+ obj->obj_id, obj->variant_type);
-+ break;
-+ }
-+}
-+
-+void yaffs_verify_objects(struct yaffs_dev *dev)
-+{
-+ struct yaffs_obj *obj;
-+ int i;
-+ struct list_head *lh;
-+
-+ if (yaffs_skip_verification(dev))
-+ return;
-+
-+ /* Iterate through the objects in each hash entry */
-+
-+ for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-+ list_for_each(lh, &dev->obj_bucket[i].list) {
-+ obj = list_entry(lh, struct yaffs_obj, hash_link);
-+ yaffs_verify_obj(obj);
-+ }
-+ }
-+}
-+
-+void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
-+{
-+ struct list_head *lh;
-+ struct yaffs_obj *list_obj;
-+ int count = 0;
-+
-+ if (!obj) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "No object to verify");
-+ BUG();
-+ return;
-+ }
-+
-+ if (yaffs_skip_verification(obj->my_dev))
-+ return;
-+
-+ if (!obj->parent) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "Object does not have parent");
-+ BUG();
-+ return;
-+ }
-+
-+ if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "Parent is not directory");
-+ BUG();
-+ }
-+
-+ /* Iterate through the objects in each hash entry */
-+
-+ list_for_each(lh, &obj->parent->variant.dir_variant.children) {
-+ list_obj = list_entry(lh, struct yaffs_obj, siblings);
-+ yaffs_verify_obj(list_obj);
-+ if (obj == list_obj)
-+ count++;
-+ }
-+
-+ if (count != 1) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "Object in directory %d times",
-+ count);
-+ BUG();
-+ }
-+}
-+
-+void yaffs_verify_dir(struct yaffs_obj *directory)
-+{
-+ struct list_head *lh;
-+ struct yaffs_obj *list_obj;
-+
-+ if (!directory) {
-+ BUG();
-+ return;
-+ }
-+
-+ if (yaffs_skip_full_verification(directory->my_dev))
-+ return;
-+
-+ if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "Directory has wrong type: %d",
-+ directory->variant_type);
-+ BUG();
-+ }
-+
-+ /* Iterate through the objects in each hash entry */
-+
-+ list_for_each(lh, &directory->variant.dir_variant.children) {
-+ list_obj = list_entry(lh, struct yaffs_obj, siblings);
-+ if (list_obj->parent != directory) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "Object in directory list has wrong parent %p",
-+ list_obj->parent);
-+ BUG();
-+ }
-+ yaffs_verify_obj_in_dir(list_obj);
-+ }
-+}
-+
-+static int yaffs_free_verification_failures;
-+
-+void yaffs_verify_free_chunks(struct yaffs_dev *dev)
-+{
-+ int counted;
-+ int difference;
-+
-+ if (yaffs_skip_verification(dev))
-+ return;
-+
-+ counted = yaffs_count_free_chunks(dev);
-+
-+ difference = dev->n_free_chunks - counted;
-+
-+ if (difference) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "Freechunks verification failure %d %d %d",
-+ dev->n_free_chunks, counted, difference);
-+ yaffs_free_verification_failures++;
-+ }
-+}
-+
-+int yaffs_verify_file_sane(struct yaffs_obj *in)
-+{
-+ (void) in;
-+ return YAFFS_OK;
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_verify.h linux-3.15-rc5/fs/yaffs2/yaffs_verify.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_verify.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_verify.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,43 @@
-+/*
-+ * 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_VERIFY_H__
-+#define __YAFFS_VERIFY_H__
-+
-+#include "yaffs_guts.h"
-+
-+void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi,
-+ int n);
-+void yaffs_verify_collected_blk(struct yaffs_dev *dev,
-+ struct yaffs_block_info *bi, int n);
-+void yaffs_verify_blocks(struct yaffs_dev *dev);
-+
-+void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
-+ struct yaffs_ext_tags *tags, int parent_check);
-+void yaffs_verify_file(struct yaffs_obj *obj);
-+void yaffs_verify_link(struct yaffs_obj *obj);
-+void yaffs_verify_symlink(struct yaffs_obj *obj);
-+void yaffs_verify_special(struct yaffs_obj *obj);
-+void yaffs_verify_obj(struct yaffs_obj *obj);
-+void yaffs_verify_objects(struct yaffs_dev *dev);
-+void yaffs_verify_obj_in_dir(struct yaffs_obj *obj);
-+void yaffs_verify_dir(struct yaffs_obj *directory);
-+void yaffs_verify_free_chunks(struct yaffs_dev *dev);
-+
-+int yaffs_verify_file_sane(struct yaffs_obj *obj);
-+
-+int yaffs_skip_verification(struct yaffs_dev *dev);
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_vfs.c linux-3.15-rc5/fs/yaffs2/yaffs_vfs.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_vfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_vfs.c 2014-05-17 02:52:54.000000000 +0200
-@@ -0,0 +1,3604 @@
-+/*
-+ * 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>
-+ * Acknowledgements:
-+ * Luc van OostenRyck for numerous patches.
-+ * Nick Bane for numerous patches.
-+ * Nick Bane for 2.5/2.6 integration.
-+ * Andras Toth for mknod rdev issue.
-+ * Michael Fischer for finding the problem with inode inconsistency.
-+ * Some code bodily lifted from JFFS
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *
-+ * This is the file system front-end to YAFFS that hooks it up to
-+ * the VFS.
-+ *
-+ * Special notes:
-+ * >> 2.4: sb->u.generic_sbp points to the struct yaffs_dev associated with
-+ * this superblock
-+ * >> 2.6: sb->s_fs_info points to the struct yaffs_dev associated with this
-+ * superblock
-+ * >> inode->u.generic_ip points to the associated struct yaffs_obj.
-+ */
-+
-+/*
-+ * There are two variants of the VFS glue code. This variant should compile
-+ * for any version of Linux.
-+ */
-+#include <linux/version.h>
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
-+#define YAFFS_COMPILE_BACKGROUND
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23))
-+#define YAFFS_COMPILE_FREEZER
-+#endif
-+#endif
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28))
-+#define YAFFS_COMPILE_EXPORTFS
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
-+#define YAFFS_USE_SETATTR_COPY
-+#define YAFFS_USE_TRUNCATE_SETSIZE
-+#endif
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
-+#define YAFFS_HAS_EVICT_INODE
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+#define YAFFS_NEW_FOLLOW_LINK 1
-+#else
-+#define YAFFS_NEW_FOLLOW_LINK 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
-+#define YAFFS_HAS_WRITE_SUPER
-+#endif
-+
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
-+#include <linux/config.h>
-+#endif
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/init.h>
-+#include <linux/fs.h>
-+#include <linux/proc_fs.h>
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39))
-+#include <linux/smp_lock.h>
-+#endif
-+#include <linux/pagemap.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/interrupt.h>
-+#include <linux/string.h>
-+#include <linux/ctype.h>
-+
-+#if (YAFFS_NEW_FOLLOW_LINK == 1)
-+#include <linux/namei.h>
-+#endif
-+
-+#ifdef YAFFS_COMPILE_EXPORTFS
-+#include <linux/exportfs.h>
-+#endif
-+
-+#ifdef YAFFS_COMPILE_BACKGROUND
-+#include <linux/kthread.h>
-+#include <linux/delay.h>
-+#endif
-+#ifdef YAFFS_COMPILE_FREEZER
-+#include <linux/freezer.h>
-+#endif
-+
-+#include <asm/div64.h>
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+
-+#include <linux/statfs.h>
-+
-+#define UnlockPage(p) unlock_page(p)
-+#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags)
-+
-+/* FIXME: use sb->s_id instead ? */
-+#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf)
-+
-+#else
-+
-+#include <linux/locks.h>
-+#define BDEVNAME_SIZE 0
-+#define yaffs_devname(sb, buf) kdevname(sb->s_dev)
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
-+/* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
-+#define __user
-+#endif
-+
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT (&proc_root)
-+#else
-+#define YPROC_ROOT NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define Y_INIT_TIMER(a) init_timer(a)
-+#else
-+#define Y_INIT_TIMER(a) init_timer_on_stack(a)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
-+#define YAFFS_SUPER_HAS_DIRTY
-+#endif
-+
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
-+#define set_nlink(inode, count) do { (inode)->i_nlink = (count); } while(0)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+ uint64_t result = partition_size;
-+ do_div(result, block_size);
-+ return (uint32_t) result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
-+#include <linux/mtd/mtd.h>
-+
-+#include "yportenv.h"
-+#include "yaffs_trace.h"
-+#include "yaffs_guts.h"
-+#include "yaffs_attribs.h"
-+
-+#include "yaffs_linux.h"
-+
-+#include "yaffs_mtdif.h"
-+#include "yaffs_packedtags2.h"
-+#include "yaffs_getblockinfo.h"
-+
-+unsigned int yaffs_trace_mask =
-+ YAFFS_TRACE_BAD_BLOCKS |
-+ YAFFS_TRACE_ALWAYS |
-+ 0;
-+
-+unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
-+unsigned int yaffs_gc_control = 1;
-+unsigned int yaffs_bg_enable = 1;
-+unsigned int yaffs_auto_select = 1;
-+/* Module Parameters */
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_trace_mask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+module_param(yaffs_gc_control, uint, 0644);
-+module_param(yaffs_bg_enable, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_trace_mask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+MODULE_PARM(yaffs_gc_control, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+
-+#else
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_inode_to_obj_lv(iptr) ((iptr)->i_private)
-+#else
-+#define yaffs_inode_to_obj_lv(iptr) ((iptr)->u.generic_ip)
-+#endif
-+
-+#define yaffs_inode_to_obj(iptr) \
-+ ((struct yaffs_obj *)(yaffs_inode_to_obj_lv(iptr)))
-+#define yaffs_dentry_to_obj(dptr) yaffs_inode_to_obj((dptr)->d_inode)
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->s_fs_info)
-+#else
-+#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->u.generic_sbp)
-+#endif
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
-+#define Y_CLEAR_INODE(i) clear_inode(i)
-+#else
-+#define Y_CLEAR_INODE(i) end_writeback(i)
-+#endif
-+
-+
-+#define update_dir_time(dir) do {\
-+ (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \
-+ } while (0)
-+
-+static void yaffs_fill_inode_from_obj(struct inode *inode,
-+ struct yaffs_obj *obj);
-+
-+
-+static void yaffs_gross_lock(struct yaffs_dev *dev)
-+{
-+ yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current);
-+ mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
-+ yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current);
-+}
-+
-+static void yaffs_gross_unlock(struct yaffs_dev *dev)
-+{
-+ yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current);
-+ mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
-+}
-+
-+
-+static int yaffs_readpage_nolock(struct file *f, struct page *pg)
-+{
-+ /* Lifted from jffs2 */
-+
-+ struct yaffs_obj *obj;
-+ unsigned char *pg_buf;
-+ int ret;
-+ loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;
-+ struct yaffs_dev *dev;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readpage_nolock at %lld, size %08x",
-+ (long long)pos,
-+ (unsigned)PAGE_CACHE_SIZE);
-+
-+ obj = yaffs_dentry_to_obj(f->f_dentry);
-+
-+ dev = obj->my_dev;
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ BUG_ON(!PageLocked(pg));
-+#else
-+ if (!PageLocked(pg))
-+ PAGE_BUG(pg);
-+#endif
-+
-+ pg_buf = kmap(pg);
-+ /* FIXME: Can kmap fail? */
-+
-+ yaffs_gross_lock(dev);
-+
-+ ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE);
-+
-+ yaffs_gross_unlock(dev);
-+
-+ if (ret >= 0)
-+ ret = 0;
-+
-+ if (ret) {
-+ ClearPageUptodate(pg);
-+ SetPageError(pg);
-+ } else {
-+ SetPageUptodate(pg);
-+ ClearPageError(pg);
-+ }
-+
-+ flush_dcache_page(pg);
-+ kunmap(pg);
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done");
-+ return ret;
-+}
-+
-+static int yaffs_readpage_unlock(struct file *f, struct page *pg)
-+{
-+ int ret = yaffs_readpage_nolock(f, pg);
-+ UnlockPage(pg);
-+ return ret;
-+}
-+
-+static int yaffs_readpage(struct file *f, struct page *pg)
-+{
-+ int ret;
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage");
-+ ret = yaffs_readpage_unlock(f, pg);
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done");
-+ return ret;
-+}
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
-+#define YCRED_FSUID() from_kuid(&init_user_ns, current_fsuid())
-+#define YCRED_FSGID() from_kgid(&init_user_ns, current_fsgid())
-+#else
-+#define YCRED_FSUID() YCRED(current)->fsuid
-+#define YCRED_FSGID() YCRED(current)->fsgid
-+
-+static inline uid_t i_uid_read(const struct inode *inode)
-+{
-+ return inode->i_uid;
-+}
-+
-+static inline gid_t i_gid_read(const struct inode *inode)
-+{
-+ return inode->i_gid;
-+}
-+
-+static inline void i_uid_write(struct inode *inode, uid_t uid)
-+{
-+ inode->i_uid = uid;
-+}
-+
-+static inline void i_gid_write(struct inode *inode, gid_t gid)
-+{
-+ inode->i_gid = gid;
-+}
-+#endif
-+
-+static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
-+{
-+ struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev);
-+
-+ if (lc)
-+ lc->dirty = val;
-+
-+# ifdef YAFFS_SUPER_HAS_DIRTY
-+ {
-+ struct super_block *sb = lc->super;
-+
-+ if (sb)
-+ sb->s_dirt = val;
-+ }
-+#endif
-+
-+}
-+
-+static void yaffs_set_super_dirty(struct yaffs_dev *dev)
-+{
-+ yaffs_set_super_dirty_val(dev, 1);
-+}
-+
-+static void yaffs_clear_super_dirty(struct yaffs_dev *dev)
-+{
-+ yaffs_set_super_dirty_val(dev, 0);
-+}
-+
-+static int yaffs_check_super_dirty(struct yaffs_dev *dev)
-+{
-+ struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev);
-+
-+ if (lc && lc->dirty)
-+ return 1;
-+
-+# ifdef YAFFS_SUPER_HAS_DIRTY
-+ {
-+ struct super_block *sb = lc->super;
-+
-+ if (sb && sb->s_dirt)
-+ return 1;
-+ }
-+#endif
-+ return 0;
-+
-+}
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
-+#else
-+static int yaffs_writepage(struct page *page)
-+#endif
-+{
-+ struct yaffs_dev *dev;
-+ struct address_space *mapping = page->mapping;
-+ struct inode *inode;
-+ unsigned long end_index;
-+ char *buffer;
-+ struct yaffs_obj *obj;
-+ int n_written = 0;
-+ unsigned n_bytes;
-+ loff_t i_size;
-+
-+ if (!mapping)
-+ BUG();
-+ inode = mapping->host;
-+ if (!inode)
-+ BUG();
-+ i_size = i_size_read(inode);
-+
-+ end_index = i_size >> PAGE_CACHE_SHIFT;
-+
-+ if (page->index < end_index)
-+ n_bytes = PAGE_CACHE_SIZE;
-+ else {
-+ n_bytes = i_size & (PAGE_CACHE_SIZE - 1);
-+
-+ if (page->index > end_index || !n_bytes) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_writepage at %lld, inode size = %lld!!",
-+ ((loff_t)page->index) << PAGE_CACHE_SHIFT,
-+ inode->i_size);
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ " -> don't care!!");
-+
-+ zero_user_segment(page, 0, PAGE_CACHE_SIZE);
-+ set_page_writeback(page);
-+ unlock_page(page);
-+ end_page_writeback(page);
-+ return 0;
-+ }
-+ }
-+
-+ if (n_bytes != PAGE_CACHE_SIZE)
-+ zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE);
-+
-+ get_page(page);
-+
-+ buffer = kmap(page);
-+
-+ obj = yaffs_inode_to_obj(inode);
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_writepage at %lld, size %08x",
-+ ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes);
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "writepag0: obj = %lld, ino = %lld",
-+ obj->variant.file_variant.file_size, inode->i_size);
-+
-+ n_written = yaffs_wr_file(obj, buffer,
-+ ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0);
-+
-+ yaffs_set_super_dirty(dev);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "writepag1: obj = %lld, ino = %lld",
-+ obj->variant.file_variant.file_size, inode->i_size);
-+
-+ yaffs_gross_unlock(dev);
-+
-+ kunmap(page);
-+ set_page_writeback(page);
-+ unlock_page(page);
-+ end_page_writeback(page);
-+ put_page(page);
-+
-+ return (n_written == n_bytes) ? 0 : -ENOSPC;
-+}
-+
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev;
-+
-+ int n_free_chunks;
-+
-+ obj = yaffs_dentry_to_obj(f->f_dentry);
-+
-+ dev = obj->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ n_free_chunks = yaffs_get_n_free_chunks(dev);
-+
-+ yaffs_gross_unlock(dev);
-+
-+ return (n_free_chunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev;
-+
-+ obj = yaffs_dentry_to_obj(f->f_dentry);
-+
-+ dev = obj->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ yaffs_gross_unlock(dev);
-+}
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+ loff_t pos, unsigned len, unsigned flags,
-+ struct page **pagep, void **fsdata)
-+{
-+ struct page *pg = NULL;
-+ pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+
-+ int ret = 0;
-+ int space_held = 0;
-+
-+ /* Get a page */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+ pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+ pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+ *pagep = pg;
-+ if (!pg) {
-+ ret = -ENOMEM;
-+ goto out;
-+ }
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "start yaffs_write_begin index %d(%x) uptodate %d",
-+ (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0);
-+
-+ /* Get fs space */
-+ space_held = yaffs_hold_space(filp);
-+
-+ if (!space_held) {
-+ ret = -ENOSPC;
-+ goto out;
-+ }
-+
-+ /* Update page if required */
-+
-+ if (!Page_Uptodate(pg))
-+ ret = yaffs_readpage_nolock(filp, pg);
-+
-+ if (ret)
-+ goto out;
-+
-+ /* Happy path return */
-+ yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok");
-+
-+ return 0;
-+
-+out:
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "end yaffs_write_begin fail returning %d", ret);
-+ if (space_held)
-+ yaffs_release_space(filp);
-+ if (pg) {
-+ unlock_page(pg);
-+ page_cache_release(pg);
-+ }
-+ return ret;
-+}
-+
-+#else
-+
-+static int yaffs_prepare_write(struct file *f, struct page *pg,
-+ unsigned offset, unsigned to)
-+{
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write");
-+
-+ if (!Page_Uptodate(pg))
-+ return yaffs_readpage_nolock(f, pg);
-+ return 0;
-+}
-+#endif
-+
-+
-+static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
-+ loff_t * pos)
-+{
-+ struct yaffs_obj *obj;
-+ int n_written;
-+ loff_t ipos;
-+ struct inode *inode;
-+ struct yaffs_dev *dev;
-+
-+ obj = yaffs_dentry_to_obj(f->f_dentry);
-+
-+ if (!obj) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_file_write: hey obj is null!");
-+ return -EINVAL;
-+ }
-+
-+ dev = obj->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ inode = f->f_dentry->d_inode;
-+
-+ if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
-+ ipos = inode->i_size;
-+ else
-+ ipos = *pos;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld",
-+ (unsigned)n, (unsigned)n, obj->obj_id, ipos);
-+
-+ n_written = yaffs_wr_file(obj, buf, ipos, n, 0);
-+
-+ yaffs_set_super_dirty(dev);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_file_write: %d(%x) bytes written",
-+ (unsigned)n, (unsigned)n);
-+
-+ if (n_written > 0) {
-+ ipos += n_written;
-+ *pos = ipos;
-+ if (ipos > inode->i_size) {
-+ inode->i_size = ipos;
-+ inode->i_blocks = (ipos + 511) >> 9;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_file_write size updated to %lld bytes, %d blocks",
-+ ipos, (int)(inode->i_blocks));
-+ }
-+
-+ }
-+ yaffs_gross_unlock(dev);
-+ return (n_written == 0) && (n > 0) ? -ENOSPC : n_written;
-+}
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+ loff_t pos, unsigned len, unsigned copied,
-+ struct page *pg, void *fsdadata)
-+{
-+ int ret = 0;
-+ void *addr, *kva;
-+ uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+ kva = kmap(pg);
-+ addr = kva + offset_into_page;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_write_end addr %p pos %lld n_bytes %d",
-+ addr, pos, copied);
-+
-+ ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+ if (ret != copied) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_write_end not same size ret %d copied %d",
-+ ret, copied);
-+ SetPageError(pg);
-+ }
-+
-+ kunmap(pg);
-+
-+ yaffs_release_space(filp);
-+ unlock_page(pg);
-+ page_cache_release(pg);
-+ return ret;
-+}
-+#else
-+
-+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-+ unsigned to)
-+{
-+ void *addr, *kva;
-+
-+ loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
-+ int n_bytes = to - offset;
-+ int n_written;
-+
-+ kva = kmap(pg);
-+ addr = kva + offset;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_commit_write addr %p pos %lld n_bytes %d",
-+ addr, pos, n_bytes);
-+
-+ n_written = yaffs_file_write(f, addr, n_bytes, &pos);
-+
-+ if (n_written != n_bytes) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_commit_write not same size n_written %d n_bytes %d",
-+ n_written, n_bytes);
-+ SetPageError(pg);
-+ }
-+ kunmap(pg);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_commit_write returning %d",
-+ n_written == n_bytes ? 0 : n_written);
-+
-+ return n_written == n_bytes ? 0 : n_written;
-+}
-+#endif
-+
-+static struct address_space_operations yaffs_file_address_operations = {
-+ .readpage = yaffs_readpage,
-+ .writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+ .write_begin = yaffs_write_begin,
-+ .write_end = yaffs_write_end,
-+#else
-+ .prepare_write = yaffs_prepare_write,
-+ .commit_write = yaffs_commit_write,
-+#endif
-+};
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_file_flush(struct file *file, fl_owner_t id)
-+#else
-+static int yaffs_file_flush(struct file *file)
-+#endif
-+{
-+ struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry);
-+
-+ struct yaffs_dev *dev = obj->my_dev;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_file_flush object %d (%s)",
-+ obj->obj_id,
-+ obj->dirty ? "dirty" : "clean");
-+
-+ yaffs_gross_lock(dev);
-+
-+ yaffs_flush_file(obj, 1, 0);
-+
-+ yaffs_gross_unlock(dev);
-+
-+ return 0;
-+}
-+
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
-+static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync)
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
-+static int yaffs_sync_object(struct file *file, int datasync)
-+#else
-+static int yaffs_sync_object(struct file *file, struct dentry *dentry,
-+ int datasync)
-+#endif
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
-+ struct dentry *dentry = file->f_path.dentry;
-+#endif
-+
-+ obj = yaffs_dentry_to_obj(dentry);
-+
-+ dev = obj->my_dev;
-+
-+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
-+ "yaffs_sync_object");
-+ yaffs_gross_lock(dev);
-+ yaffs_flush_file(obj, 1, datasync);
-+ yaffs_gross_unlock(dev);
-+ return 0;
-+}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
-+ .read = do_sync_read,
-+ .write = do_sync_write,
-+ .aio_read = generic_file_aio_read,
-+ .aio_write = generic_file_aio_write,
-+ .mmap = generic_file_mmap,
-+ .flush = yaffs_file_flush,
-+ .fsync = yaffs_sync_object,
-+ .splice_read = generic_file_splice_read,
-+ .splice_write = generic_file_splice_write,
-+ .llseek = generic_file_llseek,
-+};
-+
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+
-+static const struct file_operations yaffs_file_operations = {
-+ .read = do_sync_read,
-+ .write = do_sync_write,
-+ .aio_read = generic_file_aio_read,
-+ .aio_write = generic_file_aio_write,
-+ .mmap = generic_file_mmap,
-+ .flush = yaffs_file_flush,
-+ .fsync = yaffs_sync_object,
-+ .sendfile = generic_file_sendfile,
-+};
-+
-+#else
-+
-+static const struct file_operations yaffs_file_operations = {
-+ .read = generic_file_read,
-+ .write = generic_file_write,
-+ .mmap = generic_file_mmap,
-+ .flush = yaffs_file_flush,
-+ .fsync = yaffs_sync_object,
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ .sendfile = generic_file_sendfile,
-+#endif
-+};
-+#endif
-+
-+
-+
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+static void zero_user_segment(struct page *page, unsigned start, unsigned end)
-+{
-+ void *kaddr = kmap_atomic(page, KM_USER0);
-+ memset(kaddr + start, 0, end - start);
-+ kunmap_atomic(kaddr, KM_USER0);
-+ flush_dcache_page(page);
-+}
-+#endif
-+
-+
-+static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
-+{
-+#ifdef YAFFS_USE_TRUNCATE_SETSIZE
-+ truncate_setsize(inode, newsize);
-+ return 0;
-+#else
-+ truncate_inode_pages(&inode->i_data, newsize);
-+ return 0;
-+#endif
-+
-+}
-+
-+
-+static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
-+{
-+#ifdef YAFFS_USE_SETATTR_COPY
-+ setattr_copy(inode, attr);
-+ return 0;
-+#else
-+ return inode_setattr(inode, attr);
-+#endif
-+
-+}
-+
-+static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-+{
-+ struct inode *inode = dentry->d_inode;
-+ int error = 0;
-+ struct yaffs_dev *dev;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_setattr of object %d",
-+ yaffs_inode_to_obj(inode)->obj_id);
-+#if 0
-+ /* Fail if a requested resize >= 2GB */
-+ if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31))
-+ error = -EINVAL;
-+#endif
-+
-+ if (error == 0)
-+ error = inode_change_ok(inode, attr);
-+ if (error == 0) {
-+ int result;
-+ if (!error) {
-+ error = yaffs_vfs_setattr(inode, attr);
-+ yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called");
-+ if (attr->ia_valid & ATTR_SIZE) {
-+ yaffs_vfs_setsize(inode, attr->ia_size);
-+ inode->i_blocks = (inode->i_size + 511) >> 9;
-+ }
-+ }
-+ dev = yaffs_inode_to_obj(inode)->my_dev;
-+ if (attr->ia_valid & ATTR_SIZE) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "resize to %d(%x)",
-+ (int)(attr->ia_size),
-+ (int)(attr->ia_size));
-+ }
-+ yaffs_gross_lock(dev);
-+ result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr);
-+ if (result == YAFFS_OK) {
-+ error = 0;
-+ } else {
-+ error = -EPERM;
-+ }
-+ yaffs_gross_unlock(dev);
-+
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error);
-+
-+ return error;
-+}
-+
-+static int yaffs_setxattr(struct dentry *dentry, const char *name,
-+ const void *value, size_t size, int flags)
-+{
-+ struct inode *inode = dentry->d_inode;
-+ int error = 0;
-+ struct yaffs_dev *dev;
-+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id);
-+
-+ if (error == 0) {
-+ int result;
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+ result = yaffs_set_xattrib(obj, name, value, size, flags);
-+ if (result == YAFFS_OK)
-+ error = 0;
-+ else if (result < 0)
-+ error = result;
-+ yaffs_gross_unlock(dev);
-+
-+ }
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error);
-+
-+ return error;
-+}
-+
-+static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name,
-+ void *buff, size_t size)
-+{
-+ struct inode *inode = dentry->d_inode;
-+ int error = 0;
-+ struct yaffs_dev *dev;
-+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_getxattr \"%s\" from object %d",
-+ name, obj->obj_id);
-+
-+ if (error == 0) {
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+ error = yaffs_get_xattrib(obj, name, buff, size);
-+ yaffs_gross_unlock(dev);
-+
-+ }
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error);
-+
-+ return error;
-+}
-+
-+static int yaffs_removexattr(struct dentry *dentry, const char *name)
-+{
-+ struct inode *inode = dentry->d_inode;
-+ int error = 0;
-+ struct yaffs_dev *dev;
-+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_removexattr of object %d", obj->obj_id);
-+
-+ if (error == 0) {
-+ int result;
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+ result = yaffs_remove_xattrib(obj, name);
-+ if (result == YAFFS_OK)
-+ error = 0;
-+ else if (result < 0)
-+ error = result;
-+ yaffs_gross_unlock(dev);
-+
-+ }
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_removexattr done returning %d", error);
-+
-+ return error;
-+}
-+
-+static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
-+{
-+ struct inode *inode = dentry->d_inode;
-+ int error = 0;
-+ struct yaffs_dev *dev;
-+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_listxattr of object %d", obj->obj_id);
-+
-+ if (error == 0) {
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+ error = yaffs_list_xattrib(obj, buff, size);
-+ yaffs_gross_unlock(dev);
-+
-+ }
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_listxattr done returning %d", error);
-+
-+ return error;
-+}
-+
-+
-+static const struct inode_operations yaffs_file_inode_operations = {
-+ .setattr = yaffs_setattr,
-+ .setxattr = yaffs_setxattr,
-+ .getxattr = yaffs_getxattr,
-+ .listxattr = yaffs_listxattr,
-+ .removexattr = yaffs_removexattr,
-+};
-+
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
-+ int buflen)
-+{
-+ unsigned char *alias;
-+ int ret;
-+
-+ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
-+
-+ yaffs_gross_unlock(dev);
-+
-+ if (!alias)
-+ return -ENOMEM;
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
-+ ret = readlink_copy(buffer, buflen, alias);
-+#else
-+ ret = vfs_readlink(dentry, buffer, buflen, alias);
-+#endif
-+ kfree(alias);
-+ return ret;
-+}
-+
-+#if (YAFFS_NEW_FOLLOW_LINK == 1)
-+static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-+{
-+ void *ret;
-+#else
-+static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-+{
-+ int ret
-+#endif
-+ unsigned char *alias;
-+ int ret_int = 0;
-+ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
-+ yaffs_gross_unlock(dev);
-+
-+ if (!alias) {
-+ ret_int = -ENOMEM;
-+ goto out;
-+ }
-+#if (YAFFS_NEW_FOLLOW_LINK == 1)
-+ nd_set_link(nd, alias);
-+ ret = alias;
-+out:
-+ if (ret_int)
-+ ret = ERR_PTR(ret_int);
-+ return ret;
-+#else
-+ ret = vfs_follow_link(nd, alias);
-+ kfree(alias);
-+out:
-+ if (ret_int)
-+ ret = ret_int;
-+ return ret;
-+#endif
-+}
-+
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
-+/* For now put inode is just for debugging
-+ * Put inode is called when the inode **structure** is put.
-+ */
-+static void yaffs_put_inode(struct inode *inode)
-+{
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_put_inode: ino %d, count %d"),
-+ (int)inode->i_ino, atomic_read(&inode->i_count);
-+
-+}
-+#endif
-+
-+#if (YAFFS_NEW_FOLLOW_LINK == 1)
-+void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias)
-+{
-+ kfree(alias);
-+}
-+#endif
-+
-+static const struct inode_operations yaffs_symlink_inode_operations = {
-+ .readlink = yaffs_readlink,
-+ .follow_link = yaffs_follow_link,
-+#if (YAFFS_NEW_FOLLOW_LINK == 1)
-+ .put_link = yaffs_put_link,
-+#endif
-+ .setattr = yaffs_setattr,
-+ .setxattr = yaffs_setxattr,
-+ .getxattr = yaffs_getxattr,
-+ .listxattr = yaffs_listxattr,
-+ .removexattr = yaffs_removexattr,
-+};
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+ struct inode *inode;
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino);
-+
-+ inode = iget_locked(sb, ino);
-+ if (!inode)
-+ return ERR_PTR(-ENOMEM);
-+ if (!(inode->i_state & I_NEW))
-+ return inode;
-+
-+ /* NB This is called as a side effect of other functions, but
-+ * we had to release the lock to prevent deadlocks, so
-+ * need to lock again.
-+ */
-+
-+ yaffs_gross_lock(dev);
-+
-+ obj = yaffs_find_by_number(dev, inode->i_ino);
-+
-+ yaffs_fill_inode_from_obj(inode, obj);
-+
-+ yaffs_gross_unlock(dev);
-+
-+ unlock_new_inode(inode);
-+ return inode;
-+}
-+
-+#else
-+
-+static void yaffs_read_inode(struct inode *inode)
-+{
-+ /* NB This is called as a side effect of other functions, but
-+ * we had to release the lock to prevent deadlocks, so
-+ * need to lock again.
-+ */
-+
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_read_inode for %d", (int)inode->i_ino);
-+
-+ if (current != yaffs_dev_to_lc(dev)->readdir_process)
-+ yaffs_gross_lock(dev);
-+
-+ obj = yaffs_find_by_number(dev, inode->i_ino);
-+
-+ yaffs_fill_inode_from_obj(inode, obj);
-+
-+ if (current != yaffs_dev_to_lc(dev)->readdir_process)
-+ yaffs_gross_unlock(dev);
-+}
-+
-+#endif
-+
-+
-+
-+struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
-+ struct yaffs_obj *obj)
-+{
-+ struct inode *inode;
-+
-+ if (!sb) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_get_inode for NULL super_block!!");
-+ return NULL;
-+
-+ }
-+
-+ if (!obj) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_get_inode for NULL object!!");
-+ return NULL;
-+
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_get_inode for object %d", obj->obj_id);
-+
-+ inode = Y_IGET(sb, obj->obj_id);
-+ if (IS_ERR(inode))
-+ return NULL;
-+
-+ /* NB Side effect: iget calls back to yaffs_read_inode(). */
-+ /* iget also increments the inode's i_count */
-+ /* NB You can't be holding gross_lock or deadlock will happen! */
-+
-+ return inode;
-+}
-+
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
-+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
-+ dev_t rdev)
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-+ dev_t rdev)
-+#else
-+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-+ int rdev)
-+#endif
-+{
-+ struct inode *inode;
-+
-+ struct yaffs_obj *obj = NULL;
-+ struct yaffs_dev *dev;
-+
-+ struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
-+
-+ int error = -ENOSPC;
-+ uid_t uid = YCRED_FSUID();
-+ gid_t gid =
-+ (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
-+
-+ if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+ mode |= S_ISGID;
-+
-+ if (parent) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_mknod: parent object %d type %d",
-+ parent->obj_id, parent->variant_type);
-+ } else {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_mknod: could not get parent object");
-+ return -EPERM;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_mknod: making oject for %s, mode %x dev %x",
-+ dentry->d_name.name, mode, rdev);
-+
-+ dev = parent->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ switch (mode & S_IFMT) {
-+ default:
-+ /* Special (socket, fifo, device...) */
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making special");
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ obj =
-+ yaffs_create_special(parent, dentry->d_name.name, mode, uid,
-+ gid, old_encode_dev(rdev));
-+#else
-+ obj =
-+ yaffs_create_special(parent, dentry->d_name.name, mode, uid,
-+ gid, rdev);
-+#endif
-+ break;
-+ case S_IFREG: /* file */
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making file");
-+ obj = yaffs_create_file(parent, dentry->d_name.name, mode, uid,
-+ gid);
-+ break;
-+ case S_IFDIR: /* directory */
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making directory");
-+ obj = yaffs_create_dir(parent, dentry->d_name.name, mode,
-+ uid, gid);
-+ break;
-+ case S_IFLNK: /* symlink */
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making symlink");
-+ obj = NULL; /* Do we ever get here? */
-+ break;
-+ }
-+
-+ /* Can not call yaffs_get_inode() with gross lock held */
-+ yaffs_gross_unlock(dev);
-+
-+ if (obj) {
-+ inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
-+ d_instantiate(dentry, inode);
-+ update_dir_time(dir);
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_mknod created object %d count = %d",
-+ obj->obj_id, atomic_read(&inode->i_count));
-+ error = 0;
-+ yaffs_fill_inode_from_obj(dir, parent);
-+ } else {
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod failed making object");
-+ error = -ENOMEM;
-+ }
-+
-+ return error;
-+}
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
-+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
-+#else
-+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
-+#endif
-+{
-+ int ret_val;
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir");
-+ ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
-+ return ret_val;
-+}
-+
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
-+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
-+ bool dummy)
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
-+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
-+ struct nameidata *n)
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
-+ struct nameidata *n)
-+#else
-+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
-+#endif
-+{
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_create");
-+ return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
-+}
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
-+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-+ unsigned int dummy)
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-+ struct nameidata *n)
-+#else
-+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
-+#endif
-+{
-+ struct yaffs_obj *obj;
-+ struct inode *inode = NULL; /* NCB 2.5/2.6 needs NULL here */
-+
-+ struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev;
-+
-+ if (current != yaffs_dev_to_lc(dev)->readdir_process)
-+ yaffs_gross_lock(dev);
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s",
-+ yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name);
-+
-+ obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name);
-+
-+ obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */
-+
-+ /* Can't hold gross lock when calling yaffs_get_inode() */
-+ if (current != yaffs_dev_to_lc(dev)->readdir_process)
-+ yaffs_gross_unlock(dev);
-+
-+ if (obj) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_lookup found %d", obj->obj_id);
-+
-+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-+ } else {
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found");
-+
-+ }
-+
-+/* added NCB for 2.5/6 compatability - forces add even if inode is
-+ * NULL which creates dentry hash */
-+ d_add(dentry, inode);
-+
-+ return NULL;
-+}
-+
-+/*
-+ * Create a link...
-+ */
-+static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
-+ struct dentry *dentry)
-+{
-+ struct inode *inode = old_dentry->d_inode;
-+ struct yaffs_obj *obj = NULL;
-+ struct yaffs_obj *link = NULL;
-+ struct yaffs_dev *dev;
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_link");
-+
-+ obj = yaffs_inode_to_obj(inode);
-+ dev = obj->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ if (!S_ISDIR(inode->i_mode)) /* Don't link directories */
-+ link =
-+ yaffs_link_obj(yaffs_inode_to_obj(dir), dentry->d_name.name,
-+ obj);
-+
-+ if (link) {
-+ set_nlink(old_dentry->d_inode, yaffs_get_obj_link_count(obj));
-+ d_instantiate(dentry, old_dentry->d_inode);
-+ atomic_inc(&old_dentry->d_inode->i_count);
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_link link count %d i_count %d",
-+ old_dentry->d_inode->i_nlink,
-+ atomic_read(&old_dentry->d_inode->i_count));
-+ }
-+
-+ yaffs_gross_unlock(dev);
-+
-+ if (link) {
-+ update_dir_time(dir);
-+ return 0;
-+ }
-+
-+ return -EPERM;
-+}
-+
-+static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
-+ const char *symname)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev;
-+ uid_t uid = YCRED_FSUID();
-+ gid_t gid =
-+ (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink");
-+
-+ if (strnlen(dentry->d_name.name, YAFFS_MAX_NAME_LENGTH + 1) >
-+ YAFFS_MAX_NAME_LENGTH)
-+ return -ENAMETOOLONG;
-+
-+ if (strnlen(symname, YAFFS_MAX_ALIAS_LENGTH + 1) >
-+ YAFFS_MAX_ALIAS_LENGTH)
-+ return -ENAMETOOLONG;
-+
-+ dev = yaffs_inode_to_obj(dir)->my_dev;
-+ yaffs_gross_lock(dev);
-+ obj = yaffs_create_symlink(yaffs_inode_to_obj(dir), dentry->d_name.name,
-+ S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+ yaffs_gross_unlock(dev);
-+
-+ if (obj) {
-+ struct inode *inode;
-+
-+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-+ d_instantiate(dentry, inode);
-+ update_dir_time(dir);
-+ yaffs_trace(YAFFS_TRACE_OS, "symlink created OK");
-+ return 0;
-+ } else {
-+ yaffs_trace(YAFFS_TRACE_OS, "symlink not created");
-+ }
-+
-+ return -ENOMEM;
-+}
-+
-+/*
-+ * The VFS layer already does all the dentry stuff for rename.
-+ *
-+ * NB: POSIX says you can rename an object over an old object of the same name
-+ */
-+static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-+ struct inode *new_dir, struct dentry *new_dentry)
-+{
-+ struct yaffs_dev *dev;
-+ int ret_val = YAFFS_FAIL;
-+ struct yaffs_obj *target;
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename");
-+ dev = yaffs_inode_to_obj(old_dir)->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ /* Check if the target is an existing directory that is not empty. */
-+ target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir),
-+ new_dentry->d_name.name);
-+
-+ if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+ !list_empty(&target->variant.dir_variant.children)) {
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir");
-+
-+ ret_val = YAFFS_FAIL;
-+ } else {
-+ /* Now does unlinking internally using shadowing mechanism */
-+ yaffs_trace(YAFFS_TRACE_OS, "calling yaffs_rename_obj");
-+
-+ ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir),
-+ old_dentry->d_name.name,
-+ yaffs_inode_to_obj(new_dir),
-+ new_dentry->d_name.name);
-+ }
-+ yaffs_gross_unlock(dev);
-+
-+ if (ret_val == YAFFS_OK) {
-+ if (target)
-+ inode_dec_link_count(new_dentry->d_inode);
-+
-+ update_dir_time(old_dir);
-+ if (old_dir != new_dir)
-+ update_dir_time(new_dir);
-+ return 0;
-+ } else {
-+ return -ENOTEMPTY;
-+ }
-+}
-+
-+
-+
-+
-+static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
-+{
-+ int ret_val;
-+
-+ struct yaffs_dev *dev;
-+ struct yaffs_obj *obj;
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s",
-+ (int)(dir->i_ino), dentry->d_name.name);
-+ obj = yaffs_inode_to_obj(dir);
-+ dev = obj->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ ret_val = yaffs_unlinker(obj, dentry->d_name.name);
-+
-+ if (ret_val == YAFFS_OK) {
-+ inode_dec_link_count(dentry->d_inode);
-+ dir->i_version++;
-+ yaffs_gross_unlock(dev);
-+ update_dir_time(dir);
-+ return 0;
-+ }
-+ yaffs_gross_unlock(dev);
-+ return -ENOTEMPTY;
-+}
-+
-+
-+
-+static const struct inode_operations yaffs_dir_inode_operations = {
-+ .create = yaffs_create,
-+ .lookup = yaffs_lookup,
-+ .link = yaffs_link,
-+ .unlink = yaffs_unlink,
-+ .symlink = yaffs_symlink,
-+ .mkdir = yaffs_mkdir,
-+ .rmdir = yaffs_unlink,
-+ .mknod = yaffs_mknod,
-+ .rename = yaffs_rename,
-+ .setattr = yaffs_setattr,
-+ .setxattr = yaffs_setxattr,
-+ .getxattr = yaffs_getxattr,
-+ .listxattr = yaffs_listxattr,
-+ .removexattr = yaffs_removexattr,
-+};
-+
-+/*-----------------------------------------------------------------*/
-+/* Directory search context allows us to unlock access to yaffs during
-+ * filldir without causing problems with the directory being modified.
-+ * This is similar to the tried and tested mechanism used in yaffs direct.
-+ *
-+ * A search context iterates along a doubly linked list of siblings in the
-+ * directory. If the iterating object is deleted then this would corrupt
-+ * the list iteration, likely causing a crash. The search context avoids
-+ * this by using the remove_obj_fn to move the search context to the
-+ * next object before the object is deleted.
-+ *
-+ * Many readdirs (and thus seach conexts) may be alive simulateously so
-+ * each struct yaffs_dev has a list of these.
-+ *
-+ * A seach context lives for the duration of a readdir.
-+ *
-+ * All these functions must be called while yaffs is locked.
-+ */
-+
-+struct yaffs_search_context {
-+ struct yaffs_dev *dev;
-+ struct yaffs_obj *dir_obj;
-+ struct yaffs_obj *next_return;
-+ struct list_head others;
-+};
-+
-+/*
-+ * yaffs_new_search() creates a new search context, initialises it and
-+ * adds it to the device's search context list.
-+ *
-+ * Called at start of readdir.
-+ */
-+static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir)
-+{
-+ struct yaffs_dev *dev = dir->my_dev;
-+ struct yaffs_search_context *sc =
-+ kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS);
-+ if (sc) {
-+ sc->dir_obj = dir;
-+ sc->dev = dev;
-+ if (list_empty(&sc->dir_obj->variant.dir_variant.children))
-+ sc->next_return = NULL;
-+ else
-+ sc->next_return =
-+ list_entry(dir->variant.dir_variant.children.next,
-+ struct yaffs_obj, siblings);
-+ INIT_LIST_HEAD(&sc->others);
-+ list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts));
-+ }
-+ return sc;
-+}
-+
-+/*
-+ * yaffs_search_end() disposes of a search context and cleans up.
-+ */
-+static void yaffs_search_end(struct yaffs_search_context *sc)
-+{
-+ if (sc) {
-+ list_del(&sc->others);
-+ kfree(sc);
-+ }
-+}
-+
-+/*
-+ * yaffs_search_advance() moves a search context to the next object.
-+ * Called when the search iterates or when an object removal causes
-+ * the search context to be moved to the next object.
-+ */
-+static void yaffs_search_advance(struct yaffs_search_context *sc)
-+{
-+ if (!sc)
-+ return;
-+
-+ if (sc->next_return == NULL ||
-+ list_empty(&sc->dir_obj->variant.dir_variant.children))
-+ sc->next_return = NULL;
-+ else {
-+ struct list_head *next = sc->next_return->siblings.next;
-+
-+ if (next == &sc->dir_obj->variant.dir_variant.children)
-+ sc->next_return = NULL; /* end of list */
-+ else
-+ sc->next_return =
-+ list_entry(next, struct yaffs_obj, siblings);
-+ }
-+}
-+
-+/*
-+ * yaffs_remove_obj_callback() is called when an object is unlinked.
-+ * We check open search contexts and advance any which are currently
-+ * on the object being iterated.
-+ */
-+static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
-+{
-+
-+ struct list_head *i;
-+ struct yaffs_search_context *sc;
-+ struct list_head *search_contexts =
-+ &(yaffs_dev_to_lc(obj->my_dev)->search_contexts);
-+
-+ /* Iterate through the directory search contexts.
-+ * If any are currently on the object being removed, then advance
-+ * the search context to the next object to prevent a hanging pointer.
-+ */
-+ list_for_each(i, search_contexts) {
-+ sc = list_entry(i, struct yaffs_search_context, others);
-+ if (sc->next_return == obj)
-+ yaffs_search_advance(sc);
-+ }
-+
-+}
-+
-+
-+/*-----------------------------------------------------------------*/
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
-+static int yaffs_readdir(struct file *file, struct dir_context *ctx)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev;
-+ struct yaffs_search_context *sc;
-+ struct inode *inode = file->f_dentry->d_inode;
-+ unsigned long offset, curoffs;
-+ struct yaffs_obj *l;
-+ int ret_val = 0;
-+
-+ char name[YAFFS_MAX_NAME_LENGTH + 1];
-+
-+ obj = yaffs_dentry_to_obj(file->f_dentry);
-+ dev = obj->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ yaffs_dev_to_lc(dev)->readdir_process = current;
-+
-+ offset = ctx->pos;
-+
-+ sc = yaffs_new_search(obj);
-+ if (!sc) {
-+ ret_val = -ENOMEM;
-+ goto out;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readdir: starting at %d", (int)offset);
-+
-+ if (offset == 0) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readdir: entry . ino %d",
-+ (int)inode->i_ino);
-+ yaffs_gross_unlock(dev);
-+ if (!dir_emit_dot(file, ctx)) {
-+ yaffs_gross_lock(dev);
-+ goto out;
-+ }
-+ yaffs_gross_lock(dev);
-+ offset++;
-+ ctx->pos++;
-+ }
-+ if (offset == 1) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readdir: entry .. ino %d",
-+ (int)file->f_dentry->d_parent->d_inode->i_ino);
-+ yaffs_gross_unlock(dev);
-+ if (!dir_emit_dotdot(file, ctx)) {
-+ yaffs_gross_lock(dev);
-+ goto out;
-+ }
-+ yaffs_gross_lock(dev);
-+ offset++;
-+ ctx->pos++;
-+ }
-+
-+ curoffs = 1;
-+
-+ /* If the directory has changed since the open or last call to
-+ readdir, rewind to after the 2 canned entries. */
-+ if (file->f_version != inode->i_version) {
-+ offset = 2;
-+ ctx->pos = offset;
-+ file->f_version = inode->i_version;
-+ }
-+
-+ while (sc->next_return) {
-+ curoffs++;
-+ l = sc->next_return;
-+ if (curoffs >= offset) {
-+ int this_inode = yaffs_get_obj_inode(l);
-+ int this_type = yaffs_get_obj_type(l);
-+
-+ yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readdir: %s inode %d",
-+ name, yaffs_get_obj_inode(l));
-+
-+ yaffs_gross_unlock(dev);
-+
-+ if (!dir_emit(ctx, name, strlen(name),
-+ this_inode, this_type) < 0) {
-+ yaffs_gross_lock(dev);
-+ goto out;
-+ }
-+
-+ yaffs_gross_lock(dev);
-+
-+ offset++;
-+ ctx->pos++;
-+ }
-+ yaffs_search_advance(sc);
-+ }
-+
-+out:
-+ yaffs_search_end(sc);
-+ yaffs_dev_to_lc(dev)->readdir_process = NULL;
-+ yaffs_gross_unlock(dev);
-+
-+ return ret_val;
-+}
-+#else
-+static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev;
-+ struct yaffs_search_context *sc;
-+ struct inode *inode = f->f_dentry->d_inode;
-+ unsigned long offset, curoffs;
-+ struct yaffs_obj *l;
-+ int ret_val = 0;
-+
-+ char name[YAFFS_MAX_NAME_LENGTH + 1];
-+
-+ obj = yaffs_dentry_to_obj(f->f_dentry);
-+ dev = obj->my_dev;
-+
-+ yaffs_gross_lock(dev);
-+
-+ yaffs_dev_to_lc(dev)->readdir_process = current;
-+
-+ offset = f->f_pos;
-+
-+ sc = yaffs_new_search(obj);
-+ if (!sc) {
-+ ret_val = -ENOMEM;
-+ goto out;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readdir: starting at %d", (int)offset);
-+
-+ if (offset == 0) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readdir: entry . ino %d",
-+ (int)inode->i_ino);
-+ yaffs_gross_unlock(dev);
-+ if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) {
-+ yaffs_gross_lock(dev);
-+ goto out;
-+ }
-+ yaffs_gross_lock(dev);
-+ offset++;
-+ f->f_pos++;
-+ }
-+ if (offset == 1) {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readdir: entry .. ino %d",
-+ (int)f->f_dentry->d_parent->d_inode->i_ino);
-+ yaffs_gross_unlock(dev);
-+ if (filldir(dirent, "..", 2, offset,
-+ f->f_dentry->d_parent->d_inode->i_ino,
-+ DT_DIR) < 0) {
-+ yaffs_gross_lock(dev);
-+ goto out;
-+ }
-+ yaffs_gross_lock(dev);
-+ offset++;
-+ f->f_pos++;
-+ }
-+
-+ curoffs = 1;
-+
-+ /* If the directory has changed since the open or last call to
-+ readdir, rewind to after the 2 canned entries. */
-+ if (f->f_version != inode->i_version) {
-+ offset = 2;
-+ f->f_pos = offset;
-+ f->f_version = inode->i_version;
-+ }
-+
-+ while (sc->next_return) {
-+ curoffs++;
-+ l = sc->next_return;
-+ if (curoffs >= offset) {
-+ int this_inode = yaffs_get_obj_inode(l);
-+ int this_type = yaffs_get_obj_type(l);
-+
-+ yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_readdir: %s inode %d",
-+ name, yaffs_get_obj_inode(l));
-+
-+ yaffs_gross_unlock(dev);
-+
-+ if (filldir(dirent,
-+ name,
-+ strlen(name),
-+ offset, this_inode, this_type) < 0) {
-+ yaffs_gross_lock(dev);
-+ goto out;
-+ }
-+
-+ yaffs_gross_lock(dev);
-+
-+ offset++;
-+ f->f_pos++;
-+ }
-+ yaffs_search_advance(sc);
-+ }
-+
-+out:
-+ yaffs_search_end(sc);
-+ yaffs_dev_to_lc(dev)->readdir_process = NULL;
-+ yaffs_gross_unlock(dev);
-+
-+ return ret_val;
-+}
-+#endif
-+
-+static const struct file_operations yaffs_dir_operations = {
-+ .read = generic_read_dir,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
-+ .iterate = yaffs_readdir,
-+#else
-+ .readdir = yaffs_readdir,
-+#endif
-+ .fsync = yaffs_sync_object,
-+ .llseek = generic_file_llseek,
-+};
-+
-+static void yaffs_fill_inode_from_obj(struct inode *inode,
-+ struct yaffs_obj *obj)
-+{
-+ if (inode && obj) {
-+
-+ /* Check mode against the variant type and attempt to repair if broken. */
-+ u32 mode = obj->yst_mode;
-+ switch (obj->variant_type) {
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ if (!S_ISREG(mode)) {
-+ obj->yst_mode &= ~S_IFMT;
-+ obj->yst_mode |= S_IFREG;
-+ }
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ if (!S_ISLNK(mode)) {
-+ obj->yst_mode &= ~S_IFMT;
-+ obj->yst_mode |= S_IFLNK;
-+ }
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ if (!S_ISDIR(mode)) {
-+ obj->yst_mode &= ~S_IFMT;
-+ obj->yst_mode |= S_IFDIR;
-+ }
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ default:
-+ /* TODO? */
-+ break;
-+ }
-+
-+ inode->i_flags |= S_NOATIME;
-+
-+ inode->i_ino = obj->obj_id;
-+ inode->i_mode = obj->yst_mode;
-+ i_uid_write(inode, obj->yst_uid);
-+ i_gid_write(inode, obj->yst_gid);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
-+ inode->i_blksize = inode->i_sb->s_blocksize;
-+#endif
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+
-+ inode->i_rdev = old_decode_dev(obj->yst_rdev);
-+ inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-+ inode->i_atime.tv_nsec = 0;
-+ inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
-+ inode->i_mtime.tv_nsec = 0;
-+ inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
-+ inode->i_ctime.tv_nsec = 0;
-+#else
-+ inode->i_rdev = obj->yst_rdev;
-+ inode->i_atime = obj->yst_atime;
-+ inode->i_mtime = obj->yst_mtime;
-+ inode->i_ctime = obj->yst_ctime;
-+#endif
-+ inode->i_size = yaffs_get_obj_length(obj);
-+ inode->i_blocks = (inode->i_size + 511) >> 9;
-+
-+ set_nlink(inode, yaffs_get_obj_link_count(obj));
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
-+ inode->i_mode, i_uid_read(inode), i_gid_read(inode),
-+ inode->i_size, atomic_read(&inode->i_count));
-+
-+ switch (obj->yst_mode & S_IFMT) {
-+ default: /* fifo, device or socket */
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ init_special_inode(inode, obj->yst_mode,
-+ old_decode_dev(obj->yst_rdev));
-+#else
-+ init_special_inode(inode, obj->yst_mode,
-+ (dev_t) (obj->yst_rdev));
-+#endif
-+ break;
-+ case S_IFREG: /* file */
-+ inode->i_op = &yaffs_file_inode_operations;
-+ inode->i_fop = &yaffs_file_operations;
-+ inode->i_mapping->a_ops =
-+ &yaffs_file_address_operations;
-+ break;
-+ case S_IFDIR: /* directory */
-+ inode->i_op = &yaffs_dir_inode_operations;
-+ inode->i_fop = &yaffs_dir_operations;
-+ break;
-+ case S_IFLNK: /* symlink */
-+ inode->i_op = &yaffs_symlink_inode_operations;
-+ break;
-+ }
-+
-+ yaffs_inode_to_obj_lv(inode) = obj;
-+
-+ obj->my_inode = inode;
-+
-+ } else {
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_fill_inode invalid parameters");
-+ }
-+
-+}
-+
-+
-+
-+/*
-+ * yaffs background thread functions .
-+ * yaffs_bg_thread_fn() the thread function
-+ * yaffs_bg_start() launches the background thread.
-+ * yaffs_bg_stop() cleans up the background thread.
-+ *
-+ * NB:
-+ * The thread should only run after the yaffs is initialised
-+ * The thread should be stopped before yaffs is unmounted.
-+ * The thread should not do any writing while the fs is in read only.
-+ */
-+
-+static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev)
-+{
-+ unsigned erased_chunks =
-+ dev->n_erased_blocks * dev->param.chunks_per_block;
-+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
-+ unsigned scattered = 0; /* Free chunks not in an erased block */
-+
-+ if (erased_chunks < dev->n_free_chunks)
-+ scattered = (dev->n_free_chunks - erased_chunks);
-+
-+ if (!context->bg_running)
-+ return 0;
-+ else if (scattered < (dev->param.chunks_per_block * 2))
-+ return 0;
-+ else if (erased_chunks > dev->n_free_chunks / 2)
-+ return 0;
-+ else if (erased_chunks > dev->n_free_chunks / 4)
-+ return 1;
-+ else
-+ return 2;
-+}
-+
-+#ifdef YAFFS_COMPILE_BACKGROUND
-+
-+void yaffs_background_waker(unsigned long data)
-+{
-+ wake_up_process((struct task_struct *)data);
-+}
-+
-+static int yaffs_bg_thread_fn(void *data)
-+{
-+ struct yaffs_dev *dev = (struct yaffs_dev *)data;
-+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
-+ unsigned long now = jiffies;
-+ unsigned long next_dir_update = now;
-+ unsigned long next_gc = now;
-+ unsigned long expires;
-+ unsigned int urgency;
-+
-+ int gc_result;
-+ struct timer_list timer;
-+
-+ yaffs_trace(YAFFS_TRACE_BACKGROUND,
-+ "yaffs_background starting for dev %p", (void *)dev);
-+
-+#ifdef YAFFS_COMPILE_FREEZER
-+ set_freezable();
-+#endif
-+ while (context->bg_running) {
-+ yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background");
-+
-+ if (kthread_should_stop())
-+ break;
-+
-+#ifdef YAFFS_COMPILE_FREEZER
-+ if (try_to_freeze())
-+ continue;
-+#endif
-+ yaffs_gross_lock(dev);
-+
-+ now = jiffies;
-+
-+ if (time_after(now, next_dir_update) && yaffs_bg_enable) {
-+ yaffs_update_dirty_dirs(dev);
-+ next_dir_update = now + HZ;
-+ }
-+
-+ if (time_after(now, next_gc) && yaffs_bg_enable) {
-+ if (!dev->is_checkpointed) {
-+ urgency = yaffs_bg_gc_urgency(dev);
-+ gc_result = yaffs_bg_gc(dev, urgency);
-+ if (urgency > 1)
-+ next_gc = now + HZ / 20 + 1;
-+ else if (urgency > 0)
-+ next_gc = now + HZ / 10 + 1;
-+ else
-+ next_gc = now + HZ * 2;
-+ } else {
-+ /*
-+ * gc not running so set to next_dir_update
-+ * to cut down on wake ups
-+ */
-+ next_gc = next_dir_update;
-+ }
-+ }
-+ yaffs_gross_unlock(dev);
-+#if 1
-+ expires = next_dir_update;
-+ if (time_before(next_gc, expires))
-+ expires = next_gc;
-+ if (time_before(expires, now))
-+ expires = now + HZ;
-+
-+ Y_INIT_TIMER(&timer);
-+ timer.expires = expires + 1;
-+ timer.data = (unsigned long)current;
-+ timer.function = yaffs_background_waker;
-+
-+ set_current_state(TASK_INTERRUPTIBLE);
-+ add_timer(&timer);
-+ schedule();
-+ del_timer_sync(&timer);
-+#else
-+ msleep(10);
-+#endif
-+ }
-+
-+ return 0;
-+}
-+
-+static int yaffs_bg_start(struct yaffs_dev *dev)
-+{
-+ int retval = 0;
-+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
-+
-+ if (dev->read_only)
-+ return -1;
-+
-+ context->bg_running = 1;
-+
-+ context->bg_thread = kthread_run(yaffs_bg_thread_fn,
-+ (void *)dev, "yaffs-bg-%d",
-+ context->mount_id);
-+
-+ if (IS_ERR(context->bg_thread)) {
-+ retval = PTR_ERR(context->bg_thread);
-+ context->bg_thread = NULL;
-+ context->bg_running = 0;
-+ }
-+ return retval;
-+}
-+
-+static void yaffs_bg_stop(struct yaffs_dev *dev)
-+{
-+ struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev);
-+
-+ ctxt->bg_running = 0;
-+
-+ if (ctxt->bg_thread) {
-+ kthread_stop(ctxt->bg_thread);
-+ ctxt->bg_thread = NULL;
-+ }
-+}
-+#else
-+static int yaffs_bg_thread_fn(void *data)
-+{
-+ return 0;
-+}
-+
-+static int yaffs_bg_start(struct yaffs_dev *dev)
-+{
-+ return 0;
-+}
-+
-+static void yaffs_bg_stop(struct yaffs_dev *dev)
-+{
-+}
-+#endif
-+
-+
-+static void yaffs_flush_inodes(struct super_block *sb)
-+{
-+ struct inode *iptr;
-+ struct yaffs_obj *obj;
-+
-+ list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
-+ 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);
-+ }
-+ }
-+}
-+
-+static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
-+{
-+ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-+ if (!dev)
-+ return;
-+
-+ yaffs_flush_inodes(sb);
-+ yaffs_update_dirty_dirs(dev);
-+ yaffs_flush_whole_cache(dev);
-+ if (do_checkpoint)
-+ yaffs_checkpoint_save(dev);
-+}
-+
-+static LIST_HEAD(yaffs_context_list);
-+struct mutex yaffs_context_lock;
-+
-+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_TRACE_ALWAYS,
-+ "yaffs_put_super");
-+
-+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
-+ "Shutting down yaffs background thread");
-+ yaffs_bg_stop(dev);
-+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
-+ "yaffs background thread shut down");
-+
-+ yaffs_gross_lock(dev);
-+
-+ yaffs_flush_super(sb, 1);
-+
-+ yaffs_deinitialise(dev);
-+
-+ yaffs_gross_unlock(dev);
-+
-+ mutex_lock(&yaffs_context_lock);
-+ list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
-+ mutex_unlock(&yaffs_context_lock);
-+
-+ if (yaffs_dev_to_lc(dev)->spare_buffer) {
-+ kfree(yaffs_dev_to_lc(dev)->spare_buffer);
-+ yaffs_dev_to_lc(dev)->spare_buffer = NULL;
-+ }
-+
-+ kfree(dev);
-+
-+ yaffs_put_mtd_device(mtd);
-+
-+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
-+ "yaffs_put_super done");
-+}
-+
-+
-+static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
-+{
-+ return yaffs_gc_control;
-+}
-+
-+
-+#ifdef YAFFS_COMPILE_EXPORTFS
-+
-+static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino,
-+ uint32_t generation)
-+{
-+ return Y_IGET(sb, ino);
-+}
-+
-+static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb,
-+ struct fid *fid, int fh_len,
-+ int fh_type)
-+{
-+ return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
-+ yaffs2_nfs_get_inode);
-+}
-+
-+static struct dentry *yaffs2_fh_to_parent(struct super_block *sb,
-+ struct fid *fid, int fh_len,
-+ int fh_type)
-+{
-+ return generic_fh_to_parent(sb, fid, fh_len, fh_type,
-+ yaffs2_nfs_get_inode);
-+}
-+
-+struct dentry *yaffs2_get_parent(struct dentry *dentry)
-+{
-+
-+ struct super_block *sb = dentry->d_inode->i_sb;
-+ struct dentry *parent = ERR_PTR(-ENOENT);
-+ struct inode *inode;
-+ unsigned long parent_ino;
-+ struct yaffs_obj *d_obj;
-+ struct yaffs_obj *parent_obj;
-+
-+ d_obj = yaffs_inode_to_obj(dentry->d_inode);
-+
-+ if (d_obj) {
-+ parent_obj = d_obj->parent;
-+ if (parent_obj) {
-+ parent_ino = yaffs_get_obj_inode(parent_obj);
-+ inode = Y_IGET(sb, parent_ino);
-+
-+ if (IS_ERR(inode)) {
-+ parent = ERR_CAST(inode);
-+ } else {
-+ parent = d_obtain_alias(inode);
-+ if (!IS_ERR(parent)) {
-+ parent = ERR_PTR(-ENOMEM);
-+ iput(inode);
-+ }
-+ }
-+ }
-+ }
-+
-+ return parent;
-+}
-+
-+/* Just declare a zero structure as a NULL value implies
-+ * using the default functions of exportfs.
-+ */
-+
-+static struct export_operations yaffs_export_ops = {
-+ .fh_to_dentry = yaffs2_fh_to_dentry,
-+ .fh_to_parent = yaffs2_fh_to_parent,
-+ .get_parent = yaffs2_get_parent,
-+};
-+
-+#endif
-+
-+static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj)
-+{
-+ /* Clear the association between the inode and
-+ * the struct yaffs_obj.
-+ */
-+ obj->my_inode = NULL;
-+ yaffs_inode_to_obj_lv(inode) = NULL;
-+
-+ /* If the object freeing was deferred, then the real
-+ * free happens now.
-+ * This should fix the inode inconsistency problem.
-+ */
-+ yaffs_handle_defered_free(obj);
-+}
-+
-+#ifdef YAFFS_HAS_EVICT_INODE
-+/* yaffs_evict_inode combines into one operation what was previously done in
-+ * yaffs_clear_inode() and yaffs_delete_inode()
-+ *
-+ */
-+static void yaffs_evict_inode(struct inode *inode)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev;
-+ int deleteme = 0;
-+
-+ obj = yaffs_inode_to_obj(inode);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_evict_inode: ino %d, count %d %s",
-+ (int)inode->i_ino, atomic_read(&inode->i_count),
-+ obj ? "object exists" : "null object");
-+
-+ if (!inode->i_nlink && !is_bad_inode(inode))
-+ deleteme = 1;
-+ truncate_inode_pages(&inode->i_data, 0);
-+ Y_CLEAR_INODE(inode);
-+
-+ if (deleteme && obj) {
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+ yaffs_del_obj(obj);
-+ yaffs_gross_unlock(dev);
-+ }
-+ if (obj) {
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+ yaffs_unstitch_obj(inode, obj);
-+ yaffs_gross_unlock(dev);
-+ }
-+}
-+#else
-+
-+/* clear is called to tell the fs to release any per-inode data it holds.
-+ * The object might still exist on disk and is just being thrown out of the cache
-+ * or else the object has actually been deleted and we're being called via
-+ * the chain
-+ * yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode()
-+ */
-+
-+static void yaffs_clear_inode(struct inode *inode)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_dev *dev;
-+
-+ obj = yaffs_inode_to_obj(inode);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_clear_inode: ino %d, count %d %s",
-+ (int)inode->i_ino, atomic_read(&inode->i_count),
-+ obj ? "object exists" : "null object");
-+
-+ if (obj) {
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+ yaffs_unstitch_obj(inode, obj);
-+ yaffs_gross_unlock(dev);
-+ }
-+
-+}
-+
-+/* delete is called when the link count is zero and the inode
-+ * is put (ie. nobody wants to know about it anymore, time to
-+ * delete the file).
-+ * NB Must call clear_inode()
-+ */
-+static void yaffs_delete_inode(struct inode *inode)
-+{
-+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
-+ struct yaffs_dev *dev;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_delete_inode: ino %d, count %d %s",
-+ (int)inode->i_ino, atomic_read(&inode->i_count),
-+ obj ? "object exists" : "null object");
-+
-+ if (obj) {
-+ dev = obj->my_dev;
-+ yaffs_gross_lock(dev);
-+ yaffs_del_obj(obj);
-+ yaffs_gross_unlock(dev);
-+ }
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+ truncate_inode_pages(&inode->i_data, 0);
-+#endif
-+ clear_inode(inode);
-+}
-+#endif
-+
-+
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
-+{
-+ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
-+ struct super_block *sb = dentry->d_sb;
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
-+{
-+ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-+#else
-+static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
-+{
-+ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-+#endif
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_statfs");
-+
-+ yaffs_gross_lock(dev);
-+
-+ buf->f_type = YAFFS_MAGIC;
-+ buf->f_bsize = sb->s_blocksize;
-+ buf->f_namelen = 255;
-+
-+ if (dev->data_bytes_per_chunk & (dev->data_bytes_per_chunk - 1)) {
-+ /* Do this if chunk size is not a power of 2 */
-+
-+ uint64_t bytes_in_dev;
-+ uint64_t bytes_free;
-+
-+ bytes_in_dev =
-+ ((uint64_t)
-+ ((dev->param.end_block - dev->param.start_block +
-+ 1))) * ((uint64_t) (dev->param.chunks_per_block *
-+ dev->data_bytes_per_chunk));
-+
-+ do_div(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */
-+ buf->f_blocks = bytes_in_dev;
-+
-+ bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) *
-+ ((uint64_t) (dev->data_bytes_per_chunk));
-+
-+ do_div(bytes_free, sb->s_blocksize);
-+
-+ buf->f_bfree = bytes_free;
-+
-+ } else if (sb->s_blocksize > dev->data_bytes_per_chunk) {
-+
-+ buf->f_blocks =
-+ (dev->param.end_block - dev->param.start_block + 1) *
-+ dev->param.chunks_per_block /
-+ (sb->s_blocksize / dev->data_bytes_per_chunk);
-+ buf->f_bfree =
-+ yaffs_get_n_free_chunks(dev) /
-+ (sb->s_blocksize / dev->data_bytes_per_chunk);
-+ } else {
-+ buf->f_blocks =
-+ (dev->param.end_block - dev->param.start_block + 1) *
-+ dev->param.chunks_per_block *
-+ (dev->data_bytes_per_chunk / sb->s_blocksize);
-+
-+ buf->f_bfree =
-+ yaffs_get_n_free_chunks(dev) *
-+ (dev->data_bytes_per_chunk / sb->s_blocksize);
-+ }
-+
-+ buf->f_files = 0;
-+ buf->f_ffree = 0;
-+ buf->f_bavail = buf->f_bfree;
-+
-+ yaffs_gross_unlock(dev);
-+ return 0;
-+}
-+
-+
-+
-+static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
-+{
-+
-+ struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-+ unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
-+ unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
-+ int do_checkpoint;
-+ int dirty = yaffs_check_super_dirty(dev);
-+
-+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
-+ "yaffs_do_sync_fs: gc-urgency %d %s %s%s",
-+ gc_urgent,
-+ dirty ? "dirty" : "clean",
-+ request_checkpoint ? "checkpoint requested" : "no checkpoint",
-+ oneshot_checkpoint ? " one-shot" : "");
-+
-+ yaffs_gross_lock(dev);
-+ do_checkpoint = ((request_checkpoint && !gc_urgent) ||
-+ oneshot_checkpoint) && !dev->is_checkpointed;
-+
-+ if (dirty || do_checkpoint) {
-+ yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint);
-+ yaffs_clear_super_dirty(dev);
-+ if (oneshot_checkpoint)
-+ yaffs_auto_checkpoint &= ~4;
-+ }
-+ yaffs_gross_unlock(dev);
-+
-+ return 0;
-+}
-+
-+
-+#ifdef YAFFS_HAS_WRITE_SUPER
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static void yaffs_write_super(struct super_block *sb)
-+#else
-+static int yaffs_write_super(struct super_block *sb)
-+#endif
-+{
-+ unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2);
-+
-+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
-+ "yaffs_write_super %s",
-+ request_checkpoint ? " checkpt" : "");
-+
-+ yaffs_do_sync_fs(sb, request_checkpoint);
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+ return 0;
-+#endif
-+}
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_sync_fs(struct super_block *sb, int wait)
-+#else
-+static int yaffs_sync_fs(struct super_block *sb)
-+#endif
-+{
-+ unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1);
-+
-+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
-+ "yaffs_sync_fs%s", request_checkpoint ? " checkpt" : "");
-+
-+ yaffs_do_sync_fs(sb, request_checkpoint);
-+
-+ return 0;
-+}
-+
-+
-+
-+static const struct super_operations yaffs_super_ops = {
-+ .statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
-+ .read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
-+ .put_inode = yaffs_put_inode,
-+#endif
-+ .put_super = yaffs_put_super,
-+#ifdef YAFFS_HAS_EVICT_INODE
-+ .evict_inode = yaffs_evict_inode,
-+#else
-+ .delete_inode = yaffs_delete_inode,
-+ .clear_inode = yaffs_clear_inode,
-+#endif
-+ .sync_fs = yaffs_sync_fs,
-+#ifdef YAFFS_HAS_WRITE_SUPER
-+ .write_super = yaffs_write_super,
-+#endif
-+};
-+
-+struct yaffs_options {
-+ int inband_tags;
-+ int skip_checkpoint_read;
-+ int skip_checkpoint_write;
-+ int no_cache;
-+ int tags_ecc_on;
-+ int tags_ecc_overridden;
-+ int lazy_loading_enabled;
-+ int lazy_loading_overridden;
-+ int empty_lost_and_found;
-+ int empty_lost_and_found_overridden;
-+ int disable_summary;
-+};
-+
-+#define MAX_OPT_LEN 30
-+static int yaffs_parse_options(struct yaffs_options *options,
-+ const char *options_str)
-+{
-+ char cur_opt[MAX_OPT_LEN + 1];
-+ int p;
-+ int error = 0;
-+
-+ /* Parse through the options which is a comma seperated list */
-+
-+ while (options_str && *options_str && !error) {
-+ memset(cur_opt, 0, MAX_OPT_LEN + 1);
-+ p = 0;
-+
-+ while (*options_str == ',')
-+ options_str++;
-+
-+ while (*options_str && *options_str != ',') {
-+ if (p < MAX_OPT_LEN) {
-+ cur_opt[p] = *options_str;
-+ p++;
-+ }
-+ options_str++;
-+ }
-+
-+ if (!strcmp(cur_opt, "inband-tags")) {
-+ options->inband_tags = 1;
-+ } else if (!strcmp(cur_opt, "tags-ecc-off")) {
-+ options->tags_ecc_on = 0;
-+ options->tags_ecc_overridden = 1;
-+ } else if (!strcmp(cur_opt, "tags-ecc-on")) {
-+ options->tags_ecc_on = 1;
-+ options->tags_ecc_overridden = 1;
-+ } else if (!strcmp(cur_opt, "lazy-loading-off")) {
-+ options->lazy_loading_enabled = 0;
-+ options->lazy_loading_overridden = 1;
-+ } else if (!strcmp(cur_opt, "lazy-loading-on")) {
-+ options->lazy_loading_enabled = 1;
-+ options->lazy_loading_overridden = 1;
-+ } else if (!strcmp(cur_opt, "disable-summary")) {
-+ options->disable_summary = 1;
-+ } else if (!strcmp(cur_opt, "empty-lost-and-found-off")) {
-+ options->empty_lost_and_found = 0;
-+ options->empty_lost_and_found_overridden = 1;
-+ } else if (!strcmp(cur_opt, "empty-lost-and-found-on")) {
-+ options->empty_lost_and_found = 1;
-+ options->empty_lost_and_found_overridden = 1;
-+ } else if (!strcmp(cur_opt, "no-cache")) {
-+ options->no_cache = 1;
-+ } else if (!strcmp(cur_opt, "no-checkpoint-read")) {
-+ options->skip_checkpoint_read = 1;
-+ } else if (!strcmp(cur_opt, "no-checkpoint-write")) {
-+ options->skip_checkpoint_write = 1;
-+ } else if (!strcmp(cur_opt, "no-checkpoint")) {
-+ options->skip_checkpoint_read = 1;
-+ options->skip_checkpoint_write = 1;
-+ } else {
-+ printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+ cur_opt);
-+ error = 1;
-+ }
-+ }
-+
-+ return error;
-+}
-+
-+
-+static struct dentry *yaffs_make_root(struct inode *inode)
-+{
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
-+ struct dentry *root = d_alloc_root(inode);
-+
-+ if (!root)
-+ iput(inode);
-+
-+ return root;
-+#else
-+ return d_make_root(inode);
-+#endif
-+}
-+
-+
-+
-+
-+static struct super_block *yaffs_internal_read_super(int yaffs_version,
-+ struct super_block *sb,
-+ void *data, int silent)
-+{
-+ int n_blocks;
-+ struct inode *inode = NULL;
-+ struct dentry *root;
-+ struct yaffs_dev *dev = 0;
-+ char devname_buf[BDEVNAME_SIZE + 1];
-+ struct mtd_info *mtd;
-+ int err;
-+ char *data_str = (char *)data;
-+ struct yaffs_linux_context *context = NULL;
-+ struct yaffs_param *param;
-+
-+ int read_only = 0;
-+ int inband_tags = 0;
-+
-+ struct yaffs_options options;
-+
-+ unsigned mount_id;
-+ int found;
-+ struct yaffs_linux_context *context_iterator;
-+ struct list_head *l;
-+
-+ if (!sb) {
-+ printk(KERN_INFO "yaffs: sb is NULL\n");
-+ return NULL;
-+ }
-+
-+ sb->s_magic = YAFFS_MAGIC;
-+ sb->s_op = &yaffs_super_ops;
-+ sb->s_flags |= MS_NOATIME;
-+
-+ read_only = ((sb->s_flags & MS_RDONLY) != 0);
-+
-+#ifdef YAFFS_COMPILE_EXPORTFS
-+ sb->s_export_op = &yaffs_export_ops;
-+#endif
-+
-+ if (!sb->s_dev)
-+ printk(KERN_INFO "yaffs: sb->s_dev is NULL\n");
-+ else if (!yaffs_devname(sb, devname_buf))
-+ printk(KERN_INFO "yaffs: devname is NULL\n");
-+ else
-+ printk(KERN_INFO "yaffs: dev is %d name is \"%s\" %s\n",
-+ sb->s_dev,
-+ yaffs_devname(sb, devname_buf), read_only ? "ro" : "rw");
-+
-+ if (!data_str)
-+ data_str = "";
-+
-+ printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
-+
-+ memset(&options, 0, sizeof(options));
-+
-+ if (yaffs_parse_options(&options, data_str)) {
-+ /* Option parsing failed */
-+ return NULL;
-+ }
-+
-+ sb->s_blocksize = PAGE_CACHE_SIZE;
-+ sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_read_super: Using yaffs%d", yaffs_version);
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_read_super: block size %d", (int)(sb->s_blocksize));
-+
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs: Attempting MTD mount of %u.%u,\"%s\"",
-+ MAJOR(sb->s_dev), MINOR(sb->s_dev),
-+ yaffs_devname(sb, devname_buf));
-+
-+ /* Get the device */
-+ mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
-+ if (IS_ERR(mtd)) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs: MTD device %u either not valid or unavailable",
-+ MINOR(sb->s_dev));
-+ return NULL;
-+ }
-+
-+ if (yaffs_auto_select && yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs2");
-+ yaffs_version = 2;
-+ }
-+
-+ /* Added NCB 26/5/2006 for completeness */
-+ if (yaffs_version == 2 && !options.inband_tags
-+ && WRITE_SIZE(mtd) == 512) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1");
-+ yaffs_version = 1;
-+ }
-+
-+ if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) ||
-+ options.inband_tags)
-+ inband_tags = 1;
-+
-+ if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0)
-+ return NULL;
-+
-+ /* OK, so if we got here, we have an MTD that's NAND and looks
-+ * like it has the right capabilities
-+ * Set the struct yaffs_dev up for mtd
-+ */
-+
-+ if (!read_only && !(mtd->flags & MTD_WRITEABLE)) {
-+ read_only = 1;
-+ printk(KERN_INFO
-+ "yaffs: mtd is read only, setting superblock read only\n"
-+ );
-+ sb->s_flags |= MS_RDONLY;
-+ }
-+
-+ dev = kmalloc(sizeof(struct yaffs_dev), GFP_KERNEL);
-+ context = kmalloc(sizeof(struct yaffs_linux_context), GFP_KERNEL);
-+
-+ if (!dev || !context) {
-+ kfree(dev);
-+ kfree(context);
-+ dev = NULL;
-+ context = NULL;
-+
-+ /* Deep shit could not allocate device structure */
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs_read_super: Failed trying to allocate struct yaffs_dev."
-+ );
-+ return NULL;
-+ }
-+ memset(dev, 0, sizeof(struct yaffs_dev));
-+ param = &(dev->param);
-+
-+ memset(context, 0, sizeof(struct yaffs_linux_context));
-+ dev->os_context = context;
-+ INIT_LIST_HEAD(&(context->context_list));
-+ context->dev = dev;
-+ context->super = sb;
-+
-+ dev->read_only = read_only;
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+ sb->s_fs_info = dev;
-+#else
-+ sb->u.generic_sbp = dev;
-+#endif
-+
-+
-+ dev->driver_context = mtd;
-+ param->name = mtd->name;
-+
-+ /* Set up the memory size parameters.... */
-+
-+
-+ param->n_reserved_blocks = 5;
-+ param->n_caches = (options.no_cache) ? 0 : 10;
-+ param->inband_tags = inband_tags;
-+
-+ param->enable_xattr = 1;
-+ if (options.lazy_loading_overridden)
-+ param->disable_lazy_load = !options.lazy_loading_enabled;
-+
-+ param->defered_dir_update = 1;
-+
-+ if (options.tags_ecc_overridden)
-+ param->no_tags_ecc = !options.tags_ecc_on;
-+
-+ param->empty_lost_n_found = 1;
-+ param->refresh_period = 500;
-+ param->disable_summary = options.disable_summary;
-+
-+
-+#ifdef CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING
-+ param->disable_bad_block_marking = 1;
-+#endif
-+ if (options.empty_lost_and_found_overridden)
-+ param->empty_lost_n_found = options.empty_lost_and_found;
-+
-+ /* ... and the functions. */
-+ if (yaffs_version == 2) {
-+ param->is_yaffs2 = 1;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+ param->total_bytes_per_chunk = mtd->writesize;
-+ param->chunks_per_block = mtd->erasesize / mtd->writesize;
-+#else
-+ param->total_bytes_per_chunk = mtd->oobblock;
-+ param->chunks_per_block = mtd->erasesize / mtd->oobblock;
-+#endif
-+ n_blocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
-+
-+ param->start_block = 0;
-+ param->end_block = n_blocks - 1;
-+ } else {
-+ param->is_yaffs2 = 0;
-+ n_blocks = YCALCBLOCKS(mtd->size,
-+ YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+
-+ param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK;
-+ param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK;
-+ }
-+
-+ param->start_block = 0;
-+ param->end_block = n_blocks - 1;
-+
-+ yaffs_mtd_drv_install(dev);
-+
-+ param->sb_dirty_fn = yaffs_set_super_dirty;
-+ param->gc_control_fn = yaffs_gc_control_callback;
-+
-+ yaffs_dev_to_lc(dev)->super = sb;
-+
-+ param->use_nand_ecc = 1;
-+
-+ param->skip_checkpt_rd = options.skip_checkpoint_read;
-+ param->skip_checkpt_wr = options.skip_checkpoint_write;
-+
-+ mutex_lock(&yaffs_context_lock);
-+ /* Get a mount id */
-+ found = 0;
-+ for (mount_id = 0; !found; mount_id++) {
-+ found = 1;
-+ list_for_each(l, &yaffs_context_list) {
-+ context_iterator =
-+ list_entry(l, struct yaffs_linux_context,
-+ context_list);
-+ if (context_iterator->mount_id == mount_id)
-+ found = 0;
-+ }
-+ }
-+ context->mount_id = mount_id;
-+
-+ list_add_tail(&(yaffs_dev_to_lc(dev)->context_list),
-+ &yaffs_context_list);
-+ mutex_unlock(&yaffs_context_lock);
-+
-+ /* Directory search handling... */
-+ INIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->search_contexts));
-+ param->remove_obj_fn = yaffs_remove_obj_callback;
-+
-+ mutex_init(&(yaffs_dev_to_lc(dev)->gross_lock));
-+
-+ yaffs_gross_lock(dev);
-+
-+ err = yaffs_guts_initialise(dev);
-+
-+ yaffs_trace(YAFFS_TRACE_OS,
-+ "yaffs_read_super: guts initialised %s",
-+ (err == YAFFS_OK) ? "OK" : "FAILED");
-+
-+ if (err == YAFFS_OK)
-+ yaffs_bg_start(dev);
-+
-+ if (!context->bg_thread)
-+ param->defered_dir_update = 0;
-+
-+ sb->s_maxbytes = yaffs_max_file_size(dev);
-+
-+ /* Release lock before yaffs_get_inode() */
-+ yaffs_gross_unlock(dev);
-+
-+ /* Create root inode */
-+ if (err == YAFFS_OK)
-+ inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0, yaffs_root(dev));
-+
-+ if (!inode)
-+ return NULL;
-+
-+ inode->i_op = &yaffs_dir_inode_operations;
-+ inode->i_fop = &yaffs_dir_operations;
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: got root inode");
-+
-+ root = yaffs_make_root(inode);
-+
-+ if (!root)
-+ return NULL;
-+
-+ sb->s_root = root;
-+ if(!dev->is_checkpointed)
-+ yaffs_set_super_dirty(dev);
-+
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs_read_super: is_checkpointed %d",
-+ dev->is_checkpointed);
-+
-+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: done");
-+ return sb;
-+}
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
-+ int silent)
-+{
-+ return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
-+}
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
-+static struct dentry *yaffs_mount(struct file_system_type *fs_type, int flags,
-+ const char *dev_name, void *data)
-+{
-+ return mount_bdev(fs_type, flags, dev_name, data, yaffs_internal_read_super_mtd);
-+}
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs_read_super(struct file_system_type *fs,
-+ int flags, const char *dev_name,
-+ void *data, struct vfsmount *mnt)
-+{
-+
-+ return get_sb_bdev(fs, flags, dev_name, data,
-+ yaffs_internal_read_super_mtd, mnt);
-+}
-+#else
-+static struct super_block *yaffs_read_super(struct file_system_type *fs,
-+ int flags, const char *dev_name,
-+ void *data)
-+{
-+
-+ return get_sb_bdev(fs, flags, dev_name, data,
-+ yaffs_internal_read_super_mtd);
-+}
-+#endif
-+
-+static struct file_system_type yaffs_fs_type = {
-+ .owner = THIS_MODULE,
-+ .name = "yaffs",
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
-+ .mount = yaffs_mount,
-+#else
-+ .get_sb = yaffs_read_super,
-+#endif
-+ .kill_sb = kill_block_super,
-+ .fs_flags = FS_REQUIRES_DEV,
-+};
-+#else
-+static struct super_block *yaffs_read_super(struct super_block *sb, void *data,
-+ int silent)
-+{
-+ return yaffs_internal_read_super(1, sb, data, silent);
-+}
-+
-+static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super,
-+ FS_REQUIRES_DEV);
-+#endif
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
-+ int silent)
-+{
-+ return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
-+}
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
-+static struct dentry *yaffs2_mount(struct file_system_type *fs_type, int flags,
-+ const char *dev_name, void *data)
-+{
-+ return mount_bdev(fs_type, flags, dev_name, data, yaffs2_internal_read_super_mtd);
-+}
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+static int yaffs2_read_super(struct file_system_type *fs,
-+ int flags, const char *dev_name, void *data,
-+ struct vfsmount *mnt)
-+{
-+ return get_sb_bdev(fs, flags, dev_name, data,
-+ yaffs2_internal_read_super_mtd, mnt);
-+}
-+#else
-+static struct super_block *yaffs2_read_super(struct file_system_type *fs,
-+ int flags, const char *dev_name,
-+ void *data)
-+{
-+
-+ return get_sb_bdev(fs, flags, dev_name, data,
-+ yaffs2_internal_read_super_mtd);
-+}
-+#endif
-+
-+static struct file_system_type yaffs2_fs_type = {
-+ .owner = THIS_MODULE,
-+ .name = "yaffs2",
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
-+ .mount = yaffs2_mount,
-+#else
-+ .get_sb = yaffs2_read_super,
-+#endif
-+ .kill_sb = kill_block_super,
-+ .fs_flags = FS_REQUIRES_DEV,
-+};
-+#else
-+static struct super_block *yaffs2_read_super(struct super_block *sb,
-+ void *data, int silent)
-+{
-+ return yaffs_internal_read_super(2, sb, data, silent);
-+}
-+
-+static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super,
-+ FS_REQUIRES_DEV);
-+#endif
-+
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
-+static struct proc_dir_entry *my_proc_entry;
-+
-+static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
-+{
-+ struct yaffs_param *param = &dev->param;
-+ int bs[10];
-+
-+ yaffs_count_blocks_by_state(dev,bs);
-+
-+ buf += sprintf(buf, "start_block.......... %d\n", param->start_block);
-+ buf += sprintf(buf, "end_block............ %d\n", param->end_block);
-+ buf += sprintf(buf, "total_bytes_per_chunk %d\n",
-+ param->total_bytes_per_chunk);
-+ buf += sprintf(buf, "use_nand_ecc......... %d\n", param->use_nand_ecc);
-+ buf += sprintf(buf, "no_tags_ecc.......... %d\n", param->no_tags_ecc);
-+ buf += sprintf(buf, "is_yaffs2............ %d\n", param->is_yaffs2);
-+ buf += sprintf(buf, "inband_tags.......... %d\n", param->inband_tags);
-+ buf += sprintf(buf, "empty_lost_n_found... %d\n",
-+ param->empty_lost_n_found);
-+ buf += sprintf(buf, "disable_lazy_load.... %d\n",
-+ param->disable_lazy_load);
-+ buf += sprintf(buf, "disable_bad_block_mrk %d\n",
-+ param->disable_bad_block_marking);
-+ buf += sprintf(buf, "refresh_period....... %d\n",
-+ param->refresh_period);
-+ buf += sprintf(buf, "n_caches............. %d\n", param->n_caches);
-+ buf += sprintf(buf, "n_reserved_blocks.... %d\n",
-+ param->n_reserved_blocks);
-+ buf += sprintf(buf, "always_check_erased.. %d\n",
-+ param->always_check_erased);
-+ buf += sprintf(buf, "\n");
-+ buf += sprintf(buf, "block count by state\n");
-+ buf += sprintf(buf, "0:%d 1:%d 2:%d 3:%d 4:%d\n",
-+ bs[0], bs[1], bs[2], bs[3], bs[4]);
-+ buf += sprintf(buf, "5:%d 6:%d 7:%d 8:%d 9:%d\n",
-+ bs[5], bs[6], bs[7], bs[8], bs[9]);
-+
-+ return buf;
-+}
-+
-+static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev)
-+{
-+ buf += sprintf(buf, "max file size....... %lld\n",
-+ (long long) yaffs_max_file_size(dev));
-+ buf += sprintf(buf, "data_bytes_per_chunk. %d\n",
-+ dev->data_bytes_per_chunk);
-+ buf += sprintf(buf, "chunk_grp_bits....... %d\n", dev->chunk_grp_bits);
-+ buf += sprintf(buf, "chunk_grp_size....... %d\n", dev->chunk_grp_size);
-+ buf += sprintf(buf, "n_erased_blocks...... %d\n", dev->n_erased_blocks);
-+ buf += sprintf(buf, "blocks_in_checkpt.... %d\n",
-+ dev->blocks_in_checkpt);
-+ buf += sprintf(buf, "\n");
-+ buf += sprintf(buf, "n_tnodes............. %d\n", dev->n_tnodes);
-+ buf += sprintf(buf, "n_obj................ %d\n", dev->n_obj);
-+ buf += sprintf(buf, "n_free_chunks........ %d\n", dev->n_free_chunks);
-+ buf += sprintf(buf, "\n");
-+ buf += sprintf(buf, "n_page_writes........ %u\n", dev->n_page_writes);
-+ buf += sprintf(buf, "n_page_reads......... %u\n", dev->n_page_reads);
-+ buf += sprintf(buf, "n_erasures........... %u\n", dev->n_erasures);
-+ buf += sprintf(buf, "n_gc_copies.......... %u\n", dev->n_gc_copies);
-+ buf += sprintf(buf, "all_gcs.............. %u\n", dev->all_gcs);
-+ buf += sprintf(buf, "passive_gc_count..... %u\n",
-+ dev->passive_gc_count);
-+ buf += sprintf(buf, "oldest_dirty_gc_count %u\n",
-+ dev->oldest_dirty_gc_count);
-+ buf += sprintf(buf, "n_gc_blocks.......... %u\n", dev->n_gc_blocks);
-+ buf += sprintf(buf, "bg_gcs............... %u\n", dev->bg_gcs);
-+ buf += sprintf(buf, "n_retried_writes..... %u\n",
-+ dev->n_retried_writes);
-+ buf += sprintf(buf, "n_retired_blocks..... %u\n",
-+ dev->n_retired_blocks);
-+ buf += sprintf(buf, "n_ecc_fixed.......... %u\n", dev->n_ecc_fixed);
-+ buf += sprintf(buf, "n_ecc_unfixed........ %u\n", dev->n_ecc_unfixed);
-+ buf += sprintf(buf, "n_tags_ecc_fixed..... %u\n",
-+ dev->n_tags_ecc_fixed);
-+ buf += sprintf(buf, "n_tags_ecc_unfixed... %u\n",
-+ dev->n_tags_ecc_unfixed);
-+ buf += sprintf(buf, "cache_hits........... %u\n", dev->cache_hits);
-+ buf += sprintf(buf, "n_deleted_files...... %u\n", dev->n_deleted_files);
-+ buf += sprintf(buf, "n_unlinked_files..... %u\n",
-+ dev->n_unlinked_files);
-+ buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count);
-+ buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions);
-+ buf += sprintf(buf, "tags_used............ %u\n", dev->tags_used);
-+ buf += sprintf(buf, "summary_used......... %u\n", dev->summary_used);
-+
-+ return buf;
-+}
-+
-+static int yaffs_proc_read(char *page,
-+ char **start,
-+ off_t offset, int count, int *eof, void *data)
-+{
-+ struct list_head *item;
-+ char *buf = page;
-+ int step = offset;
-+ int n = 0;
-+
-+ /* Get proc_file_read() to step 'offset' by one on each sucessive call.
-+ * We use 'offset' (*ppos) to indicate where we are in dev_list.
-+ * This also assumes the user has posted a read buffer large
-+ * enough to hold the complete output; but that's life in /proc.
-+ */
-+
-+ *(int *)start = 1;
-+
-+ /* Print header first */
-+ if (step == 0)
-+ buf +=
-+ sprintf(buf,
-+ "Multi-version YAFFS built:" __DATE__ " " __TIME__
-+ "\n");
-+ else if (step == 1)
-+ buf += sprintf(buf, "\n");
-+ else {
-+ step -= 2;
-+
-+ mutex_lock(&yaffs_context_lock);
-+
-+ /* Locate and print the Nth entry. Order N-squared but N is small. */
-+ list_for_each(item, &yaffs_context_list) {
-+ struct yaffs_linux_context *dc =
-+ list_entry(item, struct yaffs_linux_context,
-+ context_list);
-+ struct yaffs_dev *dev = dc->dev;
-+
-+ if (n < (step & ~1)) {
-+ n += 2;
-+ continue;
-+ }
-+ if ((step & 1) == 0) {
-+ buf +=
-+ sprintf(buf, "\nDevice %d \"%s\"\n", n,
-+ dev->param.name);
-+ buf = yaffs_dump_dev_part0(buf, dev);
-+ } else {
-+ buf = yaffs_dump_dev_part1(buf, dev);
-+ }
-+
-+ break;
-+ }
-+ mutex_unlock(&yaffs_context_lock);
-+ }
-+
-+ return buf - page < count ? buf - page : count;
-+}
-+
-+/**
-+ * Set the verbosity of the warnings and error messages.
-+ *
-+ * Note that the names can only be a..z or _ with the current code.
-+ */
-+
-+static struct {
-+ char *mask_name;
-+ unsigned mask_bitfield;
-+} mask_flags[] = {
-+ {"allocate", YAFFS_TRACE_ALLOCATE},
-+ {"always", YAFFS_TRACE_ALWAYS},
-+ {"background", YAFFS_TRACE_BACKGROUND},
-+ {"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
-+ {"buffers", YAFFS_TRACE_BUFFERS},
-+ {"bug", YAFFS_TRACE_BUG},
-+ {"checkpt", YAFFS_TRACE_CHECKPOINT},
-+ {"deletion", YAFFS_TRACE_DELETION},
-+ {"erase", YAFFS_TRACE_ERASE},
-+ {"error", YAFFS_TRACE_ERROR},
-+ {"gc_detail", YAFFS_TRACE_GC_DETAIL},
-+ {"gc", YAFFS_TRACE_GC},
-+ {"lock", YAFFS_TRACE_LOCK},
-+ {"mtd", YAFFS_TRACE_MTD},
-+ {"nandaccess", YAFFS_TRACE_NANDACCESS},
-+ {"os", YAFFS_TRACE_OS},
-+ {"scan_debug", YAFFS_TRACE_SCAN_DEBUG},
-+ {"scan", YAFFS_TRACE_SCAN},
-+ {"mount", YAFFS_TRACE_MOUNT},
-+ {"tracing", YAFFS_TRACE_TRACING},
-+ {"sync", YAFFS_TRACE_SYNC},
-+ {"write", YAFFS_TRACE_WRITE},
-+ {"verify", YAFFS_TRACE_VERIFY},
-+ {"verify_nand", YAFFS_TRACE_VERIFY_NAND},
-+ {"verify_full", YAFFS_TRACE_VERIFY_FULL},
-+ {"verify_all", YAFFS_TRACE_VERIFY_ALL},
-+ {"all", 0xffffffff},
-+ {"none", 0},
-+ {NULL, 0},
-+};
-+
-+#define MAX_MASK_NAME_LENGTH 40
-+static int yaffs_proc_write_trace_options(struct file *file, const char *buf,
-+ unsigned long count, void *data)
-+{
-+ unsigned rg = 0, mask_bitfield;
-+ char *end;
-+ char *mask_name;
-+ const char *x;
-+ char substring[MAX_MASK_NAME_LENGTH + 1];
-+ int i;
-+ int done = 0;
-+ int add, len = 0;
-+ int pos = 0;
-+
-+ rg = yaffs_trace_mask;
-+
-+ while (!done && (pos < count)) {
-+ done = 1;
-+ while ((pos < count) && isspace(buf[pos]))
-+ pos++;
-+
-+ switch (buf[pos]) {
-+ case '+':
-+ case '-':
-+ case '=':
-+ add = buf[pos];
-+ pos++;
-+ break;
-+
-+ default:
-+ add = ' ';
-+ break;
-+ }
-+ mask_name = NULL;
-+
-+ mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
-+ if (end > buf + pos) {
-+ mask_name = "numeral";
-+ len = end - (buf + pos);
-+ pos += len;
-+ done = 0;
-+ } else {
-+ for (x = buf + pos, i = 0;
-+ (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+ i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+ substring[i] = *x;
-+ substring[i] = '\0';
-+
-+ for (i = 0; mask_flags[i].mask_name != NULL; i++) {
-+ if (strcmp(substring, mask_flags[i].mask_name)
-+ == 0) {
-+ mask_name = mask_flags[i].mask_name;
-+ mask_bitfield =
-+ mask_flags[i].mask_bitfield;
-+ done = 0;
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (mask_name != NULL) {
-+ done = 0;
-+ switch (add) {
-+ case '-':
-+ rg &= ~mask_bitfield;
-+ break;
-+ case '+':
-+ rg |= mask_bitfield;
-+ break;
-+ case '=':
-+ rg = mask_bitfield;
-+ break;
-+ default:
-+ rg |= mask_bitfield;
-+ break;
-+ }
-+ }
-+ }
-+
-+ yaffs_trace_mask = rg | YAFFS_TRACE_ALWAYS;
-+
-+ printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_trace_mask);
-+
-+ if (rg & YAFFS_TRACE_ALWAYS) {
-+ for (i = 0; mask_flags[i].mask_name != NULL; i++) {
-+ char flag;
-+ flag = ((rg & mask_flags[i].mask_bitfield) ==
-+ mask_flags[i].mask_bitfield) ? '+' : '-';
-+ printk(KERN_DEBUG "%c%s\n", flag,
-+ mask_flags[i].mask_name);
-+ }
-+ }
-+
-+ return count;
-+}
-+
-+/* Debug strings are of the form:
-+ * .bnnn print info on block n
-+ * .cobjn,chunkn print nand chunk id for objn:chunkn
-+ */
-+
-+static int yaffs_proc_debug_write(struct file *file, const char *buf,
-+ unsigned long count, void *data)
-+{
-+
-+ char str[100];
-+ char *p0;
-+ char *p1;
-+ long p1_val;
-+ long p0_val;
-+ char cmd;
-+ struct list_head *item;
-+
-+ memset(str, 0, sizeof(str));
-+ memcpy(str, buf, min(count, sizeof(str) -1));
-+
-+ cmd = str[1];
-+
-+ p0 = str + 2;
-+
-+ p1 = p0;
-+
-+ while (*p1 && *p1 != ',') {
-+ p1++;
-+ }
-+ *p1 = '\0';
-+ p1++;
-+
-+ p0_val = simple_strtol(p0, NULL, 0);
-+ p1_val = simple_strtol(p1, NULL, 0);
-+
-+
-+ mutex_lock(&yaffs_context_lock);
-+
-+ /* Locate and print the Nth entry. Order N-squared but N is small. */
-+ list_for_each(item, &yaffs_context_list) {
-+ struct yaffs_linux_context *dc =
-+ list_entry(item, struct yaffs_linux_context,
-+ context_list);
-+ struct yaffs_dev *dev = dc->dev;
-+
-+ if (cmd == 'b') {
-+ struct yaffs_block_info *bi;
-+
-+ bi = yaffs_get_block_info(dev,p0_val);
-+
-+ if(bi) {
-+ printk("Block %d: state %d, retire %d, use %d, seq %d\n",
-+ (int)p0_val, bi->block_state,
-+ bi->needs_retiring, bi->pages_in_use,
-+ bi->seq_number);
-+ }
-+ } else if (cmd == 'c') {
-+ struct yaffs_obj *obj;
-+ int nand_chunk;
-+
-+ obj = yaffs_find_by_number(dev, p0_val);
-+ if (!obj)
-+ printk("No obj %d\n", (int)p0_val);
-+ else {
-+ if(p1_val == 0)
-+ nand_chunk = obj->hdr_chunk;
-+ else
-+ nand_chunk =
-+ yaffs_find_chunk_in_file(obj,
-+ p1_val, NULL);
-+ printk("Nand chunk for %d:%d is %d\n",
-+ (int)p0_val, (int)p1_val, nand_chunk);
-+ }
-+ }
-+ }
-+
-+ mutex_unlock(&yaffs_context_lock);
-+
-+ return count;
-+}
-+
-+static int yaffs_proc_write(struct file *file, const char *buf,
-+ unsigned long count, void *data)
-+{
-+ if (buf[0] == '.')
-+ return yaffs_proc_debug_write(file, buf, count, data);
-+ return yaffs_proc_write_trace_options(file, buf, count, data);
-+}
-+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) */
-+
-+/* Stuff to handle installation of file systems */
-+struct file_system_to_install {
-+ struct file_system_type *fst;
-+ int installed;
-+};
-+
-+static struct file_system_to_install fs_to_install[] = {
-+ {&yaffs_fs_type, 0},
-+ {&yaffs2_fs_type, 0},
-+ {NULL, 0}
-+};
-+
-+static int __init init_yaffs_fs(void)
-+{
-+ int error = 0;
-+ struct file_system_to_install *fsinst;
-+
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs built " __DATE__ " " __TIME__ " Installing.");
-+
-+ mutex_init(&yaffs_context_lock);
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
-+ /* Install the proc_fs entries */
-+ my_proc_entry = create_proc_entry("yaffs",
-+ S_IRUGO | S_IFREG, YPROC_ROOT);
-+
-+ if (my_proc_entry) {
-+ my_proc_entry->write_proc = yaffs_proc_write;
-+ my_proc_entry->read_proc = yaffs_proc_read;
-+ my_proc_entry->data = NULL;
-+ } else {
-+ return -ENOMEM;
-+ }
-+#endif
-+
-+ /* Now add the file system entries */
-+
-+ fsinst = fs_to_install;
-+
-+ while (fsinst->fst && !error) {
-+ error = register_filesystem(fsinst->fst);
-+ if (!error)
-+ fsinst->installed = 1;
-+ fsinst++;
-+ }
-+
-+ /* Any errors? uninstall */
-+ if (error) {
-+ fsinst = fs_to_install;
-+
-+ while (fsinst->fst) {
-+ if (fsinst->installed) {
-+ unregister_filesystem(fsinst->fst);
-+ fsinst->installed = 0;
-+ }
-+ fsinst++;
-+ }
-+ }
-+
-+ return error;
-+}
-+
-+static void __exit exit_yaffs_fs(void)
-+{
-+
-+ struct file_system_to_install *fsinst;
-+
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "yaffs built " __DATE__ " " __TIME__ " removing.");
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
-+ remove_proc_entry("yaffs", YPROC_ROOT);
-+#endif
-+
-+ fsinst = fs_to_install;
-+
-+ while (fsinst->fst) {
-+ if (fsinst->installed) {
-+ unregister_filesystem(fsinst->fst);
-+ fsinst->installed = 0;
-+ }
-+ fsinst++;
-+ }
-+}
-+
-+module_init(init_yaffs_fs)
-+ module_exit(exit_yaffs_fs)
-+
-+ MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
-+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2011");
-+MODULE_LICENSE("GPL");
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_yaffs1.c linux-3.15-rc5/fs/yaffs2/yaffs_yaffs1.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_yaffs1.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_yaffs1.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,422 @@
-+/*
-+ * 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_yaffs1.h"
-+#include "yportenv.h"
-+#include "yaffs_trace.h"
-+#include "yaffs_bitmap.h"
-+#include "yaffs_getblockinfo.h"
-+#include "yaffs_nand.h"
-+#include "yaffs_attribs.h"
-+
-+int yaffs1_scan(struct yaffs_dev *dev)
-+{
-+ struct yaffs_ext_tags tags;
-+ int blk;
-+ int result;
-+ int chunk;
-+ int c;
-+ int deleted;
-+ enum yaffs_block_state state;
-+ LIST_HEAD(hard_list);
-+ struct yaffs_block_info *bi;
-+ u32 seq_number;
-+ struct yaffs_obj_hdr *oh;
-+ struct yaffs_obj *in;
-+ struct yaffs_obj *parent;
-+ int alloc_failed = 0;
-+ struct yaffs_shadow_fixer *shadow_fixers = NULL;
-+ u8 *chunk_data;
-+
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ "yaffs1_scan starts intstartblk %d intendblk %d...",
-+ dev->internal_start_block, dev->internal_end_block);
-+
-+ chunk_data = yaffs_get_temp_buffer(dev);
-+
-+ dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
-+
-+ /* Scan all the blocks to determine their state */
-+ bi = dev->block_info;
-+ for (blk = dev->internal_start_block; blk <= dev->internal_end_block;
-+ blk++) {
-+ yaffs_clear_chunk_bits(dev, blk);
-+ bi->pages_in_use = 0;
-+ bi->soft_del_pages = 0;
-+
-+ yaffs_query_init_block_state(dev, blk, &state, &seq_number);
-+
-+ bi->block_state = state;
-+ bi->seq_number = seq_number;
-+
-+ if (bi->seq_number == YAFFS_SEQUENCE_BAD_BLOCK)
-+ bi->block_state = state = YAFFS_BLOCK_STATE_DEAD;
-+
-+ yaffs_trace(YAFFS_TRACE_SCAN_DEBUG,
-+ "Block scanning block %d state %d seq %d",
-+ blk, state, seq_number);
-+
-+ if (state == YAFFS_BLOCK_STATE_DEAD) {
-+ yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
-+ "block %d is bad", blk);
-+ } else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-+ yaffs_trace(YAFFS_TRACE_SCAN_DEBUG, "Block empty ");
-+ dev->n_erased_blocks++;
-+ dev->n_free_chunks += dev->param.chunks_per_block;
-+ }
-+ bi++;
-+ }
-+
-+ /* For each block.... */
-+ for (blk = dev->internal_start_block;
-+ !alloc_failed && blk <= dev->internal_end_block; blk++) {
-+
-+ cond_resched();
-+
-+ bi = yaffs_get_block_info(dev, blk);
-+ state = bi->block_state;
-+
-+ deleted = 0;
-+
-+ /* For each chunk in each block that needs scanning.... */
-+ for (c = 0;
-+ !alloc_failed && c < dev->param.chunks_per_block &&
-+ state == YAFFS_BLOCK_STATE_NEEDS_SCAN; c++) {
-+ /* Read the tags and decide what to do */
-+ chunk = blk * dev->param.chunks_per_block + c;
-+
-+ result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
-+ &tags);
-+
-+ /* Let's have a good look at this chunk... */
-+
-+ if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED ||
-+ tags.is_deleted) {
-+ /* YAFFS1 only...
-+ * A deleted chunk
-+ */
-+ deleted++;
-+ dev->n_free_chunks++;
-+ } else if (!tags.chunk_used) {
-+ /* An unassigned chunk in the block
-+ * This means that either the block is empty or
-+ * this is the one being allocated from
-+ */
-+
-+ if (c == 0) {
-+ /* We're looking at the first chunk in
-+ *the block so the block is unused */
-+ state = YAFFS_BLOCK_STATE_EMPTY;
-+ dev->n_erased_blocks++;
-+ } else {
-+ /* this is the block being allocated */
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ " Allocating from %d %d",
-+ blk, c);
-+ state = YAFFS_BLOCK_STATE_ALLOCATING;
-+ dev->alloc_block = blk;
-+ dev->alloc_page = c;
-+ dev->alloc_block_finder = blk;
-+
-+ }
-+
-+ dev->n_free_chunks +=
-+ (dev->param.chunks_per_block - c);
-+ } else if (tags.chunk_id > 0) {
-+ /* chunk_id > 0 so it is a data chunk... */
-+ unsigned int endpos;
-+
-+ yaffs_set_chunk_bit(dev, blk, c);
-+ bi->pages_in_use++;
-+
-+ in = yaffs_find_or_create_by_number(dev,
-+ tags.obj_id,
-+ YAFFS_OBJECT_TYPE_FILE);
-+ /* PutChunkIntoFile checks for a clash
-+ * (two data chunks with the same chunk_id).
-+ */
-+
-+ if (!in)
-+ alloc_failed = 1;
-+
-+ if (in) {
-+ if (!yaffs_put_chunk_in_file
-+ (in, tags.chunk_id, chunk, 1))
-+ alloc_failed = 1;
-+ }
-+
-+ endpos =
-+ (tags.chunk_id - 1) *
-+ dev->data_bytes_per_chunk +
-+ tags.n_bytes;
-+ if (in &&
-+ in->variant_type ==
-+ YAFFS_OBJECT_TYPE_FILE &&
-+ in->variant.file_variant.scanned_size <
-+ endpos) {
-+ in->variant.file_variant.scanned_size =
-+ endpos;
-+ if (!dev->param.use_header_file_size) {
-+ in->variant.
-+ file_variant.file_size =
-+ in->variant.
-+ file_variant.scanned_size;
-+ }
-+
-+ }
-+ } else {
-+ /* chunk_id == 0, so it is an ObjectHeader.
-+ * Make the object
-+ */
-+ yaffs_set_chunk_bit(dev, blk, c);
-+ bi->pages_in_use++;
-+
-+ result = yaffs_rd_chunk_tags_nand(dev, chunk,
-+ chunk_data,
-+ NULL);
-+
-+ oh = (struct yaffs_obj_hdr *)chunk_data;
-+
-+ in = yaffs_find_by_number(dev, tags.obj_id);
-+ if (in && in->variant_type != oh->type) {
-+ /* This should not happen, but somehow
-+ * Wev'e ended up with an obj_id that
-+ * has been reused but not yet deleted,
-+ * and worse still it has changed type.
-+ * Delete the old object.
-+ */
-+
-+ yaffs_del_obj(in);
-+ in = NULL;
-+ }
-+
-+ in = yaffs_find_or_create_by_number(dev,
-+ tags.obj_id,
-+ oh->type);
-+
-+ if (!in)
-+ alloc_failed = 1;
-+
-+ if (in && oh->shadows_obj > 0) {
-+
-+ struct yaffs_shadow_fixer *fixer;
-+ fixer =
-+ kmalloc(sizeof
-+ (struct yaffs_shadow_fixer),
-+ GFP_NOFS);
-+ if (fixer) {
-+ fixer->next = shadow_fixers;
-+ shadow_fixers = fixer;
-+ fixer->obj_id = tags.obj_id;
-+ fixer->shadowed_id =
-+ oh->shadows_obj;
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ " Shadow fixer: %d shadows %d",
-+ fixer->obj_id,
-+ fixer->shadowed_id);
-+
-+ }
-+
-+ }
-+
-+ if (in && in->valid) {
-+ /* We have already filled this one.
-+ * We have a duplicate and need to
-+ * resolve it. */
-+
-+ unsigned existing_serial = in->serial;
-+ unsigned new_serial =
-+ tags.serial_number;
-+
-+ if (((existing_serial + 1) & 3) ==
-+ new_serial) {
-+ /* Use new one - destroy the
-+ * exisiting one */
-+ yaffs_chunk_del(dev,
-+ in->hdr_chunk,
-+ 1, __LINE__);
-+ in->valid = 0;
-+ } else {
-+ /* Use existing - destroy
-+ * this one. */
-+ yaffs_chunk_del(dev, chunk, 1,
-+ __LINE__);
-+ }
-+ }
-+
-+ if (in && !in->valid &&
-+ (tags.obj_id == YAFFS_OBJECTID_ROOT ||
-+ tags.obj_id ==
-+ YAFFS_OBJECTID_LOSTNFOUND)) {
-+ /* We only load some info, don't fiddle
-+ * with directory structure */
-+ in->valid = 1;
-+ in->variant_type = oh->type;
-+
-+ in->yst_mode = oh->yst_mode;
-+ yaffs_load_attribs(in, oh);
-+ in->hdr_chunk = chunk;
-+ in->serial = tags.serial_number;
-+
-+ } else if (in && !in->valid) {
-+ /* we need to load this info */
-+
-+ in->valid = 1;
-+ in->variant_type = oh->type;
-+
-+ in->yst_mode = oh->yst_mode;
-+ yaffs_load_attribs(in, oh);
-+ in->hdr_chunk = chunk;
-+ in->serial = tags.serial_number;
-+
-+ yaffs_set_obj_name_from_oh(in, oh);
-+ in->dirty = 0;
-+
-+ /* directory stuff...
-+ * hook up to parent
-+ */
-+
-+ parent =
-+ yaffs_find_or_create_by_number
-+ (dev, oh->parent_obj_id,
-+ YAFFS_OBJECT_TYPE_DIRECTORY);
-+ if (!parent)
-+ alloc_failed = 1;
-+ if (parent && parent->variant_type ==
-+ YAFFS_OBJECT_TYPE_UNKNOWN) {
-+ /* Set up as a directory */
-+ parent->variant_type =
-+ YAFFS_OBJECT_TYPE_DIRECTORY;
-+ INIT_LIST_HEAD(&parent->
-+ variant.dir_variant.
-+ children);
-+ } else if (!parent ||
-+ parent->variant_type !=
-+ YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ /* Hoosterman, a problem....
-+ * We're trying to use a
-+ * non-directory as a directory
-+ */
-+
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
-+ );
-+ parent = dev->lost_n_found;
-+ }
-+
-+ yaffs_add_obj_to_dir(parent, in);
-+
-+ switch (in->variant_type) {
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ /* Todo got a problem */
-+ break;
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ if (dev->param.
-+ use_header_file_size)
-+ in->variant.
-+ file_variant.file_size
-+ = yaffs_oh_to_size(oh);
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ in->variant.
-+ hardlink_variant.equiv_id =
-+ oh->equiv_id;
-+ list_add(&in->hard_links,
-+ &hard_list);
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ in->variant.symlink_variant.
-+ alias =
-+ yaffs_clone_str(oh->alias);
-+ if (!in->variant.
-+ symlink_variant.alias)
-+ alloc_failed = 1;
-+ break;
-+ }
-+ }
-+ }
-+ }
-+
-+ if (state == YAFFS_BLOCK_STATE_NEEDS_SCAN) {
-+ /* If we got this far while scanning,
-+ * then the block is fully allocated. */
-+ state = YAFFS_BLOCK_STATE_FULL;
-+ }
-+
-+ if (state == YAFFS_BLOCK_STATE_ALLOCATING) {
-+ /* If the block was partially allocated then
-+ * treat it as fully allocated. */
-+ state = YAFFS_BLOCK_STATE_FULL;
-+ dev->alloc_block = -1;
-+ }
-+
-+ bi->block_state = state;
-+
-+ /* Now let's see if it was dirty */
-+ if (bi->pages_in_use == 0 &&
-+ !bi->has_shrink_hdr &&
-+ bi->block_state == YAFFS_BLOCK_STATE_FULL)
-+ yaffs_block_became_dirty(dev, blk);
-+ }
-+
-+ /* Ok, we've done all the scanning.
-+ * Fix up the hard link chains.
-+ * We should now have scanned all the objects, now it's time to add
-+ * these hardlinks.
-+ */
-+
-+ yaffs_link_fixup(dev, &hard_list);
-+
-+ /*
-+ * Fix up any shadowed objects.
-+ * There should not be more than one of these.
-+ */
-+ {
-+ struct yaffs_shadow_fixer *fixer;
-+ struct yaffs_obj *obj;
-+
-+ while (shadow_fixers) {
-+ fixer = shadow_fixers;
-+ shadow_fixers = fixer->next;
-+ /* Complete the rename transaction by deleting the
-+ * shadowed object then setting the object header
-+ to unshadowed.
-+ */
-+ obj = yaffs_find_by_number(dev, fixer->shadowed_id);
-+ if (obj)
-+ yaffs_del_obj(obj);
-+
-+ obj = yaffs_find_by_number(dev, fixer->obj_id);
-+
-+ if (obj)
-+ yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
-+
-+ kfree(fixer);
-+ }
-+ }
-+
-+ yaffs_release_temp_buffer(dev, chunk_data);
-+
-+ if (alloc_failed)
-+ return YAFFS_FAIL;
-+
-+ yaffs_trace(YAFFS_TRACE_SCAN, "yaffs1_scan ends");
-+
-+ return YAFFS_OK;
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_yaffs1.h linux-3.15-rc5/fs/yaffs2/yaffs_yaffs1.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_yaffs1.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_yaffs1.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,22 @@
-+/*
-+ * 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_YAFFS1_H__
-+#define __YAFFS_YAFFS1_H__
-+
-+#include "yaffs_guts.h"
-+int yaffs1_scan(struct yaffs_dev *dev);
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_yaffs2.c linux-3.15-rc5/fs/yaffs2/yaffs_yaffs2.c
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_yaffs2.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_yaffs2.c 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,1534 @@
-+/*
-+ * 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_trace.h"
-+#include "yaffs_yaffs2.h"
-+#include "yaffs_checkptrw.h"
-+#include "yaffs_bitmap.h"
-+#include "yaffs_nand.h"
-+#include "yaffs_getblockinfo.h"
-+#include "yaffs_verify.h"
-+#include "yaffs_attribs.h"
-+#include "yaffs_summary.h"
-+
-+/*
-+ * Checkpoints are really no benefit on very small partitions.
-+ *
-+ * To save space on small partitions don't bother with checkpoints unless
-+ * the partition is at least this big.
-+ */
-+#define YAFFS_CHECKPOINT_MIN_BLOCKS 60
-+#define YAFFS_SMALL_HOLE_THRESHOLD 4
-+
-+/*
-+ * Oldest Dirty Sequence Number handling.
-+ */
-+
-+/* yaffs_calc_oldest_dirty_seq()
-+ * yaffs2_find_oldest_dirty_seq()
-+ * Calculate the oldest dirty sequence number if we don't know it.
-+ */
-+void yaffs_calc_oldest_dirty_seq(struct yaffs_dev *dev)
-+{
-+ int i;
-+ unsigned seq;
-+ unsigned block_no = 0;
-+ struct yaffs_block_info *b;
-+
-+ if (!dev->param.is_yaffs2)
-+ return;
-+
-+ /* Find the oldest dirty sequence number. */
-+ seq = dev->seq_number + 1;
-+ b = dev->block_info;
-+ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-+ if (b->block_state == YAFFS_BLOCK_STATE_FULL &&
-+ (b->pages_in_use - b->soft_del_pages) <
-+ dev->param.chunks_per_block &&
-+ b->seq_number < seq) {
-+ seq = b->seq_number;
-+ block_no = i;
-+ }
-+ b++;
-+ }
-+
-+ if (block_no) {
-+ dev->oldest_dirty_seq = seq;
-+ dev->oldest_dirty_block = block_no;
-+ }
-+}
-+
-+void yaffs2_find_oldest_dirty_seq(struct yaffs_dev *dev)
-+{
-+ if (!dev->param.is_yaffs2)
-+ return;
-+
-+ if (!dev->oldest_dirty_seq)
-+ yaffs_calc_oldest_dirty_seq(dev);
-+}
-+
-+/*
-+ * yaffs_clear_oldest_dirty_seq()
-+ * Called when a block is erased or marked bad. (ie. when its seq_number
-+ * becomes invalid). If the value matches the oldest then we clear
-+ * dev->oldest_dirty_seq to force its recomputation.
-+ */
-+void yaffs2_clear_oldest_dirty_seq(struct yaffs_dev *dev,
-+ struct yaffs_block_info *bi)
-+{
-+
-+ if (!dev->param.is_yaffs2)
-+ return;
-+
-+ if (!bi || bi->seq_number == dev->oldest_dirty_seq) {
-+ dev->oldest_dirty_seq = 0;
-+ dev->oldest_dirty_block = 0;
-+ }
-+}
-+
-+/*
-+ * yaffs2_update_oldest_dirty_seq()
-+ * Update the oldest dirty sequence number whenever we dirty a block.
-+ * Only do this if the oldest_dirty_seq is actually being tracked.
-+ */
-+void yaffs2_update_oldest_dirty_seq(struct yaffs_dev *dev, unsigned block_no,
-+ struct yaffs_block_info *bi)
-+{
-+ if (!dev->param.is_yaffs2)
-+ return;
-+
-+ if (dev->oldest_dirty_seq) {
-+ if (dev->oldest_dirty_seq > bi->seq_number) {
-+ dev->oldest_dirty_seq = bi->seq_number;
-+ dev->oldest_dirty_block = block_no;
-+ }
-+ }
-+}
-+
-+int yaffs_block_ok_for_gc(struct yaffs_dev *dev, struct yaffs_block_info *bi)
-+{
-+
-+ if (!dev->param.is_yaffs2)
-+ return 1; /* disqualification only applies to yaffs2. */
-+
-+ if (!bi->has_shrink_hdr)
-+ return 1; /* can gc */
-+
-+ yaffs2_find_oldest_dirty_seq(dev);
-+
-+ /* Can't do gc of this block if there are any blocks older than this
-+ * one that have discarded pages.
-+ */
-+ return (bi->seq_number <= dev->oldest_dirty_seq);
-+}
-+
-+/*
-+ * yaffs2_find_refresh_block()
-+ * periodically finds the oldest full block by sequence number for refreshing.
-+ * Only for yaffs2.
-+ */
-+u32 yaffs2_find_refresh_block(struct yaffs_dev *dev)
-+{
-+ u32 b;
-+ u32 oldest = 0;
-+ u32 oldest_seq = 0;
-+ struct yaffs_block_info *bi;
-+
-+ if (!dev->param.is_yaffs2)
-+ return oldest;
-+
-+ /*
-+ * If refresh period < 10 then refreshing is disabled.
-+ */
-+ if (dev->param.refresh_period < 10)
-+ return oldest;
-+
-+ /*
-+ * Fix broken values.
-+ */
-+ if (dev->refresh_skip > dev->param.refresh_period)
-+ dev->refresh_skip = dev->param.refresh_period;
-+
-+ if (dev->refresh_skip > 0)
-+ return oldest;
-+
-+ /*
-+ * Refresh skip is now zero.
-+ * We'll do a refresh this time around....
-+ * Update the refresh skip and find the oldest block.
-+ */
-+ dev->refresh_skip = dev->param.refresh_period;
-+ dev->refresh_count++;
-+ bi = dev->block_info;
-+ for (b = dev->internal_start_block; b <= dev->internal_end_block; b++) {
-+
-+ if (bi->block_state == YAFFS_BLOCK_STATE_FULL) {
-+
-+ if (oldest < 1 || bi->seq_number < oldest_seq) {
-+ oldest = b;
-+ oldest_seq = bi->seq_number;
-+ }
-+ }
-+ bi++;
-+ }
-+
-+ if (oldest > 0) {
-+ yaffs_trace(YAFFS_TRACE_GC,
-+ "GC refresh count %d selected block %d with seq_number %d",
-+ dev->refresh_count, oldest, oldest_seq);
-+ }
-+
-+ return oldest;
-+}
-+
-+int yaffs2_checkpt_required(struct yaffs_dev *dev)
-+{
-+ int nblocks;
-+
-+ if (!dev->param.is_yaffs2)
-+ return 0;
-+
-+ nblocks = dev->internal_end_block - dev->internal_start_block + 1;
-+
-+ return !dev->param.skip_checkpt_wr &&
-+ !dev->read_only && (nblocks >= YAFFS_CHECKPOINT_MIN_BLOCKS);
-+}
-+
-+int yaffs_calc_checkpt_blocks_required(struct yaffs_dev *dev)
-+{
-+ int retval;
-+ int n_bytes = 0;
-+ int n_blocks;
-+ int dev_blocks;
-+
-+ if (!dev->param.is_yaffs2)
-+ return 0;
-+
-+ if (!dev->checkpoint_blocks_required && yaffs2_checkpt_required(dev)) {
-+ /* Not a valid value so recalculate */
-+ dev_blocks = dev->param.end_block - dev->param.start_block + 1;
-+ n_bytes += sizeof(struct yaffs_checkpt_validity);
-+ n_bytes += sizeof(struct yaffs_checkpt_dev);
-+ n_bytes += dev_blocks * sizeof(struct yaffs_block_info);
-+ n_bytes += dev_blocks * dev->chunk_bit_stride;
-+ n_bytes +=
-+ (sizeof(struct yaffs_checkpt_obj) + sizeof(u32)) *
-+ dev->n_obj;
-+ n_bytes += (dev->tnode_size + sizeof(u32)) * dev->n_tnodes;
-+ n_bytes += sizeof(struct yaffs_checkpt_validity);
-+ n_bytes += sizeof(u32); /* checksum */
-+
-+ /* Round up and add 2 blocks to allow for some bad blocks,
-+ * so add 3 */
-+
-+ n_blocks =
-+ (n_bytes /
-+ (dev->data_bytes_per_chunk *
-+ dev->param.chunks_per_block)) + 3;
-+
-+ dev->checkpoint_blocks_required = n_blocks;
-+ }
-+
-+ retval = dev->checkpoint_blocks_required - dev->blocks_in_checkpt;
-+ if (retval < 0)
-+ retval = 0;
-+ return retval;
-+}
-+
-+/*--------------------- Checkpointing --------------------*/
-+
-+static int yaffs2_wr_checkpt_validity_marker(struct yaffs_dev *dev, int head)
-+{
-+ struct yaffs_checkpt_validity cp;
-+
-+ memset(&cp, 0, sizeof(cp));
-+
-+ cp.struct_type = sizeof(cp);
-+ cp.magic = YAFFS_MAGIC;
-+ cp.version = YAFFS_CHECKPOINT_VERSION;
-+ cp.head = (head) ? 1 : 0;
-+
-+ return (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)) ? 1 : 0;
-+}
-+
-+static int yaffs2_rd_checkpt_validity_marker(struct yaffs_dev *dev, int head)
-+{
-+ struct yaffs_checkpt_validity cp;
-+ int ok;
-+
-+ ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
-+
-+ if (ok)
-+ ok = (cp.struct_type == sizeof(cp)) &&
-+ (cp.magic == YAFFS_MAGIC) &&
-+ (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-+ (cp.head == ((head) ? 1 : 0));
-+ return ok ? 1 : 0;
-+}
-+
-+static void yaffs2_dev_to_checkpt_dev(struct yaffs_checkpt_dev *cp,
-+ struct yaffs_dev *dev)
-+{
-+ cp->n_erased_blocks = dev->n_erased_blocks;
-+ cp->alloc_block = dev->alloc_block;
-+ cp->alloc_page = dev->alloc_page;
-+ cp->n_free_chunks = dev->n_free_chunks;
-+
-+ cp->n_deleted_files = dev->n_deleted_files;
-+ cp->n_unlinked_files = dev->n_unlinked_files;
-+ cp->n_bg_deletions = dev->n_bg_deletions;
-+ cp->seq_number = dev->seq_number;
-+
-+}
-+
-+static void yaffs_checkpt_dev_to_dev(struct yaffs_dev *dev,
-+ struct yaffs_checkpt_dev *cp)
-+{
-+ dev->n_erased_blocks = cp->n_erased_blocks;
-+ dev->alloc_block = cp->alloc_block;
-+ dev->alloc_page = cp->alloc_page;
-+ dev->n_free_chunks = cp->n_free_chunks;
-+
-+ dev->n_deleted_files = cp->n_deleted_files;
-+ dev->n_unlinked_files = cp->n_unlinked_files;
-+ dev->n_bg_deletions = cp->n_bg_deletions;
-+ dev->seq_number = cp->seq_number;
-+}
-+
-+static int yaffs2_wr_checkpt_dev(struct yaffs_dev *dev)
-+{
-+ struct yaffs_checkpt_dev cp;
-+ u32 n_bytes;
-+ u32 n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
-+ int ok;
-+
-+ /* Write device runtime values */
-+ yaffs2_dev_to_checkpt_dev(&cp, dev);
-+ cp.struct_type = sizeof(cp);
-+
-+ ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp));
-+ if (!ok)
-+ return 0;
-+
-+ /* Write block info */
-+ n_bytes = n_blocks * sizeof(struct yaffs_block_info);
-+ ok = (yaffs2_checkpt_wr(dev, dev->block_info, n_bytes) == n_bytes);
-+ if (!ok)
-+ return 0;
-+
-+ /* Write chunk bits */
-+ n_bytes = n_blocks * dev->chunk_bit_stride;
-+ ok = (yaffs2_checkpt_wr(dev, dev->chunk_bits, n_bytes) == n_bytes);
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static int yaffs2_rd_checkpt_dev(struct yaffs_dev *dev)
-+{
-+ struct yaffs_checkpt_dev cp;
-+ u32 n_bytes;
-+ u32 n_blocks =
-+ (dev->internal_end_block - dev->internal_start_block + 1);
-+ int ok;
-+
-+ ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
-+ if (!ok)
-+ return 0;
-+
-+ if (cp.struct_type != sizeof(cp))
-+ return 0;
-+
-+ yaffs_checkpt_dev_to_dev(dev, &cp);
-+
-+ n_bytes = n_blocks * sizeof(struct yaffs_block_info);
-+
-+ ok = (yaffs2_checkpt_rd(dev, dev->block_info, n_bytes) == n_bytes);
-+
-+ if (!ok)
-+ return 0;
-+
-+ n_bytes = n_blocks * dev->chunk_bit_stride;
-+
-+ ok = (yaffs2_checkpt_rd(dev, dev->chunk_bits, n_bytes) == n_bytes);
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static void yaffs2_obj_checkpt_obj(struct yaffs_checkpt_obj *cp,
-+ struct yaffs_obj *obj)
-+{
-+ cp->obj_id = obj->obj_id;
-+ cp->parent_id = (obj->parent) ? obj->parent->obj_id : 0;
-+ cp->hdr_chunk = obj->hdr_chunk;
-+ cp->variant_type = obj->variant_type;
-+ cp->deleted = obj->deleted;
-+ cp->soft_del = obj->soft_del;
-+ cp->unlinked = obj->unlinked;
-+ cp->fake = obj->fake;
-+ cp->rename_allowed = obj->rename_allowed;
-+ cp->unlink_allowed = obj->unlink_allowed;
-+ cp->serial = obj->serial;
-+ cp->n_data_chunks = obj->n_data_chunks;
-+
-+ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
-+ cp->size_or_equiv_obj = obj->variant.file_variant.file_size;
-+ else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK)
-+ cp->size_or_equiv_obj = obj->variant.hardlink_variant.equiv_id;
-+}
-+
-+static int yaffs2_checkpt_obj_to_obj(struct yaffs_obj *obj,
-+ struct yaffs_checkpt_obj *cp)
-+{
-+ struct yaffs_obj *parent;
-+
-+ if (obj->variant_type != cp->variant_type) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "Checkpoint read object %d type %d chunk %d does not match existing object type %d",
-+ cp->obj_id, cp->variant_type, cp->hdr_chunk,
-+ obj->variant_type);
-+ return 0;
-+ }
-+
-+ obj->obj_id = cp->obj_id;
-+
-+ if (cp->parent_id)
-+ parent = yaffs_find_or_create_by_number(obj->my_dev,
-+ cp->parent_id,
-+ YAFFS_OBJECT_TYPE_DIRECTORY);
-+ else
-+ parent = NULL;
-+
-+ if (parent) {
-+ if (parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ yaffs_trace(YAFFS_TRACE_ALWAYS,
-+ "Checkpoint read object %d parent %d type %d chunk %d Parent type, %d, not directory",
-+ cp->obj_id, cp->parent_id,
-+ cp->variant_type, cp->hdr_chunk,
-+ parent->variant_type);
-+ return 0;
-+ }
-+ yaffs_add_obj_to_dir(parent, obj);
-+ }
-+
-+ obj->hdr_chunk = cp->hdr_chunk;
-+ obj->variant_type = cp->variant_type;
-+ obj->deleted = cp->deleted;
-+ obj->soft_del = cp->soft_del;
-+ obj->unlinked = cp->unlinked;
-+ obj->fake = cp->fake;
-+ obj->rename_allowed = cp->rename_allowed;
-+ obj->unlink_allowed = cp->unlink_allowed;
-+ obj->serial = cp->serial;
-+ obj->n_data_chunks = cp->n_data_chunks;
-+
-+ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
-+ obj->variant.file_variant.file_size = cp->size_or_equiv_obj;
-+ else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK)
-+ obj->variant.hardlink_variant.equiv_id = cp->size_or_equiv_obj;
-+
-+ if (obj->hdr_chunk > 0)
-+ obj->lazy_loaded = 1;
-+ return 1;
-+}
-+
-+static int yaffs2_checkpt_tnode_worker(struct yaffs_obj *in,
-+ struct yaffs_tnode *tn, u32 level,
-+ int chunk_offset)
-+{
-+ int i;
-+ struct yaffs_dev *dev = in->my_dev;
-+ int ok = 1;
-+ u32 base_offset;
-+
-+ if (!tn)
-+ return 1;
-+
-+ if (level > 0) {
-+ for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
-+ if (!tn->internal[i])
-+ continue;
-+ ok = yaffs2_checkpt_tnode_worker(in,
-+ tn->internal[i],
-+ level - 1,
-+ (chunk_offset <<
-+ YAFFS_TNODES_INTERNAL_BITS) + i);
-+ }
-+ return ok;
-+ }
-+
-+ /* Level 0 tnode */
-+ base_offset = chunk_offset << YAFFS_TNODES_LEVEL0_BITS;
-+ ok = (yaffs2_checkpt_wr(dev, &base_offset, sizeof(base_offset)) ==
-+ sizeof(base_offset));
-+ if (ok)
-+ ok = (yaffs2_checkpt_wr(dev, tn, dev->tnode_size) ==
-+ dev->tnode_size);
-+
-+ return ok;
-+}
-+
-+static int yaffs2_wr_checkpt_tnodes(struct yaffs_obj *obj)
-+{
-+ u32 end_marker = ~0;
-+ int ok = 1;
-+
-+ if (obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
-+ return ok;
-+
-+ ok = yaffs2_checkpt_tnode_worker(obj,
-+ obj->variant.file_variant.top,
-+ obj->variant.file_variant.
-+ top_level, 0);
-+ if (ok)
-+ ok = (yaffs2_checkpt_wr(obj->my_dev, &end_marker,
-+ sizeof(end_marker)) == sizeof(end_marker));
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static int yaffs2_rd_checkpt_tnodes(struct yaffs_obj *obj)
-+{
-+ u32 base_chunk;
-+ int ok = 1;
-+ struct yaffs_dev *dev = obj->my_dev;
-+ struct yaffs_file_var *file_stuct_ptr = &obj->variant.file_variant;
-+ struct yaffs_tnode *tn;
-+ int nread = 0;
-+
-+ ok = (yaffs2_checkpt_rd(dev, &base_chunk, sizeof(base_chunk)) ==
-+ sizeof(base_chunk));
-+
-+ while (ok && (~base_chunk)) {
-+ nread++;
-+ /* Read level 0 tnode */
-+
-+ tn = yaffs_get_tnode(dev);
-+ if (tn)
-+ ok = (yaffs2_checkpt_rd(dev, tn, dev->tnode_size) ==
-+ dev->tnode_size);
-+ else
-+ ok = 0;
-+
-+ if (tn && ok)
-+ ok = yaffs_add_find_tnode_0(dev,
-+ file_stuct_ptr,
-+ base_chunk, tn) ? 1 : 0;
-+
-+ if (ok)
-+ ok = (yaffs2_checkpt_rd
-+ (dev, &base_chunk,
-+ sizeof(base_chunk)) == sizeof(base_chunk));
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "Checkpoint read tnodes %d records, last %d. ok %d",
-+ nread, base_chunk, ok);
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static int yaffs2_wr_checkpt_objs(struct yaffs_dev *dev)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_checkpt_obj cp;
-+ int i;
-+ int ok = 1;
-+ struct list_head *lh;
-+
-+ /* Iterate through the objects in each hash entry,
-+ * dumping them to the checkpointing stream.
-+ */
-+
-+ for (i = 0; ok && i < YAFFS_NOBJECT_BUCKETS; i++) {
-+ list_for_each(lh, &dev->obj_bucket[i].list) {
-+ obj = list_entry(lh, struct yaffs_obj, hash_link);
-+ if (!obj->defered_free) {
-+ yaffs2_obj_checkpt_obj(&cp, obj);
-+ cp.struct_type = sizeof(cp);
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "Checkpoint write object %d parent %d type %d chunk %d obj addr %p",
-+ cp.obj_id, cp.parent_id,
-+ cp.variant_type, cp.hdr_chunk, obj);
-+
-+ ok = (yaffs2_checkpt_wr(dev, &cp,
-+ sizeof(cp)) == sizeof(cp));
-+
-+ if (ok &&
-+ obj->variant_type ==
-+ YAFFS_OBJECT_TYPE_FILE)
-+ ok = yaffs2_wr_checkpt_tnodes(obj);
-+ }
-+ }
-+ }
-+
-+ /* Dump end of list */
-+ memset(&cp, 0xff, sizeof(struct yaffs_checkpt_obj));
-+ cp.struct_type = sizeof(cp);
-+
-+ if (ok)
-+ ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp));
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static int yaffs2_rd_checkpt_objs(struct yaffs_dev *dev)
-+{
-+ struct yaffs_obj *obj;
-+ struct yaffs_checkpt_obj cp;
-+ int ok = 1;
-+ int done = 0;
-+ LIST_HEAD(hard_list);
-+
-+
-+ while (ok && !done) {
-+ ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
-+ if (cp.struct_type != sizeof(cp)) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "struct size %d instead of %d ok %d",
-+ cp.struct_type, (int)sizeof(cp), ok);
-+ ok = 0;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "Checkpoint read object %d parent %d type %d chunk %d ",
-+ cp.obj_id, cp.parent_id, cp.variant_type,
-+ cp.hdr_chunk);
-+
-+ if (ok && cp.obj_id == ~0) {
-+ done = 1;
-+ } else if (ok) {
-+ obj =
-+ yaffs_find_or_create_by_number(dev, cp.obj_id,
-+ cp.variant_type);
-+ if (obj) {
-+ ok = yaffs2_checkpt_obj_to_obj(obj, &cp);
-+ if (!ok)
-+ break;
-+ if (obj->variant_type ==
-+ YAFFS_OBJECT_TYPE_FILE) {
-+ ok = yaffs2_rd_checkpt_tnodes(obj);
-+ } else if (obj->variant_type ==
-+ YAFFS_OBJECT_TYPE_HARDLINK) {
-+ list_add(&obj->hard_links, &hard_list);
-+ }
-+ } else {
-+ ok = 0;
-+ }
-+ }
-+ }
-+
-+ if (ok)
-+ yaffs_link_fixup(dev, &hard_list);
-+
-+ return ok ? 1 : 0;
-+}
-+
-+static int yaffs2_wr_checkpt_sum(struct yaffs_dev *dev)
-+{
-+ u32 checkpt_sum;
-+ int ok;
-+
-+ yaffs2_get_checkpt_sum(dev, &checkpt_sum);
-+
-+ ok = (yaffs2_checkpt_wr(dev, &checkpt_sum, sizeof(checkpt_sum)) ==
-+ sizeof(checkpt_sum));
-+
-+ if (!ok)
-+ return 0;
-+
-+ return 1;
-+}
-+
-+static int yaffs2_rd_checkpt_sum(struct yaffs_dev *dev)
-+{
-+ u32 checkpt_sum0;
-+ u32 checkpt_sum1;
-+ int ok;
-+
-+ yaffs2_get_checkpt_sum(dev, &checkpt_sum0);
-+
-+ ok = (yaffs2_checkpt_rd(dev, &checkpt_sum1, sizeof(checkpt_sum1)) ==
-+ sizeof(checkpt_sum1));
-+
-+ if (!ok)
-+ return 0;
-+
-+ if (checkpt_sum0 != checkpt_sum1)
-+ return 0;
-+
-+ return 1;
-+}
-+
-+static int yaffs2_wr_checkpt_data(struct yaffs_dev *dev)
-+{
-+ int ok = 1;
-+
-+ if (!yaffs2_checkpt_required(dev)) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "skipping checkpoint write");
-+ ok = 0;
-+ }
-+
-+ if (ok)
-+ ok = yaffs2_checkpt_open(dev, 1);
-+
-+ if (ok) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "write checkpoint validity");
-+ ok = yaffs2_wr_checkpt_validity_marker(dev, 1);
-+ }
-+ if (ok) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "write checkpoint device");
-+ ok = yaffs2_wr_checkpt_dev(dev);
-+ }
-+ if (ok) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "write checkpoint objects");
-+ ok = yaffs2_wr_checkpt_objs(dev);
-+ }
-+ if (ok) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "write checkpoint validity");
-+ ok = yaffs2_wr_checkpt_validity_marker(dev, 0);
-+ }
-+
-+ if (ok)
-+ ok = yaffs2_wr_checkpt_sum(dev);
-+
-+ if (!yaffs_checkpt_close(dev))
-+ ok = 0;
-+
-+ if (ok)
-+ dev->is_checkpointed = 1;
-+ else
-+ dev->is_checkpointed = 0;
-+
-+ return dev->is_checkpointed;
-+}
-+
-+static int yaffs2_rd_checkpt_data(struct yaffs_dev *dev)
-+{
-+ int ok = 1;
-+
-+ if (!dev->param.is_yaffs2)
-+ ok = 0;
-+
-+ if (ok && dev->param.skip_checkpt_rd) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "skipping checkpoint read");
-+ ok = 0;
-+ }
-+
-+ if (ok)
-+ ok = yaffs2_checkpt_open(dev, 0); /* open for read */
-+
-+ if (ok) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "read checkpoint validity");
-+ ok = yaffs2_rd_checkpt_validity_marker(dev, 1);
-+ }
-+ if (ok) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "read checkpoint device");
-+ ok = yaffs2_rd_checkpt_dev(dev);
-+ }
-+ if (ok) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "read checkpoint objects");
-+ ok = yaffs2_rd_checkpt_objs(dev);
-+ }
-+ if (ok) {
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "read checkpoint validity");
-+ ok = yaffs2_rd_checkpt_validity_marker(dev, 0);
-+ }
-+
-+ if (ok) {
-+ ok = yaffs2_rd_checkpt_sum(dev);
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "read checkpoint checksum %d", ok);
-+ }
-+
-+ if (!yaffs_checkpt_close(dev))
-+ ok = 0;
-+
-+ if (ok)
-+ dev->is_checkpointed = 1;
-+ else
-+ dev->is_checkpointed = 0;
-+
-+ return ok ? 1 : 0;
-+}
-+
-+void yaffs2_checkpt_invalidate(struct yaffs_dev *dev)
-+{
-+ if (dev->is_checkpointed || dev->blocks_in_checkpt > 0) {
-+ dev->is_checkpointed = 0;
-+ yaffs2_checkpt_invalidate_stream(dev);
-+ }
-+ if (dev->param.sb_dirty_fn)
-+ dev->param.sb_dirty_fn(dev);
-+}
-+
-+int yaffs_checkpoint_save(struct yaffs_dev *dev)
-+{
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "save entry: is_checkpointed %d",
-+ dev->is_checkpointed);
-+
-+ yaffs_verify_objects(dev);
-+ yaffs_verify_blocks(dev);
-+ yaffs_verify_free_chunks(dev);
-+
-+ if (!dev->is_checkpointed) {
-+ yaffs2_checkpt_invalidate(dev);
-+ yaffs2_wr_checkpt_data(dev);
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT | YAFFS_TRACE_MOUNT,
-+ "save exit: is_checkpointed %d",
-+ dev->is_checkpointed);
-+
-+ return dev->is_checkpointed;
-+}
-+
-+int yaffs2_checkpt_restore(struct yaffs_dev *dev)
-+{
-+ int retval;
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "restore entry: is_checkpointed %d",
-+ dev->is_checkpointed);
-+
-+ retval = yaffs2_rd_checkpt_data(dev);
-+
-+ if (dev->is_checkpointed) {
-+ yaffs_verify_objects(dev);
-+ yaffs_verify_blocks(dev);
-+ yaffs_verify_free_chunks(dev);
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-+ "restore exit: is_checkpointed %d",
-+ dev->is_checkpointed);
-+
-+ return retval;
-+}
-+
-+int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size)
-+{
-+ /* if new_size > old_file_size.
-+ * We're going to be writing a hole.
-+ * If the hole is small then write zeros otherwise write a start
-+ * of hole marker.
-+ */
-+ loff_t old_file_size;
-+ loff_t increase;
-+ int small_hole;
-+ int result = YAFFS_OK;
-+ struct yaffs_dev *dev = NULL;
-+ u8 *local_buffer = NULL;
-+ int small_increase_ok = 0;
-+
-+ if (!obj)
-+ return YAFFS_FAIL;
-+
-+ if (obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
-+ return YAFFS_FAIL;
-+
-+ dev = obj->my_dev;
-+
-+ /* Bail out if not yaffs2 mode */
-+ if (!dev->param.is_yaffs2)
-+ return YAFFS_OK;
-+
-+ old_file_size = obj->variant.file_variant.file_size;
-+
-+ if (new_size <= old_file_size)
-+ return YAFFS_OK;
-+
-+ increase = new_size - old_file_size;
-+
-+ if (increase < YAFFS_SMALL_HOLE_THRESHOLD * dev->data_bytes_per_chunk &&
-+ yaffs_check_alloc_available(dev, YAFFS_SMALL_HOLE_THRESHOLD + 1))
-+ small_hole = 1;
-+ else
-+ small_hole = 0;
-+
-+ if (small_hole)
-+ local_buffer = yaffs_get_temp_buffer(dev);
-+
-+ if (local_buffer) {
-+ /* fill hole with zero bytes */
-+ loff_t pos = old_file_size;
-+ int this_write;
-+ int written;
-+ memset(local_buffer, 0, dev->data_bytes_per_chunk);
-+ small_increase_ok = 1;
-+
-+ while (increase > 0 && small_increase_ok) {
-+ this_write = increase;
-+ if (this_write > dev->data_bytes_per_chunk)
-+ this_write = dev->data_bytes_per_chunk;
-+ written =
-+ yaffs_do_file_wr(obj, local_buffer, pos, this_write,
-+ 0);
-+ if (written == this_write) {
-+ pos += this_write;
-+ increase -= this_write;
-+ } else {
-+ small_increase_ok = 0;
-+ }
-+ }
-+
-+ yaffs_release_temp_buffer(dev, local_buffer);
-+
-+ /* If out of space then reverse any chunks we've added */
-+ if (!small_increase_ok)
-+ yaffs_resize_file_down(obj, old_file_size);
-+ }
-+
-+ if (!small_increase_ok &&
-+ obj->parent &&
-+ obj->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
-+ obj->parent->obj_id != YAFFS_OBJECTID_DELETED) {
-+ /* Write a hole start header with the old file size */
-+ yaffs_update_oh(obj, NULL, 0, 1, 0, NULL);
-+ }
-+
-+ return result;
-+}
-+
-+struct yaffs_block_index {
-+ int seq;
-+ int block;
-+};
-+
-+static int yaffs2_ybicmp(const void *a, const void *b)
-+{
-+ int aseq = ((struct yaffs_block_index *)a)->seq;
-+ int bseq = ((struct yaffs_block_index *)b)->seq;
-+ int ablock = ((struct yaffs_block_index *)a)->block;
-+ int bblock = ((struct yaffs_block_index *)b)->block;
-+
-+ if (aseq == bseq)
-+ return ablock - bblock;
-+
-+ return aseq - bseq;
-+}
-+
-+static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
-+ struct yaffs_block_info *bi,
-+ int blk, int chunk_in_block,
-+ int *found_chunks,
-+ u8 *chunk_data,
-+ struct list_head *hard_list,
-+ int summary_available)
-+{
-+ struct yaffs_obj_hdr *oh;
-+ struct yaffs_obj *in;
-+ struct yaffs_obj *parent;
-+ int equiv_id;
-+ loff_t file_size;
-+ int is_shrink;
-+ int is_unlinked;
-+ struct yaffs_ext_tags tags;
-+ int result;
-+ int alloc_failed = 0;
-+ int chunk = blk * dev->param.chunks_per_block + chunk_in_block;
-+ struct yaffs_file_var *file_var;
-+ struct yaffs_hardlink_var *hl_var;
-+ struct yaffs_symlink_var *sl_var;
-+
-+ if (summary_available) {
-+ result = yaffs_summary_fetch(dev, &tags, chunk_in_block);
-+ tags.seq_number = bi->seq_number;
-+ }
-+
-+ if (!summary_available || tags.obj_id == 0) {
-+ result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags);
-+ dev->tags_used++;
-+ } else {
-+ dev->summary_used++;
-+ }
-+
-+ /* Let's have a good look at this chunk... */
-+
-+ if (!tags.chunk_used) {
-+ /* An unassigned chunk in the block.
-+ * If there are used chunks after this one, then
-+ * it is a chunk that was skipped due to failing
-+ * the erased check. Just skip it so that it can
-+ * be deleted.
-+ * But, more typically, We get here when this is
-+ * an unallocated chunk and his means that
-+ * either the block is empty or this is the one
-+ * being allocated from
-+ */
-+
-+ if (*found_chunks) {
-+ /* This is a chunk that was skipped due
-+ * to failing the erased check */
-+ } else if (chunk_in_block == 0) {
-+ /* We're looking at the first chunk in
-+ * the block so the block is unused */
-+ bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
-+ dev->n_erased_blocks++;
-+ } else {
-+ if (bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN ||
-+ bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING) {
-+ if (dev->seq_number == bi->seq_number) {
-+ /* Allocating from this block*/
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ " Allocating from %d %d",
-+ blk, chunk_in_block);
-+
-+ bi->block_state =
-+ YAFFS_BLOCK_STATE_ALLOCATING;
-+ dev->alloc_block = blk;
-+ dev->alloc_page = chunk_in_block;
-+ dev->alloc_block_finder = blk;
-+ } else {
-+ /* This is a partially written block
-+ * that is not the current
-+ * allocation block.
-+ */
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ "Partially written block %d detected. gc will fix this.",
-+ blk);
-+ }
-+ }
-+ }
-+
-+ dev->n_free_chunks++;
-+
-+ } else if (tags.ecc_result ==
-+ YAFFS_ECC_RESULT_UNFIXED) {
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ " Unfixed ECC in chunk(%d:%d), chunk ignored",
-+ blk, chunk_in_block);
-+ dev->n_free_chunks++;
-+ } else if (tags.obj_id > YAFFS_MAX_OBJECT_ID ||
-+ tags.chunk_id > YAFFS_MAX_CHUNK_ID ||
-+ tags.obj_id == YAFFS_OBJECTID_SUMMARY ||
-+ (tags.chunk_id > 0 &&
-+ tags.n_bytes > dev->data_bytes_per_chunk) ||
-+ tags.seq_number != bi->seq_number) {
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ "Chunk (%d:%d) with bad tags:obj = %d, chunk_id = %d, n_bytes = %d, ignored",
-+ blk, chunk_in_block, tags.obj_id,
-+ tags.chunk_id, tags.n_bytes);
-+ dev->n_free_chunks++;
-+ } else if (tags.chunk_id > 0) {
-+ /* chunk_id > 0 so it is a data chunk... */
-+ loff_t endpos;
-+ loff_t chunk_base = (tags.chunk_id - 1) *
-+ dev->data_bytes_per_chunk;
-+
-+ *found_chunks = 1;
-+
-+ yaffs_set_chunk_bit(dev, blk, chunk_in_block);
-+ bi->pages_in_use++;
-+
-+ in = yaffs_find_or_create_by_number(dev,
-+ tags.obj_id,
-+ YAFFS_OBJECT_TYPE_FILE);
-+ if (!in)
-+ /* Out of memory */
-+ alloc_failed = 1;
-+
-+ if (in &&
-+ in->variant_type == YAFFS_OBJECT_TYPE_FILE &&
-+ chunk_base < in->variant.file_variant.shrink_size) {
-+ /* This has not been invalidated by
-+ * a resize */
-+ if (!yaffs_put_chunk_in_file(in, tags.chunk_id,
-+ chunk, -1))
-+ alloc_failed = 1;
-+
-+ /* File size is calculated by looking at
-+ * the data chunks if we have not
-+ * seen an object header yet.
-+ * Stop this practice once we find an
-+ * object header.
-+ */
-+ endpos = chunk_base + tags.n_bytes;
-+
-+ if (!in->valid &&
-+ in->variant.file_variant.scanned_size < endpos) {
-+ in->variant.file_variant.
-+ scanned_size = endpos;
-+ in->variant.file_variant.
-+ file_size = endpos;
-+ }
-+ } else if (in) {
-+ /* This chunk has been invalidated by a
-+ * resize, or a past file deletion
-+ * so delete the chunk*/
-+ yaffs_chunk_del(dev, chunk, 1, __LINE__);
-+ }
-+ } else {
-+ /* chunk_id == 0, so it is an ObjectHeader.
-+ * Thus, we read in the object header and make
-+ * the object
-+ */
-+ *found_chunks = 1;
-+
-+ yaffs_set_chunk_bit(dev, blk, chunk_in_block);
-+ bi->pages_in_use++;
-+
-+ oh = NULL;
-+ in = NULL;
-+
-+ if (tags.extra_available) {
-+ in = yaffs_find_or_create_by_number(dev,
-+ tags.obj_id,
-+ tags.extra_obj_type);
-+ if (!in)
-+ alloc_failed = 1;
-+ }
-+
-+ if (!in ||
-+ (!in->valid && dev->param.disable_lazy_load) ||
-+ tags.extra_shadows ||
-+ (!in->valid && (tags.obj_id == YAFFS_OBJECTID_ROOT ||
-+ tags.obj_id == YAFFS_OBJECTID_LOSTNFOUND))) {
-+
-+ /* If we don't have valid info then we
-+ * need to read the chunk
-+ * TODO In future we can probably defer
-+ * reading the chunk and living with
-+ * invalid data until needed.
-+ */
-+
-+ result = yaffs_rd_chunk_tags_nand(dev,
-+ chunk,
-+ chunk_data,
-+ NULL);
-+
-+ oh = (struct yaffs_obj_hdr *)chunk_data;
-+
-+ if (dev->param.inband_tags) {
-+ /* Fix up the header if they got
-+ * corrupted by inband tags */
-+ oh->shadows_obj =
-+ oh->inband_shadowed_obj_id;
-+ oh->is_shrink =
-+ oh->inband_is_shrink;
-+ }
-+
-+ if (!in) {
-+ in = yaffs_find_or_create_by_number(dev,
-+ tags.obj_id, oh->type);
-+ if (!in)
-+ alloc_failed = 1;
-+ }
-+ }
-+
-+ if (!in) {
-+ /* TODO Hoosterman we have a problem! */
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs tragedy: Could not make object for object %d at chunk %d during scan",
-+ tags.obj_id, chunk);
-+ return YAFFS_FAIL;
-+ }
-+
-+ if (in->valid) {
-+ /* We have already filled this one.
-+ * We have a duplicate that will be
-+ * discarded, but we first have to suck
-+ * out resize info if it is a file.
-+ */
-+ if ((in->variant_type == YAFFS_OBJECT_TYPE_FILE) &&
-+ ((oh && oh->type == YAFFS_OBJECT_TYPE_FILE) ||
-+ (tags.extra_available &&
-+ tags.extra_obj_type == YAFFS_OBJECT_TYPE_FILE)
-+ )) {
-+ loff_t this_size = (oh) ?
-+ yaffs_oh_to_size(oh) :
-+ tags.extra_file_size;
-+ u32 parent_obj_id = (oh) ?
-+ oh->parent_obj_id :
-+ tags.extra_parent_id;
-+
-+ is_shrink = (oh) ?
-+ oh->is_shrink :
-+ tags.extra_is_shrink;
-+
-+ /* If it is deleted (unlinked
-+ * at start also means deleted)
-+ * we treat the file size as
-+ * being zeroed at this point.
-+ */
-+ if (parent_obj_id == YAFFS_OBJECTID_DELETED ||
-+ parent_obj_id == YAFFS_OBJECTID_UNLINKED) {
-+ this_size = 0;
-+ is_shrink = 1;
-+ }
-+
-+ if (is_shrink &&
-+ in->variant.file_variant.shrink_size >
-+ this_size)
-+ in->variant.file_variant.shrink_size =
-+ this_size;
-+
-+ if (is_shrink)
-+ bi->has_shrink_hdr = 1;
-+ }
-+ /* Use existing - destroy this one. */
-+ yaffs_chunk_del(dev, chunk, 1, __LINE__);
-+ }
-+
-+ if (!in->valid && in->variant_type !=
-+ (oh ? oh->type : tags.extra_obj_type)) {
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs tragedy: Bad type, %d != %d, for object %d at chunk %d during scan",
-+ oh ? oh->type : tags.extra_obj_type,
-+ in->variant_type, tags.obj_id,
-+ chunk);
-+ in = yaffs_retype_obj(in, oh ? oh->type : tags.extra_obj_type);
-+ }
-+
-+ if (!in->valid &&
-+ (tags.obj_id == YAFFS_OBJECTID_ROOT ||
-+ tags.obj_id == YAFFS_OBJECTID_LOSTNFOUND)) {
-+ /* We only load some info, don't fiddle
-+ * with directory structure */
-+ in->valid = 1;
-+
-+ if (oh) {
-+ in->yst_mode = oh->yst_mode;
-+ yaffs_load_attribs(in, oh);
-+ in->lazy_loaded = 0;
-+ } else {
-+ in->lazy_loaded = 1;
-+ }
-+ in->hdr_chunk = chunk;
-+
-+ } else if (!in->valid) {
-+ /* we need to load this info */
-+ in->valid = 1;
-+ in->hdr_chunk = chunk;
-+ if (oh) {
-+ in->variant_type = oh->type;
-+ in->yst_mode = oh->yst_mode;
-+ yaffs_load_attribs(in, oh);
-+
-+ if (oh->shadows_obj > 0)
-+ yaffs_handle_shadowed_obj(dev,
-+ oh->shadows_obj, 1);
-+
-+ yaffs_set_obj_name_from_oh(in, oh);
-+ parent = yaffs_find_or_create_by_number(dev,
-+ oh->parent_obj_id,
-+ YAFFS_OBJECT_TYPE_DIRECTORY);
-+ file_size = yaffs_oh_to_size(oh);
-+ is_shrink = oh->is_shrink;
-+ equiv_id = oh->equiv_id;
-+ } else {
-+ in->variant_type = tags.extra_obj_type;
-+ parent = yaffs_find_or_create_by_number(dev,
-+ tags.extra_parent_id,
-+ YAFFS_OBJECT_TYPE_DIRECTORY);
-+ file_size = tags.extra_file_size;
-+ is_shrink = tags.extra_is_shrink;
-+ equiv_id = tags.extra_equiv_id;
-+ in->lazy_loaded = 1;
-+ }
-+ in->dirty = 0;
-+
-+ if (!parent)
-+ alloc_failed = 1;
-+
-+ /* directory stuff...
-+ * hook up to parent
-+ */
-+
-+ if (parent &&
-+ parent->variant_type == YAFFS_OBJECT_TYPE_UNKNOWN) {
-+ /* Set up as a directory */
-+ parent->variant_type =
-+ YAFFS_OBJECT_TYPE_DIRECTORY;
-+ INIT_LIST_HEAD(&parent->
-+ variant.dir_variant.children);
-+ } else if (!parent ||
-+ parent->variant_type !=
-+ YAFFS_OBJECT_TYPE_DIRECTORY) {
-+ /* Hoosterman, another problem....
-+ * Trying to use a non-directory as a directory
-+ */
-+
-+ yaffs_trace(YAFFS_TRACE_ERROR,
-+ "yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
-+ );
-+ parent = dev->lost_n_found;
-+ }
-+ yaffs_add_obj_to_dir(parent, in);
-+
-+ is_unlinked = (parent == dev->del_dir) ||
-+ (parent == dev->unlinked_dir);
-+
-+ if (is_shrink)
-+ /* Mark the block */
-+ bi->has_shrink_hdr = 1;
-+
-+ /* Note re hardlinks.
-+ * Since we might scan a hardlink before its equivalent
-+ * object is scanned we put them all in a list.
-+ * After scanning is complete, we should have all the
-+ * objects, so we run through this list and fix up all
-+ * the chains.
-+ */
-+
-+ switch (in->variant_type) {
-+ case YAFFS_OBJECT_TYPE_UNKNOWN:
-+ /* Todo got a problem */
-+ break;
-+ case YAFFS_OBJECT_TYPE_FILE:
-+ file_var = &in->variant.file_variant;
-+ if (file_var->scanned_size < file_size) {
-+ /* This covers the case where the file
-+ * size is greater than the data held.
-+ * This will happen if the file is
-+ * resized to be larger than its
-+ * current data extents.
-+ */
-+ file_var->file_size = file_size;
-+ file_var->scanned_size = file_size;
-+ }
-+
-+ if (file_var->shrink_size > file_size)
-+ file_var->shrink_size = file_size;
-+
-+ break;
-+ case YAFFS_OBJECT_TYPE_HARDLINK:
-+ hl_var = &in->variant.hardlink_variant;
-+ if (!is_unlinked) {
-+ hl_var->equiv_id = equiv_id;
-+ list_add(&in->hard_links, hard_list);
-+ }
-+ break;
-+ case YAFFS_OBJECT_TYPE_DIRECTORY:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SPECIAL:
-+ /* Do nothing */
-+ break;
-+ case YAFFS_OBJECT_TYPE_SYMLINK:
-+ sl_var = &in->variant.symlink_variant;
-+ if (oh) {
-+ sl_var->alias =
-+ yaffs_clone_str(oh->alias);
-+ if (!sl_var->alias)
-+ alloc_failed = 1;
-+ }
-+ break;
-+ }
-+ }
-+ }
-+ return alloc_failed ? YAFFS_FAIL : YAFFS_OK;
-+}
-+
-+int yaffs2_scan_backwards(struct yaffs_dev *dev)
-+{
-+ int blk;
-+ int block_iter;
-+ int start_iter;
-+ int end_iter;
-+ int n_to_scan = 0;
-+ enum yaffs_block_state state;
-+ int c;
-+ int deleted;
-+ LIST_HEAD(hard_list);
-+ struct yaffs_block_info *bi;
-+ u32 seq_number;
-+ int n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
-+ u8 *chunk_data;
-+ int found_chunks;
-+ int alloc_failed = 0;
-+ struct yaffs_block_index *block_index = NULL;
-+ int alt_block_index = 0;
-+ int summary_available;
-+
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ "yaffs2_scan_backwards starts intstartblk %d intendblk %d...",
-+ dev->internal_start_block, dev->internal_end_block);
-+
-+ dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
-+
-+ block_index =
-+ kmalloc(n_blocks * sizeof(struct yaffs_block_index), GFP_NOFS);
-+
-+ if (!block_index) {
-+ block_index =
-+ vmalloc(n_blocks * sizeof(struct yaffs_block_index));
-+ alt_block_index = 1;
-+ }
-+
-+ if (!block_index) {
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ "yaffs2_scan_backwards() could not allocate block index!"
-+ );
-+ return YAFFS_FAIL;
-+ }
-+
-+ dev->blocks_in_checkpt = 0;
-+
-+ chunk_data = yaffs_get_temp_buffer(dev);
-+
-+ /* Scan all the blocks to determine their state */
-+ bi = dev->block_info;
-+ for (blk = dev->internal_start_block; blk <= dev->internal_end_block;
-+ blk++) {
-+ yaffs_clear_chunk_bits(dev, blk);
-+ bi->pages_in_use = 0;
-+ bi->soft_del_pages = 0;
-+
-+ yaffs_query_init_block_state(dev, blk, &state, &seq_number);
-+
-+ bi->block_state = state;
-+ bi->seq_number = seq_number;
-+
-+ if (bi->seq_number == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+ bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+ if (bi->seq_number == YAFFS_SEQUENCE_BAD_BLOCK)
-+ bi->block_state = YAFFS_BLOCK_STATE_DEAD;
-+
-+ yaffs_trace(YAFFS_TRACE_SCAN_DEBUG,
-+ "Block scanning block %d state %d seq %d",
-+ blk, bi->block_state, seq_number);
-+
-+ if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+ dev->blocks_in_checkpt++;
-+
-+ } else if (bi->block_state == YAFFS_BLOCK_STATE_DEAD) {
-+ yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
-+ "block %d is bad", blk);
-+ } else if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
-+ yaffs_trace(YAFFS_TRACE_SCAN_DEBUG, "Block empty ");
-+ dev->n_erased_blocks++;
-+ dev->n_free_chunks += dev->param.chunks_per_block;
-+ } else if (bi->block_state ==
-+ YAFFS_BLOCK_STATE_NEEDS_SCAN) {
-+ /* Determine the highest sequence number */
-+ if (seq_number >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+ seq_number < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
-+ block_index[n_to_scan].seq = seq_number;
-+ block_index[n_to_scan].block = blk;
-+ n_to_scan++;
-+ if (seq_number >= dev->seq_number)
-+ dev->seq_number = seq_number;
-+ } else {
-+ /* TODO: Nasty sequence number! */
-+ yaffs_trace(YAFFS_TRACE_SCAN,
-+ "Block scanning block %d has bad sequence number %d",
-+ blk, seq_number);
-+ }
-+ }
-+ bi++;
-+ }
-+
-+ yaffs_trace(YAFFS_TRACE_ALWAYS, "%d blocks to be sorted...", n_to_scan);
-+
-+ cond_resched();
-+
-+ /* Sort the blocks by sequence number */
-+ sort(block_index, n_to_scan, sizeof(struct yaffs_block_index),
-+ yaffs2_ybicmp, NULL);
-+
-+ cond_resched();
-+
-+ yaffs_trace(YAFFS_TRACE_SCAN, "...done");
-+
-+ /* Now scan the blocks looking at the data. */
-+ start_iter = 0;
-+ end_iter = n_to_scan - 1;
-+ yaffs_trace(YAFFS_TRACE_SCAN_DEBUG, "%d blocks to scan", n_to_scan);
-+
-+ /* For each block.... backwards */
-+ for (block_iter = end_iter;
-+ !alloc_failed && block_iter >= start_iter;
-+ block_iter--) {
-+ /* Cooperative multitasking! This loop can run for so
-+ long that watchdog timers expire. */
-+ cond_resched();
-+
-+ /* get the block to scan in the correct order */
-+ blk = block_index[block_iter].block;
-+ bi = yaffs_get_block_info(dev, blk);
-+ deleted = 0;
-+
-+ summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);
-+
-+ /* For each chunk in each block that needs scanning.... */
-+ found_chunks = 0;
-+ if (summary_available)
-+ c = dev->chunks_per_summary - 1;
-+ else
-+ c = dev->param.chunks_per_block - 1;
-+
-+ for (/* c is already initialised */;
-+ !alloc_failed && c >= 0 &&
-+ (bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN ||
-+ bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING);
-+ c--) {
-+ /* Scan backwards...
-+ * Read the tags and decide what to do
-+ */
-+ if (yaffs2_scan_chunk(dev, bi, blk, c,
-+ &found_chunks, chunk_data,
-+ &hard_list, summary_available) ==
-+ YAFFS_FAIL)
-+ alloc_failed = 1;
-+ }
-+
-+ if (bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN) {
-+ /* If we got this far while scanning, then the block
-+ * is fully allocated. */
-+ bi->block_state = YAFFS_BLOCK_STATE_FULL;
-+ }
-+
-+ /* Now let's see if it was dirty */
-+ if (bi->pages_in_use == 0 &&
-+ !bi->has_shrink_hdr &&
-+ bi->block_state == YAFFS_BLOCK_STATE_FULL) {
-+ yaffs_block_became_dirty(dev, blk);
-+ }
-+ }
-+
-+ yaffs_skip_rest_of_block(dev);
-+
-+ if (alt_block_index)
-+ vfree(block_index);
-+ else
-+ kfree(block_index);
-+
-+ /* Ok, we've done all the scanning.
-+ * Fix up the hard link chains.
-+ * We have scanned all the objects, now it's time to add these
-+ * hardlinks.
-+ */
-+ yaffs_link_fixup(dev, &hard_list);
-+
-+ yaffs_release_temp_buffer(dev, chunk_data);
-+
-+ if (alloc_failed)
-+ return YAFFS_FAIL;
-+
-+ yaffs_trace(YAFFS_TRACE_SCAN, "yaffs2_scan_backwards ends");
-+
-+ return YAFFS_OK;
-+}
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yaffs_yaffs2.h linux-3.15-rc5/fs/yaffs2/yaffs_yaffs2.h
---- linux-3.15-rc5.orig/fs/yaffs2/yaffs_yaffs2.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yaffs_yaffs2.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,39 @@
-+/*
-+ * 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_YAFFS2_H__
-+#define __YAFFS_YAFFS2_H__
-+
-+#include "yaffs_guts.h"
-+
-+void yaffs_calc_oldest_dirty_seq(struct yaffs_dev *dev);
-+void yaffs2_find_oldest_dirty_seq(struct yaffs_dev *dev);
-+void yaffs2_clear_oldest_dirty_seq(struct yaffs_dev *dev,
-+ struct yaffs_block_info *bi);
-+void yaffs2_update_oldest_dirty_seq(struct yaffs_dev *dev, unsigned block_no,
-+ struct yaffs_block_info *bi);
-+int yaffs_block_ok_for_gc(struct yaffs_dev *dev, struct yaffs_block_info *bi);
-+u32 yaffs2_find_refresh_block(struct yaffs_dev *dev);
-+int yaffs2_checkpt_required(struct yaffs_dev *dev);
-+int yaffs_calc_checkpt_blocks_required(struct yaffs_dev *dev);
-+
-+void yaffs2_checkpt_invalidate(struct yaffs_dev *dev);
-+int yaffs2_checkpt_save(struct yaffs_dev *dev);
-+int yaffs2_checkpt_restore(struct yaffs_dev *dev);
-+
-+int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size);
-+int yaffs2_scan_backwards(struct yaffs_dev *dev);
-+
-+#endif
-diff -Nur linux-3.15-rc5.orig/fs/yaffs2/yportenv.h linux-3.15-rc5/fs/yaffs2/yportenv.h
---- linux-3.15-rc5.orig/fs/yaffs2/yportenv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc5/fs/yaffs2/yportenv.h 2014-05-17 01:53:27.000000000 +0200
-@@ -0,0 +1,85 @@
-+/*
-+ * 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 __YPORTENV_H__
-+#define __YPORTENV_H__
-+
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
-+#ifdef YAFFS_OUT_OF_TREE
-+#include "moduleconfig.h"
-+#endif
-+
-+#include <linux/version.h>
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
-+#include <linux/config.h>
-+#endif
-+#include <linux/version.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/sched.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/xattr.h>
-+#include <linux/list.h>
-+#include <linux/types.h>
-+#include <linux/fs.h>
-+#include <linux/stat.h>
-+#include <linux/sort.h>
-+#include <linux/bitops.h>
-+
-+/* These type wrappings are used to support Unicode names in WinCE. */
-+#define YCHAR char
-+#define YUCHAR unsigned char
-+#define _Y(x) x
-+
-+#define YAFFS_LOSTNFOUND_NAME "lost+found"
-+#define YAFFS_LOSTNFOUND_PREFIX "obj"
-+
-+
-+#define YAFFS_ROOT_MODE 0755
-+#define YAFFS_LOSTNFOUND_MODE 0700
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
-+#define Y_TIME_CONVERT(x) (x).tv_sec
-+#else
-+#define Y_CURRENT_TIME CURRENT_TIME
-+#define Y_TIME_CONVERT(x) (x)
-+#endif
-+
-+#define compile_time_assertion(assertion) \
-+ ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
-+
-+
-+#define yaffs_printf(msk, fmt, ...) \
-+ printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__)
-+
-+#define yaffs_trace(msk, fmt, ...) do { \
-+ if (yaffs_trace_mask & (msk)) \
-+ printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
-+} while (0)
-+
-+
-+#endif
diff --git a/target/linux/patches/3.15-rc7/ppc64-missing-zlib.patch b/target/linux/patches/3.15-rc7/ppc64-missing-zlib.patch
deleted file mode 100644
index c6e0616be..000000000
--- a/target/linux/patches/3.15-rc7/ppc64-missing-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-3.11.5.orig/arch/powerpc/platforms/pseries/Kconfig linux-3.11.5/arch/powerpc/platforms/pseries/Kconfig
---- linux-3.11.5.orig/arch/powerpc/platforms/pseries/Kconfig 2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/powerpc/platforms/pseries/Kconfig 2013-11-01 15:23:09.000000000 +0100
-@@ -17,6 +17,7 @@
- select PPC_NATIVE
- select PPC_PCI_CHOICE if EXPERT
- select ZLIB_DEFLATE
-+ select ZLIB_INFLATE
- select PPC_DOORBELL
- select HAVE_CONTEXT_TRACKING
- select HOTPLUG_CPU if SMP
diff --git a/target/linux/patches/3.15-rc7/relocs.patch b/target/linux/patches/3.15-rc7/relocs.patch
deleted file mode 100644
index 69a7c88a9..000000000
--- a/target/linux/patches/3.15-rc7/relocs.patch
+++ /dev/null
@@ -1,2709 +0,0 @@
-diff -Nur linux-3.13.6.orig/arch/x86/tools/relocs.c linux-3.13.6/arch/x86/tools/relocs.c
---- linux-3.13.6.orig/arch/x86/tools/relocs.c 2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/arch/x86/tools/relocs.c 2014-03-15 19:39:45.000000000 +0100
-@@ -126,6 +126,7 @@
-
- if (err) {
- regerror(err, &sym_regex_c[i], errbuf, sizeof errbuf);
-+ printf("foo: %s\n", sym_regex[i]);
- die("%s", errbuf);
- }
- }
-diff -Nur linux-3.13.6.orig/arch/x86/tools/relocs.h linux-3.13.6/arch/x86/tools/relocs.h
---- linux-3.13.6.orig/arch/x86/tools/relocs.h 2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/arch/x86/tools/relocs.h 2014-03-15 18:48:40.000000000 +0100
-@@ -9,11 +9,19 @@
- #include <string.h>
- #include <errno.h>
- #include <unistd.h>
-+#ifdef __linux__
- #include <elf.h>
- #include <byteswap.h>
- #define USE_BSD
- #include <endian.h>
-+#else
-+#include "elf.h"
-+#endif
-+#ifdef __APPLE__
-+#include <pcreposix.h>
-+#else
- #include <regex.h>
-+#endif
- #include <tools/le_byteshift.h>
-
- void die(char *fmt, ...);
-diff -Nur linux-3.13.6.orig/tools/include/elf.h linux-3.13.6/tools/include/elf.h
---- linux-3.13.6.orig/tools/include/elf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.13.6/tools/include/elf.h 2014-03-15 18:47:36.000000000 +0100
-@@ -0,0 +1,2671 @@
-+#ifndef _ELF_H
-+#define _ELF_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <stdint.h>
-+
-+typedef uint16_t Elf32_Half;
-+typedef uint16_t Elf64_Half;
-+
-+typedef uint32_t Elf32_Word;
-+typedef int32_t Elf32_Sword;
-+typedef uint32_t Elf64_Word;
-+typedef int32_t Elf64_Sword;
-+
-+typedef uint64_t Elf32_Xword;
-+typedef int64_t Elf32_Sxword;
-+typedef uint64_t Elf64_Xword;
-+typedef int64_t Elf64_Sxword;
-+
-+typedef uint32_t Elf32_Addr;
-+typedef uint64_t Elf64_Addr;
-+
-+typedef uint32_t Elf32_Off;
-+typedef uint64_t Elf64_Off;
-+
-+typedef uint16_t Elf32_Section;
-+typedef uint16_t Elf64_Section;
-+
-+typedef Elf32_Half Elf32_Versym;
-+typedef Elf64_Half Elf64_Versym;
-+
-+#define EI_NIDENT (16)
-+
-+typedef struct {
-+ unsigned char e_ident[EI_NIDENT];
-+ Elf32_Half e_type;
-+ Elf32_Half e_machine;
-+ Elf32_Word e_version;
-+ Elf32_Addr e_entry;
-+ Elf32_Off e_phoff;
-+ Elf32_Off e_shoff;
-+ Elf32_Word e_flags;
-+ Elf32_Half e_ehsize;
-+ Elf32_Half e_phentsize;
-+ Elf32_Half e_phnum;
-+ Elf32_Half e_shentsize;
-+ Elf32_Half e_shnum;
-+ Elf32_Half e_shstrndx;
-+} Elf32_Ehdr;
-+
-+typedef struct {
-+ unsigned char e_ident[EI_NIDENT];
-+ Elf64_Half e_type;
-+ Elf64_Half e_machine;
-+ Elf64_Word e_version;
-+ Elf64_Addr e_entry;
-+ Elf64_Off e_phoff;
-+ Elf64_Off e_shoff;
-+ Elf64_Word e_flags;
-+ Elf64_Half e_ehsize;
-+ Elf64_Half e_phentsize;
-+ Elf64_Half e_phnum;
-+ Elf64_Half e_shentsize;
-+ Elf64_Half e_shnum;
-+ Elf64_Half e_shstrndx;
-+} Elf64_Ehdr;
-+
-+#define EI_MAG0 0
-+#define ELFMAG0 0x7f
-+
-+#define EI_MAG1 1
-+#define ELFMAG1 'E'
-+
-+#define EI_MAG2 2
-+#define ELFMAG2 'L'
-+
-+#define EI_MAG3 3
-+#define ELFMAG3 'F'
-+
-+
-+#define ELFMAG "\177ELF"
-+#define SELFMAG 4
-+
-+#define EI_CLASS 4
-+#define ELFCLASSNONE 0
-+#define ELFCLASS32 1
-+#define ELFCLASS64 2
-+#define ELFCLASSNUM 3
-+
-+#define EI_DATA 5
-+#define ELFDATANONE 0
-+#define ELFDATA2LSB 1
-+#define ELFDATA2MSB 2
-+#define ELFDATANUM 3
-+
-+#define EI_VERSION 6
-+
-+
-+#define EI_OSABI 7
-+#define ELFOSABI_NONE 0
-+#define ELFOSABI_SYSV 0
-+#define ELFOSABI_HPUX 1
-+#define ELFOSABI_NETBSD 2
-+#define ELFOSABI_LINUX 3
-+#define ELFOSABI_GNU 3
-+#define ELFOSABI_SOLARIS 6
-+#define ELFOSABI_AIX 7
-+#define ELFOSABI_IRIX 8
-+#define ELFOSABI_FREEBSD 9
-+#define ELFOSABI_TRU64 10
-+#define ELFOSABI_MODESTO 11
-+#define ELFOSABI_OPENBSD 12
-+#define ELFOSABI_ARM 97
-+#define ELFOSABI_STANDALONE 255
-+
-+#define EI_ABIVERSION 8
-+
-+#define EI_PAD 9
-+
-+
-+
-+#define ET_NONE 0
-+#define ET_REL 1
-+#define ET_EXEC 2
-+#define ET_DYN 3
-+#define ET_CORE 4
-+#define ET_NUM 5
-+#define ET_LOOS 0xfe00
-+#define ET_HIOS 0xfeff
-+#define ET_LOPROC 0xff00
-+#define ET_HIPROC 0xffff
-+
-+
-+
-+#define EM_NONE 0
-+#define EM_M32 1
-+#define EM_SPARC 2
-+#define EM_386 3
-+#define EM_68K 4
-+#define EM_88K 5
-+#define EM_860 7
-+#define EM_MIPS 8
-+#define EM_S370 9
-+#define EM_MIPS_RS3_LE 10
-+
-+#define EM_PARISC 15
-+#define EM_VPP500 17
-+#define EM_SPARC32PLUS 18
-+#define EM_960 19
-+#define EM_PPC 20
-+#define EM_PPC64 21
-+#define EM_S390 22
-+
-+#define EM_V800 36
-+#define EM_FR20 37
-+#define EM_RH32 38
-+#define EM_RCE 39
-+#define EM_ARM 40
-+#define EM_FAKE_ALPHA 41
-+#define EM_SH 42
-+#define EM_SPARCV9 43
-+#define EM_TRICORE 44
-+#define EM_ARC 45
-+#define EM_H8_300 46
-+#define EM_H8_300H 47
-+#define EM_H8S 48
-+#define EM_H8_500 49
-+#define EM_IA_64 50
-+#define EM_MIPS_X 51
-+#define EM_COLDFIRE 52
-+#define EM_68HC12 53
-+#define EM_MMA 54
-+#define EM_PCP 55
-+#define EM_NCPU 56
-+#define EM_NDR1 57
-+#define EM_STARCORE 58
-+#define EM_ME16 59
-+#define EM_ST100 60
-+#define EM_TINYJ 61
-+#define EM_X86_64 62
-+#define EM_PDSP 63
-+
-+#define EM_FX66 66
-+#define EM_ST9PLUS 67
-+#define EM_ST7 68
-+#define EM_68HC16 69
-+#define EM_68HC11 70
-+#define EM_68HC08 71
-+#define EM_68HC05 72
-+#define EM_SVX 73
-+#define EM_ST19 74
-+#define EM_VAX 75
-+#define EM_CRIS 76
-+#define EM_JAVELIN 77
-+#define EM_FIREPATH 78
-+#define EM_ZSP 79
-+#define EM_MMIX 80
-+#define EM_HUANY 81
-+#define EM_PRISM 82
-+#define EM_AVR 83
-+#define EM_FR30 84
-+#define EM_D10V 85
-+#define EM_D30V 86
-+#define EM_V850 87
-+#define EM_M32R 88
-+#define EM_MN10300 89
-+#define EM_MN10200 90
-+#define EM_PJ 91
-+#define EM_OPENRISC 92
-+#define EM_ARC_A5 93
-+#define EM_XTENSA 94
-+#define EM_AARCH64 183
-+#define EM_TILEPRO 188
-+#define EM_MICROBLAZE 189
-+#define EM_TILEGX 191
-+#define EM_NUM 192
-+#define EM_ALPHA 0x9026
-+
-+#define EV_NONE 0
-+#define EV_CURRENT 1
-+#define EV_NUM 2
-+
-+typedef struct {
-+ Elf32_Word sh_name;
-+ Elf32_Word sh_type;
-+ Elf32_Word sh_flags;
-+ Elf32_Addr sh_addr;
-+ Elf32_Off sh_offset;
-+ Elf32_Word sh_size;
-+ Elf32_Word sh_link;
-+ Elf32_Word sh_info;
-+ Elf32_Word sh_addralign;
-+ Elf32_Word sh_entsize;
-+} Elf32_Shdr;
-+
-+typedef struct {
-+ Elf64_Word sh_name;
-+ Elf64_Word sh_type;
-+ Elf64_Xword sh_flags;
-+ Elf64_Addr sh_addr;
-+ Elf64_Off sh_offset;
-+ Elf64_Xword sh_size;
-+ Elf64_Word sh_link;
-+ Elf64_Word sh_info;
-+ Elf64_Xword sh_addralign;
-+ Elf64_Xword sh_entsize;
-+} Elf64_Shdr;
-+
-+
-+
-+#define SHN_UNDEF 0
-+#define SHN_LORESERVE 0xff00
-+#define SHN_LOPROC 0xff00
-+#define SHN_BEFORE 0xff00
-+
-+#define SHN_AFTER 0xff01
-+
-+#define SHN_HIPROC 0xff1f
-+#define SHN_LOOS 0xff20
-+#define SHN_HIOS 0xff3f
-+#define SHN_ABS 0xfff1
-+#define SHN_COMMON 0xfff2
-+#define SHN_XINDEX 0xffff
-+#define SHN_HIRESERVE 0xffff
-+
-+
-+
-+#define SHT_NULL 0
-+#define SHT_PROGBITS 1
-+#define SHT_SYMTAB 2
-+#define SHT_STRTAB 3
-+#define SHT_RELA 4
-+#define SHT_HASH 5
-+#define SHT_DYNAMIC 6
-+#define SHT_NOTE 7
-+#define SHT_NOBITS 8
-+#define SHT_REL 9
-+#define SHT_SHLIB 10
-+#define SHT_DYNSYM 11
-+#define SHT_INIT_ARRAY 14
-+#define SHT_FINI_ARRAY 15
-+#define SHT_PREINIT_ARRAY 16
-+#define SHT_GROUP 17
-+#define SHT_SYMTAB_SHNDX 18
-+#define SHT_NUM 19
-+#define SHT_LOOS 0x60000000
-+#define SHT_GNU_ATTRIBUTES 0x6ffffff5
-+#define SHT_GNU_HASH 0x6ffffff6
-+#define SHT_GNU_LIBLIST 0x6ffffff7
-+#define SHT_CHECKSUM 0x6ffffff8
-+#define SHT_LOSUNW 0x6ffffffa
-+#define SHT_SUNW_move 0x6ffffffa
-+#define SHT_SUNW_COMDAT 0x6ffffffb
-+#define SHT_SUNW_syminfo 0x6ffffffc
-+#define SHT_GNU_verdef 0x6ffffffd
-+#define SHT_GNU_verneed 0x6ffffffe
-+#define SHT_GNU_versym 0x6fffffff
-+#define SHT_HISUNW 0x6fffffff
-+#define SHT_HIOS 0x6fffffff
-+#define SHT_LOPROC 0x70000000
-+#define SHT_HIPROC 0x7fffffff
-+#define SHT_LOUSER 0x80000000
-+#define SHT_HIUSER 0x8fffffff
-+
-+#define SHF_WRITE (1 << 0)
-+#define SHF_ALLOC (1 << 1)
-+#define SHF_EXECINSTR (1 << 2)
-+#define SHF_MERGE (1 << 4)
-+#define SHF_STRINGS (1 << 5)
-+#define SHF_INFO_LINK (1 << 6)
-+#define SHF_LINK_ORDER (1 << 7)
-+#define SHF_OS_NONCONFORMING (1 << 8)
-+
-+#define SHF_GROUP (1 << 9)
-+#define SHF_TLS (1 << 10)
-+#define SHF_MASKOS 0x0ff00000
-+#define SHF_MASKPROC 0xf0000000
-+#define SHF_ORDERED (1 << 30)
-+#define SHF_EXCLUDE (1 << 31)
-+
-+#define GRP_COMDAT 0x1
-+
-+typedef struct {
-+ Elf32_Word st_name;
-+ Elf32_Addr st_value;
-+ Elf32_Word st_size;
-+ unsigned char st_info;
-+ unsigned char st_other;
-+ Elf32_Section st_shndx;
-+} Elf32_Sym;
-+
-+typedef struct {
-+ Elf64_Word st_name;
-+ unsigned char st_info;
-+ unsigned char st_other;
-+ Elf64_Section st_shndx;
-+ Elf64_Addr st_value;
-+ Elf64_Xword st_size;
-+} Elf64_Sym;
-+
-+typedef struct {
-+ Elf32_Half si_boundto;
-+ Elf32_Half si_flags;
-+} Elf32_Syminfo;
-+
-+typedef struct {
-+ Elf64_Half si_boundto;
-+ Elf64_Half si_flags;
-+} Elf64_Syminfo;
-+
-+#define SYMINFO_BT_SELF 0xffff
-+#define SYMINFO_BT_PARENT 0xfffe
-+#define SYMINFO_BT_LOWRESERVE 0xff00
-+
-+#define SYMINFO_FLG_DIRECT 0x0001
-+#define SYMINFO_FLG_PASSTHRU 0x0002
-+#define SYMINFO_FLG_COPY 0x0004
-+#define SYMINFO_FLG_LAZYLOAD 0x0008
-+
-+#define SYMINFO_NONE 0
-+#define SYMINFO_CURRENT 1
-+#define SYMINFO_NUM 2
-+
-+#define ELF32_ST_BIND(val) (((unsigned char) (val)) >> 4)
-+#define ELF32_ST_TYPE(val) ((val) & 0xf)
-+#define ELF32_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf))
-+
-+#define ELF64_ST_BIND(val) ELF32_ST_BIND (val)
-+#define ELF64_ST_TYPE(val) ELF32_ST_TYPE (val)
-+#define ELF64_ST_INFO(bind, type) ELF32_ST_INFO ((bind), (type))
-+
-+#define STB_LOCAL 0
-+#define STB_GLOBAL 1
-+#define STB_WEAK 2
-+#define STB_NUM 3
-+#define STB_LOOS 10
-+#define STB_GNU_UNIQUE 10
-+#define STB_HIOS 12
-+#define STB_LOPROC 13
-+#define STB_HIPROC 15
-+
-+#define STT_NOTYPE 0
-+#define STT_OBJECT 1
-+#define STT_FUNC 2
-+#define STT_SECTION 3
-+#define STT_FILE 4
-+#define STT_COMMON 5
-+#define STT_TLS 6
-+#define STT_NUM 7
-+#define STT_LOOS 10
-+#define STT_GNU_IFUNC 10
-+#define STT_HIOS 12
-+#define STT_LOPROC 13
-+#define STT_HIPROC 15
-+
-+#define STN_UNDEF 0
-+
-+#define ELF32_ST_VISIBILITY(o) ((o) & 0x03)
-+#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o)
-+
-+#define STV_DEFAULT 0
-+#define STV_INTERNAL 1
-+#define STV_HIDDEN 2
-+#define STV_PROTECTED 3
-+
-+
-+
-+
-+typedef struct
-+{
-+ Elf32_Addr r_offset;
-+ Elf32_Word r_info;
-+} Elf32_Rel;
-+
-+typedef struct {
-+ Elf64_Addr r_offset;
-+ Elf64_Xword r_info;
-+} Elf64_Rel;
-+
-+
-+
-+typedef struct {
-+ Elf32_Addr r_offset;
-+ Elf32_Word r_info;
-+ Elf32_Sword r_addend;
-+} Elf32_Rela;
-+
-+typedef struct {
-+ Elf64_Addr r_offset;
-+ Elf64_Xword r_info;
-+ Elf64_Sxword r_addend;
-+} Elf64_Rela;
-+
-+
-+
-+#define ELF32_R_SYM(val) ((val) >> 8)
-+#define ELF32_R_TYPE(val) ((val) & 0xff)
-+#define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type) & 0xff))
-+
-+#define ELF64_R_SYM(i) ((i) >> 32)
-+#define ELF64_R_TYPE(i) ((i) & 0xffffffff)
-+#define ELF64_R_INFO(sym,type) ((((Elf64_Xword) (sym)) << 32) + (type))
-+
-+
-+
-+typedef struct {
-+ Elf32_Word p_type;
-+ Elf32_Off p_offset;
-+ Elf32_Addr p_vaddr;
-+ Elf32_Addr p_paddr;
-+ Elf32_Word p_filesz;
-+ Elf32_Word p_memsz;
-+ Elf32_Word p_flags;
-+ Elf32_Word p_align;
-+} Elf32_Phdr;
-+
-+typedef struct {
-+ Elf64_Word p_type;
-+ Elf64_Word p_flags;
-+ Elf64_Off p_offset;
-+ Elf64_Addr p_vaddr;
-+ Elf64_Addr p_paddr;
-+ Elf64_Xword p_filesz;
-+ Elf64_Xword p_memsz;
-+ Elf64_Xword p_align;
-+} Elf64_Phdr;
-+
-+
-+
-+#define PT_NULL 0
-+#define PT_LOAD 1
-+#define PT_DYNAMIC 2
-+#define PT_INTERP 3
-+#define PT_NOTE 4
-+#define PT_SHLIB 5
-+#define PT_PHDR 6
-+#define PT_TLS 7
-+#define PT_NUM 8
-+#define PT_LOOS 0x60000000
-+#define PT_GNU_EH_FRAME 0x6474e550
-+#define PT_GNU_STACK 0x6474e551
-+#define PT_GNU_RELRO 0x6474e552
-+#define PT_LOSUNW 0x6ffffffa
-+#define PT_SUNWBSS 0x6ffffffa
-+#define PT_SUNWSTACK 0x6ffffffb
-+#define PT_HISUNW 0x6fffffff
-+#define PT_HIOS 0x6fffffff
-+#define PT_LOPROC 0x70000000
-+#define PT_HIPROC 0x7fffffff
-+
-+
-+#define PN_XNUM 0xffff
-+
-+
-+#define PF_X (1 << 0)
-+#define PF_W (1 << 1)
-+#define PF_R (1 << 2)
-+#define PF_MASKOS 0x0ff00000
-+#define PF_MASKPROC 0xf0000000
-+
-+
-+
-+#define NT_PRSTATUS 1
-+#define NT_FPREGSET 2
-+#define NT_PRPSINFO 3
-+#define NT_PRXREG 4
-+#define NT_TASKSTRUCT 4
-+#define NT_PLATFORM 5
-+#define NT_AUXV 6
-+#define NT_GWINDOWS 7
-+#define NT_ASRS 8
-+#define NT_PSTATUS 10
-+#define NT_PSINFO 13
-+#define NT_PRCRED 14
-+#define NT_UTSNAME 15
-+#define NT_LWPSTATUS 16
-+#define NT_LWPSINFO 17
-+#define NT_PRFPXREG 20
-+#define NT_SIGINFO 0x53494749
-+#define NT_FILE 0x46494c45
-+#define NT_PRXFPREG 0x46e62b7f
-+#define NT_PPC_VMX 0x100
-+#define NT_PPC_SPE 0x101
-+#define NT_PPC_VSX 0x102
-+#define NT_386_TLS 0x200
-+#define NT_386_IOPERM 0x201
-+#define NT_X86_XSTATE 0x202
-+#define NT_S390_HIGH_GPRS 0x300
-+#define NT_S390_TIMER 0x301
-+#define NT_S390_TODCMP 0x302
-+#define NT_S390_TODPREG 0x303
-+#define NT_S390_CTRS 0x304
-+#define NT_S390_PREFIX 0x305
-+#define NT_S390_LAST_BREAK 0x306
-+#define NT_S390_SYSTEM_CALL 0x307
-+#define NT_S390_TDB 0x308
-+#define NT_ARM_VFP 0x400
-+#define NT_ARM_TLS 0x401
-+#define NT_ARM_HW_BREAK 0x402
-+#define NT_ARM_HW_WATCH 0x403
-+#define NT_METAG_CBUF 0x500
-+#define NT_METAG_RPIPE 0x501
-+#define NT_METAG_TLS 0x502
-+#define NT_VERSION 1
-+
-+
-+
-+
-+typedef struct {
-+ Elf32_Sword d_tag;
-+ union {
-+ Elf32_Word d_val;
-+ Elf32_Addr d_ptr;
-+ } d_un;
-+} Elf32_Dyn;
-+
-+typedef struct {
-+ Elf64_Sxword d_tag;
-+ union {
-+ Elf64_Xword d_val;
-+ Elf64_Addr d_ptr;
-+ } d_un;
-+} Elf64_Dyn;
-+
-+
-+
-+#define DT_NULL 0
-+#define DT_NEEDED 1
-+#define DT_PLTRELSZ 2
-+#define DT_PLTGOT 3
-+#define DT_HASH 4
-+#define DT_STRTAB 5
-+#define DT_SYMTAB 6
-+#define DT_RELA 7
-+#define DT_RELASZ 8
-+#define DT_RELAENT 9
-+#define DT_STRSZ 10
-+#define DT_SYMENT 11
-+#define DT_INIT 12
-+#define DT_FINI 13
-+#define DT_SONAME 14
-+#define DT_RPATH 15
-+#define DT_SYMBOLIC 16
-+#define DT_REL 17
-+#define DT_RELSZ 18
-+#define DT_RELENT 19
-+#define DT_PLTREL 20
-+#define DT_DEBUG 21
-+#define DT_TEXTREL 22
-+#define DT_JMPREL 23
-+#define DT_BIND_NOW 24
-+#define DT_INIT_ARRAY 25
-+#define DT_FINI_ARRAY 26
-+#define DT_INIT_ARRAYSZ 27
-+#define DT_FINI_ARRAYSZ 28
-+#define DT_RUNPATH 29
-+#define DT_FLAGS 30
-+#define DT_ENCODING 32
-+#define DT_PREINIT_ARRAY 32
-+#define DT_PREINIT_ARRAYSZ 33
-+#define DT_NUM 34
-+#define DT_LOOS 0x6000000d
-+#define DT_HIOS 0x6ffff000
-+#define DT_LOPROC 0x70000000
-+#define DT_HIPROC 0x7fffffff
-+#define DT_PROCNUM DT_MIPS_NUM
-+
-+#define DT_VALRNGLO 0x6ffffd00
-+#define DT_GNU_PRELINKED 0x6ffffdf5
-+#define DT_GNU_CONFLICTSZ 0x6ffffdf6
-+#define DT_GNU_LIBLISTSZ 0x6ffffdf7
-+#define DT_CHECKSUM 0x6ffffdf8
-+#define DT_PLTPADSZ 0x6ffffdf9
-+#define DT_MOVEENT 0x6ffffdfa
-+#define DT_MOVESZ 0x6ffffdfb
-+#define DT_FEATURE_1 0x6ffffdfc
-+#define DT_POSFLAG_1 0x6ffffdfd
-+
-+#define DT_SYMINSZ 0x6ffffdfe
-+#define DT_SYMINENT 0x6ffffdff
-+#define DT_VALRNGHI 0x6ffffdff
-+#define DT_VALTAGIDX(tag) (DT_VALRNGHI - (tag))
-+#define DT_VALNUM 12
-+
-+#define DT_ADDRRNGLO 0x6ffffe00
-+#define DT_GNU_HASH 0x6ffffef5
-+#define DT_TLSDESC_PLT 0x6ffffef6
-+#define DT_TLSDESC_GOT 0x6ffffef7
-+#define DT_GNU_CONFLICT 0x6ffffef8
-+#define DT_GNU_LIBLIST 0x6ffffef9
-+#define DT_CONFIG 0x6ffffefa
-+#define DT_DEPAUDIT 0x6ffffefb
-+#define DT_AUDIT 0x6ffffefc
-+#define DT_PLTPAD 0x6ffffefd
-+#define DT_MOVETAB 0x6ffffefe
-+#define DT_SYMINFO 0x6ffffeff
-+#define DT_ADDRRNGHI 0x6ffffeff
-+#define DT_ADDRTAGIDX(tag) (DT_ADDRRNGHI - (tag))
-+#define DT_ADDRNUM 11
-+
-+
-+
-+#define DT_VERSYM 0x6ffffff0
-+
-+#define DT_RELACOUNT 0x6ffffff9
-+#define DT_RELCOUNT 0x6ffffffa
-+
-+
-+#define DT_FLAGS_1 0x6ffffffb
-+#define DT_VERDEF 0x6ffffffc
-+
-+#define DT_VERDEFNUM 0x6ffffffd
-+#define DT_VERNEED 0x6ffffffe
-+
-+#define DT_VERNEEDNUM 0x6fffffff
-+#define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag))
-+#define DT_VERSIONTAGNUM 16
-+
-+
-+
-+#define DT_AUXILIARY 0x7ffffffd
-+#define DT_FILTER 0x7fffffff
-+#define DT_EXTRATAGIDX(tag) ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-+#define DT_EXTRANUM 3
-+
-+
-+#define DF_ORIGIN 0x00000001
-+#define DF_SYMBOLIC 0x00000002
-+#define DF_TEXTREL 0x00000004
-+#define DF_BIND_NOW 0x00000008
-+#define DF_STATIC_TLS 0x00000010
-+
-+
-+
-+#define DF_1_NOW 0x00000001
-+#define DF_1_GLOBAL 0x00000002
-+#define DF_1_GROUP 0x00000004
-+#define DF_1_NODELETE 0x00000008
-+#define DF_1_LOADFLTR 0x00000010
-+#define DF_1_INITFIRST 0x00000020
-+#define DF_1_NOOPEN 0x00000040
-+#define DF_1_ORIGIN 0x00000080
-+#define DF_1_DIRECT 0x00000100
-+#define DF_1_TRANS 0x00000200
-+#define DF_1_INTERPOSE 0x00000400
-+#define DF_1_NODEFLIB 0x00000800
-+#define DF_1_NODUMP 0x00001000
-+#define DF_1_CONFALT 0x00002000
-+#define DF_1_ENDFILTEE 0x00004000
-+#define DF_1_DISPRELDNE 0x00008000
-+#define DF_1_DISPRELPND 0x00010000
-+#define DF_1_NODIRECT 0x00020000
-+#define DF_1_IGNMULDEF 0x00040000
-+#define DF_1_NOKSYMS 0x00080000
-+#define DF_1_NOHDR 0x00100000
-+#define DF_1_EDITED 0x00200000
-+#define DF_1_NORELOC 0x00400000
-+#define DF_1_SYMINTPOSE 0x00800000
-+#define DF_1_GLOBAUDIT 0x01000000
-+#define DF_1_SINGLETON 0x02000000
-+
-+#define DTF_1_PARINIT 0x00000001
-+#define DTF_1_CONFEXP 0x00000002
-+
-+
-+#define DF_P1_LAZYLOAD 0x00000001
-+#define DF_P1_GROUPPERM 0x00000002
-+
-+
-+
-+
-+typedef struct {
-+ Elf32_Half vd_version;
-+ Elf32_Half vd_flags;
-+ Elf32_Half vd_ndx;
-+ Elf32_Half vd_cnt;
-+ Elf32_Word vd_hash;
-+ Elf32_Word vd_aux;
-+ Elf32_Word vd_next;
-+} Elf32_Verdef;
-+
-+typedef struct {
-+ Elf64_Half vd_version;
-+ Elf64_Half vd_flags;
-+ Elf64_Half vd_ndx;
-+ Elf64_Half vd_cnt;
-+ Elf64_Word vd_hash;
-+ Elf64_Word vd_aux;
-+ Elf64_Word vd_next;
-+} Elf64_Verdef;
-+
-+
-+
-+#define VER_DEF_NONE 0
-+#define VER_DEF_CURRENT 1
-+#define VER_DEF_NUM 2
-+
-+
-+#define VER_FLG_BASE 0x1
-+#define VER_FLG_WEAK 0x2
-+
-+
-+#define VER_NDX_LOCAL 0
-+#define VER_NDX_GLOBAL 1
-+#define VER_NDX_LORESERVE 0xff00
-+#define VER_NDX_ELIMINATE 0xff01
-+
-+
-+
-+typedef struct {
-+ Elf32_Word vda_name;
-+ Elf32_Word vda_next;
-+} Elf32_Verdaux;
-+
-+typedef struct {
-+ Elf64_Word vda_name;
-+ Elf64_Word vda_next;
-+} Elf64_Verdaux;
-+
-+
-+
-+
-+typedef struct {
-+ Elf32_Half vn_version;
-+ Elf32_Half vn_cnt;
-+ Elf32_Word vn_file;
-+ Elf32_Word vn_aux;
-+ Elf32_Word vn_next;
-+} Elf32_Verneed;
-+
-+typedef struct {
-+ Elf64_Half vn_version;
-+ Elf64_Half vn_cnt;
-+ Elf64_Word vn_file;
-+ Elf64_Word vn_aux;
-+ Elf64_Word vn_next;
-+} Elf64_Verneed;
-+
-+
-+
-+#define VER_NEED_NONE 0
-+#define VER_NEED_CURRENT 1
-+#define VER_NEED_NUM 2
-+
-+
-+
-+typedef struct {
-+ Elf32_Word vna_hash;
-+ Elf32_Half vna_flags;
-+ Elf32_Half vna_other;
-+ Elf32_Word vna_name;
-+ Elf32_Word vna_next;
-+} Elf32_Vernaux;
-+
-+typedef struct {
-+ Elf64_Word vna_hash;
-+ Elf64_Half vna_flags;
-+ Elf64_Half vna_other;
-+ Elf64_Word vna_name;
-+ Elf64_Word vna_next;
-+} Elf64_Vernaux;
-+
-+
-+
-+#define VER_FLG_WEAK 0x2
-+
-+
-+
-+typedef struct {
-+ uint32_t a_type;
-+ union {
-+ uint32_t a_val;
-+ } a_un;
-+} Elf32_auxv_t;
-+
-+typedef struct {
-+ uint64_t a_type;
-+ union {
-+ uint64_t a_val;
-+ } a_un;
-+} Elf64_auxv_t;
-+
-+
-+
-+#define AT_NULL 0
-+#define AT_IGNORE 1
-+#define AT_EXECFD 2
-+#define AT_PHDR 3
-+#define AT_PHENT 4
-+#define AT_PHNUM 5
-+#define AT_PAGESZ 6
-+#define AT_BASE 7
-+#define AT_FLAGS 8
-+#define AT_ENTRY 9
-+#define AT_NOTELF 10
-+#define AT_UID 11
-+#define AT_EUID 12
-+#define AT_GID 13
-+#define AT_EGID 14
-+#define AT_CLKTCK 17
-+
-+
-+#define AT_PLATFORM 15
-+#define AT_HWCAP 16
-+
-+
-+
-+
-+#define AT_FPUCW 18
-+
-+
-+#define AT_DCACHEBSIZE 19
-+#define AT_ICACHEBSIZE 20
-+#define AT_UCACHEBSIZE 21
-+
-+
-+
-+#define AT_IGNOREPPC 22
-+
-+#define AT_SECURE 23
-+
-+#define AT_BASE_PLATFORM 24
-+
-+#define AT_RANDOM 25
-+
-+#define AT_HWCAP2 26
-+
-+#define AT_EXECFN 31
-+
-+
-+
-+#define AT_SYSINFO 32
-+#define AT_SYSINFO_EHDR 33
-+
-+
-+
-+#define AT_L1I_CACHESHAPE 34
-+#define AT_L1D_CACHESHAPE 35
-+#define AT_L2_CACHESHAPE 36
-+#define AT_L3_CACHESHAPE 37
-+
-+
-+
-+
-+typedef struct {
-+ Elf32_Word n_namesz;
-+ Elf32_Word n_descsz;
-+ Elf32_Word n_type;
-+} Elf32_Nhdr;
-+
-+typedef struct {
-+ Elf64_Word n_namesz;
-+ Elf64_Word n_descsz;
-+ Elf64_Word n_type;
-+} Elf64_Nhdr;
-+
-+
-+
-+
-+#define ELF_NOTE_SOLARIS "SUNW Solaris"
-+
-+
-+#define ELF_NOTE_GNU "GNU"
-+
-+
-+
-+
-+
-+#define ELF_NOTE_PAGESIZE_HINT 1
-+
-+
-+#define NT_GNU_ABI_TAG 1
-+#define ELF_NOTE_ABI NT_GNU_ABI_TAG
-+
-+
-+
-+#define ELF_NOTE_OS_LINUX 0
-+#define ELF_NOTE_OS_GNU 1
-+#define ELF_NOTE_OS_SOLARIS2 2
-+#define ELF_NOTE_OS_FREEBSD 3
-+
-+#define NT_GNU_BUILD_ID 3
-+#define NT_GNU_GOLD_VERSION 4
-+
-+
-+
-+typedef struct {
-+ Elf32_Xword m_value;
-+ Elf32_Word m_info;
-+ Elf32_Word m_poffset;
-+ Elf32_Half m_repeat;
-+ Elf32_Half m_stride;
-+} Elf32_Move;
-+
-+typedef struct {
-+ Elf64_Xword m_value;
-+ Elf64_Xword m_info;
-+ Elf64_Xword m_poffset;
-+ Elf64_Half m_repeat;
-+ Elf64_Half m_stride;
-+} Elf64_Move;
-+
-+
-+#define ELF32_M_SYM(info) ((info) >> 8)
-+#define ELF32_M_SIZE(info) ((unsigned char) (info))
-+#define ELF32_M_INFO(sym, size) (((sym) << 8) + (unsigned char) (size))
-+
-+#define ELF64_M_SYM(info) ELF32_M_SYM (info)
-+#define ELF64_M_SIZE(info) ELF32_M_SIZE (info)
-+#define ELF64_M_INFO(sym, size) ELF32_M_INFO (sym, size)
-+
-+#define EF_CPU32 0x00810000
-+
-+#define R_68K_NONE 0
-+#define R_68K_32 1
-+#define R_68K_16 2
-+#define R_68K_8 3
-+#define R_68K_PC32 4
-+#define R_68K_PC16 5
-+#define R_68K_PC8 6
-+#define R_68K_GOT32 7
-+#define R_68K_GOT16 8
-+#define R_68K_GOT8 9
-+#define R_68K_GOT32O 10
-+#define R_68K_GOT16O 11
-+#define R_68K_GOT8O 12
-+#define R_68K_PLT32 13
-+#define R_68K_PLT16 14
-+#define R_68K_PLT8 15
-+#define R_68K_PLT32O 16
-+#define R_68K_PLT16O 17
-+#define R_68K_PLT8O 18
-+#define R_68K_COPY 19
-+#define R_68K_GLOB_DAT 20
-+#define R_68K_JMP_SLOT 21
-+#define R_68K_RELATIVE 22
-+#define R_68K_NUM 23
-+
-+#define R_386_NONE 0
-+#define R_386_32 1
-+#define R_386_PC32 2
-+#define R_386_GOT32 3
-+#define R_386_PLT32 4
-+#define R_386_COPY 5
-+#define R_386_GLOB_DAT 6
-+#define R_386_JMP_SLOT 7
-+#define R_386_RELATIVE 8
-+#define R_386_GOTOFF 9
-+#define R_386_GOTPC 10
-+#define R_386_32PLT 11
-+#define R_386_TLS_TPOFF 14
-+#define R_386_TLS_IE 15
-+#define R_386_TLS_GOTIE 16
-+#define R_386_TLS_LE 17
-+#define R_386_TLS_GD 18
-+#define R_386_TLS_LDM 19
-+#define R_386_16 20
-+#define R_386_PC16 21
-+#define R_386_8 22
-+#define R_386_PC8 23
-+#define R_386_TLS_GD_32 24
-+#define R_386_TLS_GD_PUSH 25
-+#define R_386_TLS_GD_CALL 26
-+#define R_386_TLS_GD_POP 27
-+#define R_386_TLS_LDM_32 28
-+#define R_386_TLS_LDM_PUSH 29
-+#define R_386_TLS_LDM_CALL 30
-+#define R_386_TLS_LDM_POP 31
-+#define R_386_TLS_LDO_32 32
-+#define R_386_TLS_IE_32 33
-+#define R_386_TLS_LE_32 34
-+#define R_386_TLS_DTPMOD32 35
-+#define R_386_TLS_DTPOFF32 36
-+#define R_386_TLS_TPOFF32 37
-+#define R_386_SIZE32 38
-+#define R_386_TLS_GOTDESC 39
-+#define R_386_TLS_DESC_CALL 40
-+#define R_386_TLS_DESC 41
-+#define R_386_IRELATIVE 42
-+#define R_386_NUM 43
-+
-+
-+
-+
-+
-+#define STT_SPARC_REGISTER 13
-+
-+
-+
-+#define EF_SPARCV9_MM 3
-+#define EF_SPARCV9_TSO 0
-+#define EF_SPARCV9_PSO 1
-+#define EF_SPARCV9_RMO 2
-+#define EF_SPARC_LEDATA 0x800000
-+#define EF_SPARC_EXT_MASK 0xFFFF00
-+#define EF_SPARC_32PLUS 0x000100
-+#define EF_SPARC_SUN_US1 0x000200
-+#define EF_SPARC_HAL_R1 0x000400
-+#define EF_SPARC_SUN_US3 0x000800
-+
-+
-+
-+#define R_SPARC_NONE 0
-+#define R_SPARC_8 1
-+#define R_SPARC_16 2
-+#define R_SPARC_32 3
-+#define R_SPARC_DISP8 4
-+#define R_SPARC_DISP16 5
-+#define R_SPARC_DISP32 6
-+#define R_SPARC_WDISP30 7
-+#define R_SPARC_WDISP22 8
-+#define R_SPARC_HI22 9
-+#define R_SPARC_22 10
-+#define R_SPARC_13 11
-+#define R_SPARC_LO10 12
-+#define R_SPARC_GOT10 13
-+#define R_SPARC_GOT13 14
-+#define R_SPARC_GOT22 15
-+#define R_SPARC_PC10 16
-+#define R_SPARC_PC22 17
-+#define R_SPARC_WPLT30 18
-+#define R_SPARC_COPY 19
-+#define R_SPARC_GLOB_DAT 20
-+#define R_SPARC_JMP_SLOT 21
-+#define R_SPARC_RELATIVE 22
-+#define R_SPARC_UA32 23
-+
-+
-+
-+#define R_SPARC_PLT32 24
-+#define R_SPARC_HIPLT22 25
-+#define R_SPARC_LOPLT10 26
-+#define R_SPARC_PCPLT32 27
-+#define R_SPARC_PCPLT22 28
-+#define R_SPARC_PCPLT10 29
-+#define R_SPARC_10 30
-+#define R_SPARC_11 31
-+#define R_SPARC_64 32
-+#define R_SPARC_OLO10 33
-+#define R_SPARC_HH22 34
-+#define R_SPARC_HM10 35
-+#define R_SPARC_LM22 36
-+#define R_SPARC_PC_HH22 37
-+#define R_SPARC_PC_HM10 38
-+#define R_SPARC_PC_LM22 39
-+#define R_SPARC_WDISP16 40
-+#define R_SPARC_WDISP19 41
-+#define R_SPARC_GLOB_JMP 42
-+#define R_SPARC_7 43
-+#define R_SPARC_5 44
-+#define R_SPARC_6 45
-+#define R_SPARC_DISP64 46
-+#define R_SPARC_PLT64 47
-+#define R_SPARC_HIX22 48
-+#define R_SPARC_LOX10 49
-+#define R_SPARC_H44 50
-+#define R_SPARC_M44 51
-+#define R_SPARC_L44 52
-+#define R_SPARC_REGISTER 53
-+#define R_SPARC_UA64 54
-+#define R_SPARC_UA16 55
-+#define R_SPARC_TLS_GD_HI22 56
-+#define R_SPARC_TLS_GD_LO10 57
-+#define R_SPARC_TLS_GD_ADD 58
-+#define R_SPARC_TLS_GD_CALL 59
-+#define R_SPARC_TLS_LDM_HI22 60
-+#define R_SPARC_TLS_LDM_LO10 61
-+#define R_SPARC_TLS_LDM_ADD 62
-+#define R_SPARC_TLS_LDM_CALL 63
-+#define R_SPARC_TLS_LDO_HIX22 64
-+#define R_SPARC_TLS_LDO_LOX10 65
-+#define R_SPARC_TLS_LDO_ADD 66
-+#define R_SPARC_TLS_IE_HI22 67
-+#define R_SPARC_TLS_IE_LO10 68
-+#define R_SPARC_TLS_IE_LD 69
-+#define R_SPARC_TLS_IE_LDX 70
-+#define R_SPARC_TLS_IE_ADD 71
-+#define R_SPARC_TLS_LE_HIX22 72
-+#define R_SPARC_TLS_LE_LOX10 73
-+#define R_SPARC_TLS_DTPMOD32 74
-+#define R_SPARC_TLS_DTPMOD64 75
-+#define R_SPARC_TLS_DTPOFF32 76
-+#define R_SPARC_TLS_DTPOFF64 77
-+#define R_SPARC_TLS_TPOFF32 78
-+#define R_SPARC_TLS_TPOFF64 79
-+#define R_SPARC_GOTDATA_HIX22 80
-+#define R_SPARC_GOTDATA_LOX10 81
-+#define R_SPARC_GOTDATA_OP_HIX22 82
-+#define R_SPARC_GOTDATA_OP_LOX10 83
-+#define R_SPARC_GOTDATA_OP 84
-+#define R_SPARC_H34 85
-+#define R_SPARC_SIZE32 86
-+#define R_SPARC_SIZE64 87
-+#define R_SPARC_GNU_VTINHERIT 250
-+#define R_SPARC_GNU_VTENTRY 251
-+#define R_SPARC_REV32 252
-+
-+#define R_SPARC_NUM 253
-+
-+
-+
-+#define DT_SPARC_REGISTER 0x70000001
-+#define DT_SPARC_NUM 2
-+
-+
-+#define EF_MIPS_NOREORDER 1
-+#define EF_MIPS_PIC 2
-+#define EF_MIPS_CPIC 4
-+#define EF_MIPS_XGOT 8
-+#define EF_MIPS_64BIT_WHIRL 16
-+#define EF_MIPS_ABI2 32
-+#define EF_MIPS_ABI_ON32 64
-+#define EF_MIPS_ARCH 0xf0000000
-+
-+
-+
-+#define EF_MIPS_ARCH_1 0x00000000
-+#define EF_MIPS_ARCH_2 0x10000000
-+#define EF_MIPS_ARCH_3 0x20000000
-+#define EF_MIPS_ARCH_4 0x30000000
-+#define EF_MIPS_ARCH_5 0x40000000
-+#define EF_MIPS_ARCH_32 0x50000000
-+#define EF_MIPS_ARCH_64 0x60000000
-+#define EF_MIPS_ARCH_32R2 0x70000000
-+#define EF_MIPS_ARCH_64R2 0x80000000
-+
-+
-+#define E_MIPS_ARCH_1 0x00000000
-+#define E_MIPS_ARCH_2 0x10000000
-+#define E_MIPS_ARCH_3 0x20000000
-+#define E_MIPS_ARCH_4 0x30000000
-+#define E_MIPS_ARCH_5 0x40000000
-+#define E_MIPS_ARCH_32 0x50000000
-+#define E_MIPS_ARCH_64 0x60000000
-+
-+
-+
-+#define SHN_MIPS_ACOMMON 0xff00
-+#define SHN_MIPS_TEXT 0xff01
-+#define SHN_MIPS_DATA 0xff02
-+#define SHN_MIPS_SCOMMON 0xff03
-+#define SHN_MIPS_SUNDEFINED 0xff04
-+
-+
-+
-+#define SHT_MIPS_LIBLIST 0x70000000
-+#define SHT_MIPS_MSYM 0x70000001
-+#define SHT_MIPS_CONFLICT 0x70000002
-+#define SHT_MIPS_GPTAB 0x70000003
-+#define SHT_MIPS_UCODE 0x70000004
-+#define SHT_MIPS_DEBUG 0x70000005
-+#define SHT_MIPS_REGINFO 0x70000006
-+#define SHT_MIPS_PACKAGE 0x70000007
-+#define SHT_MIPS_PACKSYM 0x70000008
-+#define SHT_MIPS_RELD 0x70000009
-+#define SHT_MIPS_IFACE 0x7000000b
-+#define SHT_MIPS_CONTENT 0x7000000c
-+#define SHT_MIPS_OPTIONS 0x7000000d
-+#define SHT_MIPS_SHDR 0x70000010
-+#define SHT_MIPS_FDESC 0x70000011
-+#define SHT_MIPS_EXTSYM 0x70000012
-+#define SHT_MIPS_DENSE 0x70000013
-+#define SHT_MIPS_PDESC 0x70000014
-+#define SHT_MIPS_LOCSYM 0x70000015
-+#define SHT_MIPS_AUXSYM 0x70000016
-+#define SHT_MIPS_OPTSYM 0x70000017
-+#define SHT_MIPS_LOCSTR 0x70000018
-+#define SHT_MIPS_LINE 0x70000019
-+#define SHT_MIPS_RFDESC 0x7000001a
-+#define SHT_MIPS_DELTASYM 0x7000001b
-+#define SHT_MIPS_DELTAINST 0x7000001c
-+#define SHT_MIPS_DELTACLASS 0x7000001d
-+#define SHT_MIPS_DWARF 0x7000001e
-+#define SHT_MIPS_DELTADECL 0x7000001f
-+#define SHT_MIPS_SYMBOL_LIB 0x70000020
-+#define SHT_MIPS_EVENTS 0x70000021
-+#define SHT_MIPS_TRANSLATE 0x70000022
-+#define SHT_MIPS_PIXIE 0x70000023
-+#define SHT_MIPS_XLATE 0x70000024
-+#define SHT_MIPS_XLATE_DEBUG 0x70000025
-+#define SHT_MIPS_WHIRL 0x70000026
-+#define SHT_MIPS_EH_REGION 0x70000027
-+#define SHT_MIPS_XLATE_OLD 0x70000028
-+#define SHT_MIPS_PDR_EXCEPTION 0x70000029
-+
-+
-+
-+#define SHF_MIPS_GPREL 0x10000000
-+#define SHF_MIPS_MERGE 0x20000000
-+#define SHF_MIPS_ADDR 0x40000000
-+#define SHF_MIPS_STRINGS 0x80000000
-+#define SHF_MIPS_NOSTRIP 0x08000000
-+#define SHF_MIPS_LOCAL 0x04000000
-+#define SHF_MIPS_NAMES 0x02000000
-+#define SHF_MIPS_NODUPE 0x01000000
-+
-+
-+
-+
-+
-+#define STO_MIPS_DEFAULT 0x0
-+#define STO_MIPS_INTERNAL 0x1
-+#define STO_MIPS_HIDDEN 0x2
-+#define STO_MIPS_PROTECTED 0x3
-+#define STO_MIPS_PLT 0x8
-+#define STO_MIPS_SC_ALIGN_UNUSED 0xff
-+
-+
-+#define STB_MIPS_SPLIT_COMMON 13
-+
-+
-+
-+typedef union {
-+ struct {
-+ Elf32_Word gt_current_g_value;
-+ Elf32_Word gt_unused;
-+ } gt_header;
-+ struct {
-+ Elf32_Word gt_g_value;
-+ Elf32_Word gt_bytes;
-+ } gt_entry;
-+} Elf32_gptab;
-+
-+
-+
-+typedef struct {
-+ Elf32_Word ri_gprmask;
-+ Elf32_Word ri_cprmask[4];
-+ Elf32_Sword ri_gp_value;
-+} Elf32_RegInfo;
-+
-+
-+
-+typedef struct {
-+ unsigned char kind;
-+
-+ unsigned char size;
-+ Elf32_Section section;
-+
-+ Elf32_Word info;
-+} Elf_Options;
-+
-+
-+
-+#define ODK_NULL 0
-+#define ODK_REGINFO 1
-+#define ODK_EXCEPTIONS 2
-+#define ODK_PAD 3
-+#define ODK_HWPATCH 4
-+#define ODK_FILL 5
-+#define ODK_TAGS 6
-+#define ODK_HWAND 7
-+#define ODK_HWOR 8
-+
-+
-+
-+#define OEX_FPU_MIN 0x1f
-+#define OEX_FPU_MAX 0x1f00
-+#define OEX_PAGE0 0x10000
-+#define OEX_SMM 0x20000
-+#define OEX_FPDBUG 0x40000
-+#define OEX_PRECISEFP OEX_FPDBUG
-+#define OEX_DISMISS 0x80000
-+
-+#define OEX_FPU_INVAL 0x10
-+#define OEX_FPU_DIV0 0x08
-+#define OEX_FPU_OFLO 0x04
-+#define OEX_FPU_UFLO 0x02
-+#define OEX_FPU_INEX 0x01
-+
-+
-+
-+#define OHW_R4KEOP 0x1
-+#define OHW_R8KPFETCH 0x2
-+#define OHW_R5KEOP 0x4
-+#define OHW_R5KCVTL 0x8
-+
-+#define OPAD_PREFIX 0x1
-+#define OPAD_POSTFIX 0x2
-+#define OPAD_SYMBOL 0x4
-+
-+
-+
-+typedef struct {
-+ Elf32_Word hwp_flags1;
-+ Elf32_Word hwp_flags2;
-+} Elf_Options_Hw;
-+
-+
-+
-+#define OHWA0_R4KEOP_CHECKED 0x00000001
-+#define OHWA1_R4KEOP_CLEAN 0x00000002
-+
-+
-+
-+#define R_MIPS_NONE 0
-+#define R_MIPS_16 1
-+#define R_MIPS_32 2
-+#define R_MIPS_REL32 3
-+#define R_MIPS_26 4
-+#define R_MIPS_HI16 5
-+#define R_MIPS_LO16 6
-+#define R_MIPS_GPREL16 7
-+#define R_MIPS_LITERAL 8
-+#define R_MIPS_GOT16 9
-+#define R_MIPS_PC16 10
-+#define R_MIPS_CALL16 11
-+#define R_MIPS_GPREL32 12
-+
-+#define R_MIPS_SHIFT5 16
-+#define R_MIPS_SHIFT6 17
-+#define R_MIPS_64 18
-+#define R_MIPS_GOT_DISP 19
-+#define R_MIPS_GOT_PAGE 20
-+#define R_MIPS_GOT_OFST 21
-+#define R_MIPS_GOT_HI16 22
-+#define R_MIPS_GOT_LO16 23
-+#define R_MIPS_SUB 24
-+#define R_MIPS_INSERT_A 25
-+#define R_MIPS_INSERT_B 26
-+#define R_MIPS_DELETE 27
-+#define R_MIPS_HIGHER 28
-+#define R_MIPS_HIGHEST 29
-+#define R_MIPS_CALL_HI16 30
-+#define R_MIPS_CALL_LO16 31
-+#define R_MIPS_SCN_DISP 32
-+#define R_MIPS_REL16 33
-+#define R_MIPS_ADD_IMMEDIATE 34
-+#define R_MIPS_PJUMP 35
-+#define R_MIPS_RELGOT 36
-+#define R_MIPS_JALR 37
-+#define R_MIPS_TLS_DTPMOD32 38
-+#define R_MIPS_TLS_DTPREL32 39
-+#define R_MIPS_TLS_DTPMOD64 40
-+#define R_MIPS_TLS_DTPREL64 41
-+#define R_MIPS_TLS_GD 42
-+#define R_MIPS_TLS_LDM 43
-+#define R_MIPS_TLS_DTPREL_HI16 44
-+#define R_MIPS_TLS_DTPREL_LO16 45
-+#define R_MIPS_TLS_GOTTPREL 46
-+#define R_MIPS_TLS_TPREL32 47
-+#define R_MIPS_TLS_TPREL64 48
-+#define R_MIPS_TLS_TPREL_HI16 49
-+#define R_MIPS_TLS_TPREL_LO16 50
-+#define R_MIPS_GLOB_DAT 51
-+#define R_MIPS_COPY 126
-+#define R_MIPS_JUMP_SLOT 127
-+
-+#define R_MIPS_NUM 128
-+
-+
-+
-+#define PT_MIPS_REGINFO 0x70000000
-+#define PT_MIPS_RTPROC 0x70000001
-+#define PT_MIPS_OPTIONS 0x70000002
-+
-+
-+
-+#define PF_MIPS_LOCAL 0x10000000
-+
-+
-+
-+#define DT_MIPS_RLD_VERSION 0x70000001
-+#define DT_MIPS_TIME_STAMP 0x70000002
-+#define DT_MIPS_ICHECKSUM 0x70000003
-+#define DT_MIPS_IVERSION 0x70000004
-+#define DT_MIPS_FLAGS 0x70000005
-+#define DT_MIPS_BASE_ADDRESS 0x70000006
-+#define DT_MIPS_MSYM 0x70000007
-+#define DT_MIPS_CONFLICT 0x70000008
-+#define DT_MIPS_LIBLIST 0x70000009
-+#define DT_MIPS_LOCAL_GOTNO 0x7000000a
-+#define DT_MIPS_CONFLICTNO 0x7000000b
-+#define DT_MIPS_LIBLISTNO 0x70000010
-+#define DT_MIPS_SYMTABNO 0x70000011
-+#define DT_MIPS_UNREFEXTNO 0x70000012
-+#define DT_MIPS_GOTSYM 0x70000013
-+#define DT_MIPS_HIPAGENO 0x70000014
-+#define DT_MIPS_RLD_MAP 0x70000016
-+#define DT_MIPS_DELTA_CLASS 0x70000017
-+#define DT_MIPS_DELTA_CLASS_NO 0x70000018
-+
-+#define DT_MIPS_DELTA_INSTANCE 0x70000019
-+#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a
-+
-+#define DT_MIPS_DELTA_RELOC 0x7000001b
-+#define DT_MIPS_DELTA_RELOC_NO 0x7000001c
-+
-+#define DT_MIPS_DELTA_SYM 0x7000001d
-+
-+#define DT_MIPS_DELTA_SYM_NO 0x7000001e
-+
-+#define DT_MIPS_DELTA_CLASSSYM 0x70000020
-+
-+#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021
-+
-+#define DT_MIPS_CXX_FLAGS 0x70000022
-+#define DT_MIPS_PIXIE_INIT 0x70000023
-+#define DT_MIPS_SYMBOL_LIB 0x70000024
-+#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
-+#define DT_MIPS_LOCAL_GOTIDX 0x70000026
-+#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
-+#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
-+#define DT_MIPS_OPTIONS 0x70000029
-+#define DT_MIPS_INTERFACE 0x7000002a
-+#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
-+#define DT_MIPS_INTERFACE_SIZE 0x7000002c
-+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d
-+
-+#define DT_MIPS_PERF_SUFFIX 0x7000002e
-+
-+#define DT_MIPS_COMPACT_SIZE 0x7000002f
-+#define DT_MIPS_GP_VALUE 0x70000030
-+#define DT_MIPS_AUX_DYNAMIC 0x70000031
-+
-+#define DT_MIPS_PLTGOT 0x70000032
-+
-+#define DT_MIPS_RWPLT 0x70000034
-+#define DT_MIPS_NUM 0x35
-+
-+
-+
-+#define RHF_NONE 0
-+#define RHF_QUICKSTART (1 << 0)
-+#define RHF_NOTPOT (1 << 1)
-+#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)
-+#define RHF_NO_MOVE (1 << 3)
-+#define RHF_SGI_ONLY (1 << 4)
-+#define RHF_GUARANTEE_INIT (1 << 5)
-+#define RHF_DELTA_C_PLUS_PLUS (1 << 6)
-+#define RHF_GUARANTEE_START_INIT (1 << 7)
-+#define RHF_PIXIE (1 << 8)
-+#define RHF_DEFAULT_DELAY_LOAD (1 << 9)
-+#define RHF_REQUICKSTART (1 << 10)
-+#define RHF_REQUICKSTARTED (1 << 11)
-+#define RHF_CORD (1 << 12)
-+#define RHF_NO_UNRES_UNDEF (1 << 13)
-+#define RHF_RLD_ORDER_SAFE (1 << 14)
-+
-+
-+
-+typedef struct
-+{
-+ Elf32_Word l_name;
-+ Elf32_Word l_time_stamp;
-+ Elf32_Word l_checksum;
-+ Elf32_Word l_version;
-+ Elf32_Word l_flags;
-+} Elf32_Lib;
-+
-+typedef struct
-+{
-+ Elf64_Word l_name;
-+ Elf64_Word l_time_stamp;
-+ Elf64_Word l_checksum;
-+ Elf64_Word l_version;
-+ Elf64_Word l_flags;
-+} Elf64_Lib;
-+
-+
-+
-+
-+#define LL_NONE 0
-+#define LL_EXACT_MATCH (1 << 0)
-+#define LL_IGNORE_INT_VER (1 << 1)
-+#define LL_REQUIRE_MINOR (1 << 2)
-+#define LL_EXPORTS (1 << 3)
-+#define LL_DELAY_LOAD (1 << 4)
-+#define LL_DELTA (1 << 5)
-+
-+
-+
-+typedef Elf32_Addr Elf32_Conflict;
-+
-+
-+
-+
-+
-+
-+#define EF_PARISC_TRAPNIL 0x00010000
-+#define EF_PARISC_EXT 0x00020000
-+#define EF_PARISC_LSB 0x00040000
-+#define EF_PARISC_WIDE 0x00080000
-+#define EF_PARISC_NO_KABP 0x00100000
-+
-+#define EF_PARISC_LAZYSWAP 0x00400000
-+#define EF_PARISC_ARCH 0x0000ffff
-+
-+
-+
-+#define EFA_PARISC_1_0 0x020b
-+#define EFA_PARISC_1_1 0x0210
-+#define EFA_PARISC_2_0 0x0214
-+
-+
-+
-+#define SHN_PARISC_ANSI_COMMON 0xff00
-+
-+#define SHN_PARISC_HUGE_COMMON 0xff01
-+
-+
-+
-+#define SHT_PARISC_EXT 0x70000000
-+#define SHT_PARISC_UNWIND 0x70000001
-+#define SHT_PARISC_DOC 0x70000002
-+
-+
-+
-+#define SHF_PARISC_SHORT 0x20000000
-+#define SHF_PARISC_HUGE 0x40000000
-+#define SHF_PARISC_SBP 0x80000000
-+
-+
-+
-+#define STT_PARISC_MILLICODE 13
-+
-+#define STT_HP_OPAQUE (STT_LOOS + 0x1)
-+#define STT_HP_STUB (STT_LOOS + 0x2)
-+
-+
-+
-+#define R_PARISC_NONE 0
-+#define R_PARISC_DIR32 1
-+#define R_PARISC_DIR21L 2
-+#define R_PARISC_DIR17R 3
-+#define R_PARISC_DIR17F 4
-+#define R_PARISC_DIR14R 6
-+#define R_PARISC_PCREL32 9
-+#define R_PARISC_PCREL21L 10
-+#define R_PARISC_PCREL17R 11
-+#define R_PARISC_PCREL17F 12
-+#define R_PARISC_PCREL14R 14
-+#define R_PARISC_DPREL21L 18
-+#define R_PARISC_DPREL14R 22
-+#define R_PARISC_GPREL21L 26
-+#define R_PARISC_GPREL14R 30
-+#define R_PARISC_LTOFF21L 34
-+#define R_PARISC_LTOFF14R 38
-+#define R_PARISC_SECREL32 41
-+#define R_PARISC_SEGBASE 48
-+#define R_PARISC_SEGREL32 49
-+#define R_PARISC_PLTOFF21L 50
-+#define R_PARISC_PLTOFF14R 54
-+#define R_PARISC_LTOFF_FPTR32 57
-+#define R_PARISC_LTOFF_FPTR21L 58
-+#define R_PARISC_LTOFF_FPTR14R 62
-+#define R_PARISC_FPTR64 64
-+#define R_PARISC_PLABEL32 65
-+#define R_PARISC_PLABEL21L 66
-+#define R_PARISC_PLABEL14R 70
-+#define R_PARISC_PCREL64 72
-+#define R_PARISC_PCREL22F 74
-+#define R_PARISC_PCREL14WR 75
-+#define R_PARISC_PCREL14DR 76
-+#define R_PARISC_PCREL16F 77
-+#define R_PARISC_PCREL16WF 78
-+#define R_PARISC_PCREL16DF 79
-+#define R_PARISC_DIR64 80
-+#define R_PARISC_DIR14WR 83
-+#define R_PARISC_DIR14DR 84
-+#define R_PARISC_DIR16F 85
-+#define R_PARISC_DIR16WF 86
-+#define R_PARISC_DIR16DF 87
-+#define R_PARISC_GPREL64 88
-+#define R_PARISC_GPREL14WR 91
-+#define R_PARISC_GPREL14DR 92
-+#define R_PARISC_GPREL16F 93
-+#define R_PARISC_GPREL16WF 94
-+#define R_PARISC_GPREL16DF 95
-+#define R_PARISC_LTOFF64 96
-+#define R_PARISC_LTOFF14WR 99
-+#define R_PARISC_LTOFF14DR 100
-+#define R_PARISC_LTOFF16F 101
-+#define R_PARISC_LTOFF16WF 102
-+#define R_PARISC_LTOFF16DF 103
-+#define R_PARISC_SECREL64 104
-+#define R_PARISC_SEGREL64 112
-+#define R_PARISC_PLTOFF14WR 115
-+#define R_PARISC_PLTOFF14DR 116
-+#define R_PARISC_PLTOFF16F 117
-+#define R_PARISC_PLTOFF16WF 118
-+#define R_PARISC_PLTOFF16DF 119
-+#define R_PARISC_LTOFF_FPTR64 120
-+#define R_PARISC_LTOFF_FPTR14WR 123
-+#define R_PARISC_LTOFF_FPTR14DR 124
-+#define R_PARISC_LTOFF_FPTR16F 125
-+#define R_PARISC_LTOFF_FPTR16WF 126
-+#define R_PARISC_LTOFF_FPTR16DF 127
-+#define R_PARISC_LORESERVE 128
-+#define R_PARISC_COPY 128
-+#define R_PARISC_IPLT 129
-+#define R_PARISC_EPLT 130
-+#define R_PARISC_TPREL32 153
-+#define R_PARISC_TPREL21L 154
-+#define R_PARISC_TPREL14R 158
-+#define R_PARISC_LTOFF_TP21L 162
-+#define R_PARISC_LTOFF_TP14R 166
-+#define R_PARISC_LTOFF_TP14F 167
-+#define R_PARISC_TPREL64 216
-+#define R_PARISC_TPREL14WR 219
-+#define R_PARISC_TPREL14DR 220
-+#define R_PARISC_TPREL16F 221
-+#define R_PARISC_TPREL16WF 222
-+#define R_PARISC_TPREL16DF 223
-+#define R_PARISC_LTOFF_TP64 224
-+#define R_PARISC_LTOFF_TP14WR 227
-+#define R_PARISC_LTOFF_TP14DR 228
-+#define R_PARISC_LTOFF_TP16F 229
-+#define R_PARISC_LTOFF_TP16WF 230
-+#define R_PARISC_LTOFF_TP16DF 231
-+#define R_PARISC_GNU_VTENTRY 232
-+#define R_PARISC_GNU_VTINHERIT 233
-+#define R_PARISC_TLS_GD21L 234
-+#define R_PARISC_TLS_GD14R 235
-+#define R_PARISC_TLS_GDCALL 236
-+#define R_PARISC_TLS_LDM21L 237
-+#define R_PARISC_TLS_LDM14R 238
-+#define R_PARISC_TLS_LDMCALL 239
-+#define R_PARISC_TLS_LDO21L 240
-+#define R_PARISC_TLS_LDO14R 241
-+#define R_PARISC_TLS_DTPMOD32 242
-+#define R_PARISC_TLS_DTPMOD64 243
-+#define R_PARISC_TLS_DTPOFF32 244
-+#define R_PARISC_TLS_DTPOFF64 245
-+#define R_PARISC_TLS_LE21L R_PARISC_TPREL21L
-+#define R_PARISC_TLS_LE14R R_PARISC_TPREL14R
-+#define R_PARISC_TLS_IE21L R_PARISC_LTOFF_TP21L
-+#define R_PARISC_TLS_IE14R R_PARISC_LTOFF_TP14R
-+#define R_PARISC_TLS_TPREL32 R_PARISC_TPREL32
-+#define R_PARISC_TLS_TPREL64 R_PARISC_TPREL64
-+#define R_PARISC_HIRESERVE 255
-+
-+
-+
-+#define PT_HP_TLS (PT_LOOS + 0x0)
-+#define PT_HP_CORE_NONE (PT_LOOS + 0x1)
-+#define PT_HP_CORE_VERSION (PT_LOOS + 0x2)
-+#define PT_HP_CORE_KERNEL (PT_LOOS + 0x3)
-+#define PT_HP_CORE_COMM (PT_LOOS + 0x4)
-+#define PT_HP_CORE_PROC (PT_LOOS + 0x5)
-+#define PT_HP_CORE_LOADABLE (PT_LOOS + 0x6)
-+#define PT_HP_CORE_STACK (PT_LOOS + 0x7)
-+#define PT_HP_CORE_SHM (PT_LOOS + 0x8)
-+#define PT_HP_CORE_MMF (PT_LOOS + 0x9)
-+#define PT_HP_PARALLEL (PT_LOOS + 0x10)
-+#define PT_HP_FASTBIND (PT_LOOS + 0x11)
-+#define PT_HP_OPT_ANNOT (PT_LOOS + 0x12)
-+#define PT_HP_HSL_ANNOT (PT_LOOS + 0x13)
-+#define PT_HP_STACK (PT_LOOS + 0x14)
-+
-+#define PT_PARISC_ARCHEXT 0x70000000
-+#define PT_PARISC_UNWIND 0x70000001
-+
-+
-+
-+#define PF_PARISC_SBP 0x08000000
-+
-+#define PF_HP_PAGE_SIZE 0x00100000
-+#define PF_HP_FAR_SHARED 0x00200000
-+#define PF_HP_NEAR_SHARED 0x00400000
-+#define PF_HP_CODE 0x01000000
-+#define PF_HP_MODIFY 0x02000000
-+#define PF_HP_LAZYSWAP 0x04000000
-+#define PF_HP_SBP 0x08000000
-+
-+
-+
-+
-+
-+
-+#define EF_ALPHA_32BIT 1
-+#define EF_ALPHA_CANRELAX 2
-+
-+
-+
-+
-+#define SHT_ALPHA_DEBUG 0x70000001
-+#define SHT_ALPHA_REGINFO 0x70000002
-+
-+
-+
-+#define SHF_ALPHA_GPREL 0x10000000
-+
-+
-+#define STO_ALPHA_NOPV 0x80
-+#define STO_ALPHA_STD_GPLOAD 0x88
-+
-+
-+
-+#define R_ALPHA_NONE 0
-+#define R_ALPHA_REFLONG 1
-+#define R_ALPHA_REFQUAD 2
-+#define R_ALPHA_GPREL32 3
-+#define R_ALPHA_LITERAL 4
-+#define R_ALPHA_LITUSE 5
-+#define R_ALPHA_GPDISP 6
-+#define R_ALPHA_BRADDR 7
-+#define R_ALPHA_HINT 8
-+#define R_ALPHA_SREL16 9
-+#define R_ALPHA_SREL32 10
-+#define R_ALPHA_SREL64 11
-+#define R_ALPHA_GPRELHIGH 17
-+#define R_ALPHA_GPRELLOW 18
-+#define R_ALPHA_GPREL16 19
-+#define R_ALPHA_COPY 24
-+#define R_ALPHA_GLOB_DAT 25
-+#define R_ALPHA_JMP_SLOT 26
-+#define R_ALPHA_RELATIVE 27
-+#define R_ALPHA_TLS_GD_HI 28
-+#define R_ALPHA_TLSGD 29
-+#define R_ALPHA_TLS_LDM 30
-+#define R_ALPHA_DTPMOD64 31
-+#define R_ALPHA_GOTDTPREL 32
-+#define R_ALPHA_DTPREL64 33
-+#define R_ALPHA_DTPRELHI 34
-+#define R_ALPHA_DTPRELLO 35
-+#define R_ALPHA_DTPREL16 36
-+#define R_ALPHA_GOTTPREL 37
-+#define R_ALPHA_TPREL64 38
-+#define R_ALPHA_TPRELHI 39
-+#define R_ALPHA_TPRELLO 40
-+#define R_ALPHA_TPREL16 41
-+
-+#define R_ALPHA_NUM 46
-+
-+
-+#define LITUSE_ALPHA_ADDR 0
-+#define LITUSE_ALPHA_BASE 1
-+#define LITUSE_ALPHA_BYTOFF 2
-+#define LITUSE_ALPHA_JSR 3
-+#define LITUSE_ALPHA_TLS_GD 4
-+#define LITUSE_ALPHA_TLS_LDM 5
-+
-+
-+#define DT_ALPHA_PLTRO (DT_LOPROC + 0)
-+#define DT_ALPHA_NUM 1
-+
-+
-+
-+
-+#define EF_PPC_EMB 0x80000000
-+
-+
-+#define EF_PPC_RELOCATABLE 0x00010000
-+#define EF_PPC_RELOCATABLE_LIB 0x00008000
-+
-+
-+
-+#define R_PPC_NONE 0
-+#define R_PPC_ADDR32 1
-+#define R_PPC_ADDR24 2
-+#define R_PPC_ADDR16 3
-+#define R_PPC_ADDR16_LO 4
-+#define R_PPC_ADDR16_HI 5
-+#define R_PPC_ADDR16_HA 6
-+#define R_PPC_ADDR14 7
-+#define R_PPC_ADDR14_BRTAKEN 8
-+#define R_PPC_ADDR14_BRNTAKEN 9
-+#define R_PPC_REL24 10
-+#define R_PPC_REL14 11
-+#define R_PPC_REL14_BRTAKEN 12
-+#define R_PPC_REL14_BRNTAKEN 13
-+#define R_PPC_GOT16 14
-+#define R_PPC_GOT16_LO 15
-+#define R_PPC_GOT16_HI 16
-+#define R_PPC_GOT16_HA 17
-+#define R_PPC_PLTREL24 18
-+#define R_PPC_COPY 19
-+#define R_PPC_GLOB_DAT 20
-+#define R_PPC_JMP_SLOT 21
-+#define R_PPC_RELATIVE 22
-+#define R_PPC_LOCAL24PC 23
-+#define R_PPC_UADDR32 24
-+#define R_PPC_UADDR16 25
-+#define R_PPC_REL32 26
-+#define R_PPC_PLT32 27
-+#define R_PPC_PLTREL32 28
-+#define R_PPC_PLT16_LO 29
-+#define R_PPC_PLT16_HI 30
-+#define R_PPC_PLT16_HA 31
-+#define R_PPC_SDAREL16 32
-+#define R_PPC_SECTOFF 33
-+#define R_PPC_SECTOFF_LO 34
-+#define R_PPC_SECTOFF_HI 35
-+#define R_PPC_SECTOFF_HA 36
-+
-+
-+#define R_PPC_TLS 67
-+#define R_PPC_DTPMOD32 68
-+#define R_PPC_TPREL16 69
-+#define R_PPC_TPREL16_LO 70
-+#define R_PPC_TPREL16_HI 71
-+#define R_PPC_TPREL16_HA 72
-+#define R_PPC_TPREL32 73
-+#define R_PPC_DTPREL16 74
-+#define R_PPC_DTPREL16_LO 75
-+#define R_PPC_DTPREL16_HI 76
-+#define R_PPC_DTPREL16_HA 77
-+#define R_PPC_DTPREL32 78
-+#define R_PPC_GOT_TLSGD16 79
-+#define R_PPC_GOT_TLSGD16_LO 80
-+#define R_PPC_GOT_TLSGD16_HI 81
-+#define R_PPC_GOT_TLSGD16_HA 82
-+#define R_PPC_GOT_TLSLD16 83
-+#define R_PPC_GOT_TLSLD16_LO 84
-+#define R_PPC_GOT_TLSLD16_HI 85
-+#define R_PPC_GOT_TLSLD16_HA 86
-+#define R_PPC_GOT_TPREL16 87
-+#define R_PPC_GOT_TPREL16_LO 88
-+#define R_PPC_GOT_TPREL16_HI 89
-+#define R_PPC_GOT_TPREL16_HA 90
-+#define R_PPC_GOT_DTPREL16 91
-+#define R_PPC_GOT_DTPREL16_LO 92
-+#define R_PPC_GOT_DTPREL16_HI 93
-+#define R_PPC_GOT_DTPREL16_HA 94
-+
-+
-+
-+#define R_PPC_EMB_NADDR32 101
-+#define R_PPC_EMB_NADDR16 102
-+#define R_PPC_EMB_NADDR16_LO 103
-+#define R_PPC_EMB_NADDR16_HI 104
-+#define R_PPC_EMB_NADDR16_HA 105
-+#define R_PPC_EMB_SDAI16 106
-+#define R_PPC_EMB_SDA2I16 107
-+#define R_PPC_EMB_SDA2REL 108
-+#define R_PPC_EMB_SDA21 109
-+#define R_PPC_EMB_MRKREF 110
-+#define R_PPC_EMB_RELSEC16 111
-+#define R_PPC_EMB_RELST_LO 112
-+#define R_PPC_EMB_RELST_HI 113
-+#define R_PPC_EMB_RELST_HA 114
-+#define R_PPC_EMB_BIT_FLD 115
-+#define R_PPC_EMB_RELSDA 116
-+
-+
-+#define R_PPC_DIAB_SDA21_LO 180
-+#define R_PPC_DIAB_SDA21_HI 181
-+#define R_PPC_DIAB_SDA21_HA 182
-+#define R_PPC_DIAB_RELSDA_LO 183
-+#define R_PPC_DIAB_RELSDA_HI 184
-+#define R_PPC_DIAB_RELSDA_HA 185
-+
-+
-+#define R_PPC_IRELATIVE 248
-+
-+
-+#define R_PPC_REL16 249
-+#define R_PPC_REL16_LO 250
-+#define R_PPC_REL16_HI 251
-+#define R_PPC_REL16_HA 252
-+
-+
-+
-+#define R_PPC_TOC16 255
-+
-+
-+#define DT_PPC_GOT (DT_LOPROC + 0)
-+#define DT_PPC_NUM 1
-+
-+
-+#define R_PPC64_NONE R_PPC_NONE
-+#define R_PPC64_ADDR32 R_PPC_ADDR32
-+#define R_PPC64_ADDR24 R_PPC_ADDR24
-+#define R_PPC64_ADDR16 R_PPC_ADDR16
-+#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO
-+#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI
-+#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA
-+#define R_PPC64_ADDR14 R_PPC_ADDR14
-+#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
-+#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
-+#define R_PPC64_REL24 R_PPC_REL24
-+#define R_PPC64_REL14 R_PPC_REL14
-+#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
-+#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
-+#define R_PPC64_GOT16 R_PPC_GOT16
-+#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
-+#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
-+#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
-+
-+#define R_PPC64_COPY R_PPC_COPY
-+#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
-+#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
-+#define R_PPC64_RELATIVE R_PPC_RELATIVE
-+
-+#define R_PPC64_UADDR32 R_PPC_UADDR32
-+#define R_PPC64_UADDR16 R_PPC_UADDR16
-+#define R_PPC64_REL32 R_PPC_REL32
-+#define R_PPC64_PLT32 R_PPC_PLT32
-+#define R_PPC64_PLTREL32 R_PPC_PLTREL32
-+#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
-+#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
-+#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
-+
-+#define R_PPC64_SECTOFF R_PPC_SECTOFF
-+#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
-+#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
-+#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
-+#define R_PPC64_ADDR30 37
-+#define R_PPC64_ADDR64 38
-+#define R_PPC64_ADDR16_HIGHER 39
-+#define R_PPC64_ADDR16_HIGHERA 40
-+#define R_PPC64_ADDR16_HIGHEST 41
-+#define R_PPC64_ADDR16_HIGHESTA 42
-+#define R_PPC64_UADDR64 43
-+#define R_PPC64_REL64 44
-+#define R_PPC64_PLT64 45
-+#define R_PPC64_PLTREL64 46
-+#define R_PPC64_TOC16 47
-+#define R_PPC64_TOC16_LO 48
-+#define R_PPC64_TOC16_HI 49
-+#define R_PPC64_TOC16_HA 50
-+#define R_PPC64_TOC 51
-+#define R_PPC64_PLTGOT16 52
-+#define R_PPC64_PLTGOT16_LO 53
-+#define R_PPC64_PLTGOT16_HI 54
-+#define R_PPC64_PLTGOT16_HA 55
-+
-+#define R_PPC64_ADDR16_DS 56
-+#define R_PPC64_ADDR16_LO_DS 57
-+#define R_PPC64_GOT16_DS 58
-+#define R_PPC64_GOT16_LO_DS 59
-+#define R_PPC64_PLT16_LO_DS 60
-+#define R_PPC64_SECTOFF_DS 61
-+#define R_PPC64_SECTOFF_LO_DS 62
-+#define R_PPC64_TOC16_DS 63
-+#define R_PPC64_TOC16_LO_DS 64
-+#define R_PPC64_PLTGOT16_DS 65
-+#define R_PPC64_PLTGOT16_LO_DS 66
-+
-+
-+#define R_PPC64_TLS 67
-+#define R_PPC64_DTPMOD64 68
-+#define R_PPC64_TPREL16 69
-+#define R_PPC64_TPREL16_LO 70
-+#define R_PPC64_TPREL16_HI 71
-+#define R_PPC64_TPREL16_HA 72
-+#define R_PPC64_TPREL64 73
-+#define R_PPC64_DTPREL16 74
-+#define R_PPC64_DTPREL16_LO 75
-+#define R_PPC64_DTPREL16_HI 76
-+#define R_PPC64_DTPREL16_HA 77
-+#define R_PPC64_DTPREL64 78
-+#define R_PPC64_GOT_TLSGD16 79
-+#define R_PPC64_GOT_TLSGD16_LO 80
-+#define R_PPC64_GOT_TLSGD16_HI 81
-+#define R_PPC64_GOT_TLSGD16_HA 82
-+#define R_PPC64_GOT_TLSLD16 83
-+#define R_PPC64_GOT_TLSLD16_LO 84
-+#define R_PPC64_GOT_TLSLD16_HI 85
-+#define R_PPC64_GOT_TLSLD16_HA 86
-+#define R_PPC64_GOT_TPREL16_DS 87
-+#define R_PPC64_GOT_TPREL16_LO_DS 88
-+#define R_PPC64_GOT_TPREL16_HI 89
-+#define R_PPC64_GOT_TPREL16_HA 90
-+#define R_PPC64_GOT_DTPREL16_DS 91
-+#define R_PPC64_GOT_DTPREL16_LO_DS 92
-+#define R_PPC64_GOT_DTPREL16_HI 93
-+#define R_PPC64_GOT_DTPREL16_HA 94
-+#define R_PPC64_TPREL16_DS 95
-+#define R_PPC64_TPREL16_LO_DS 96
-+#define R_PPC64_TPREL16_HIGHER 97
-+#define R_PPC64_TPREL16_HIGHERA 98
-+#define R_PPC64_TPREL16_HIGHEST 99
-+#define R_PPC64_TPREL16_HIGHESTA 100
-+#define R_PPC64_DTPREL16_DS 101
-+#define R_PPC64_DTPREL16_LO_DS 102
-+#define R_PPC64_DTPREL16_HIGHER 103
-+#define R_PPC64_DTPREL16_HIGHERA 104
-+#define R_PPC64_DTPREL16_HIGHEST 105
-+#define R_PPC64_DTPREL16_HIGHESTA 106
-+
-+
-+#define R_PPC64_JMP_IREL 247
-+#define R_PPC64_IRELATIVE 248
-+#define R_PPC64_REL16 249
-+#define R_PPC64_REL16_LO 250
-+#define R_PPC64_REL16_HI 251
-+#define R_PPC64_REL16_HA 252
-+
-+
-+#define DT_PPC64_GLINK (DT_LOPROC + 0)
-+#define DT_PPC64_OPD (DT_LOPROC + 1)
-+#define DT_PPC64_OPDSZ (DT_LOPROC + 2)
-+#define DT_PPC64_NUM 3
-+
-+
-+
-+
-+
-+#define EF_ARM_RELEXEC 0x01
-+#define EF_ARM_HASENTRY 0x02
-+#define EF_ARM_INTERWORK 0x04
-+#define EF_ARM_APCS_26 0x08
-+#define EF_ARM_APCS_FLOAT 0x10
-+#define EF_ARM_PIC 0x20
-+#define EF_ARM_ALIGN8 0x40
-+#define EF_ARM_NEW_ABI 0x80
-+#define EF_ARM_OLD_ABI 0x100
-+#define EF_ARM_SOFT_FLOAT 0x200
-+#define EF_ARM_VFP_FLOAT 0x400
-+#define EF_ARM_MAVERICK_FLOAT 0x800
-+
-+#define EF_ARM_ABI_FLOAT_SOFT 0x200
-+#define EF_ARM_ABI_FLOAT_HARD 0x400
-+
-+
-+#define EF_ARM_SYMSARESORTED 0x04
-+#define EF_ARM_DYNSYMSUSESEGIDX 0x08
-+#define EF_ARM_MAPSYMSFIRST 0x10
-+#define EF_ARM_EABIMASK 0XFF000000
-+
-+
-+#define EF_ARM_BE8 0x00800000
-+#define EF_ARM_LE8 0x00400000
-+
-+#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK)
-+#define EF_ARM_EABI_UNKNOWN 0x00000000
-+#define EF_ARM_EABI_VER1 0x01000000
-+#define EF_ARM_EABI_VER2 0x02000000
-+#define EF_ARM_EABI_VER3 0x03000000
-+#define EF_ARM_EABI_VER4 0x04000000
-+#define EF_ARM_EABI_VER5 0x05000000
-+
-+
-+#define STT_ARM_TFUNC STT_LOPROC
-+#define STT_ARM_16BIT STT_HIPROC
-+
-+
-+#define SHF_ARM_ENTRYSECT 0x10000000
-+#define SHF_ARM_COMDEF 0x80000000
-+
-+
-+
-+#define PF_ARM_SB 0x10000000
-+
-+#define PF_ARM_PI 0x20000000
-+#define PF_ARM_ABS 0x40000000
-+
-+
-+#define PT_ARM_EXIDX (PT_LOPROC + 1)
-+
-+
-+#define SHT_ARM_EXIDX (SHT_LOPROC + 1)
-+#define SHT_ARM_PREEMPTMAP (SHT_LOPROC + 2)
-+#define SHT_ARM_ATTRIBUTES (SHT_LOPROC + 3)
-+
-+
-+#define R_AARCH64_NONE 0
-+#define R_AARCH64_ABS64 257
-+#define R_AARCH64_ABS32 258
-+#define R_AARCH64_COPY 1024
-+#define R_AARCH64_GLOB_DAT 1025
-+#define R_AARCH64_JUMP_SLOT 1026
-+#define R_AARCH64_RELATIVE 1027
-+#define R_AARCH64_TLS_DTPMOD64 1028
-+#define R_AARCH64_TLS_DTPREL64 1029
-+#define R_AARCH64_TLS_TPREL64 1030
-+#define R_AARCH64_TLSDESC 1031
-+
-+
-+#define R_ARM_NONE 0
-+#define R_ARM_PC24 1
-+#define R_ARM_ABS32 2
-+#define R_ARM_REL32 3
-+#define R_ARM_PC13 4
-+#define R_ARM_ABS16 5
-+#define R_ARM_ABS12 6
-+#define R_ARM_THM_ABS5 7
-+#define R_ARM_ABS8 8
-+#define R_ARM_SBREL32 9
-+#define R_ARM_THM_PC22 10
-+#define R_ARM_THM_PC8 11
-+#define R_ARM_AMP_VCALL9 12
-+#define R_ARM_TLS_DESC 13
-+#define R_ARM_THM_SWI8 14
-+#define R_ARM_XPC25 15
-+#define R_ARM_THM_XPC22 16
-+#define R_ARM_TLS_DTPMOD32 17
-+#define R_ARM_TLS_DTPOFF32 18
-+#define R_ARM_TLS_TPOFF32 19
-+#define R_ARM_COPY 20
-+#define R_ARM_GLOB_DAT 21
-+#define R_ARM_JUMP_SLOT 22
-+#define R_ARM_RELATIVE 23
-+#define R_ARM_GOTOFF 24
-+#define R_ARM_GOTPC 25
-+#define R_ARM_GOT32 26
-+#define R_ARM_PLT32 27
-+#define R_ARM_CALL 28
-+#define R_ARM_JUMP24 29
-+#define R_ARM_THM_JUMP24 30
-+#define R_ARM_BASE_ABS 31
-+#define R_ARM_ALU_PCREL_7_0 32
-+#define R_ARM_ALU_PCREL_15_8 33
-+#define R_ARM_ALU_PCREL_23_15 34
-+#define R_ARM_LDR_SBREL_11_0 35
-+#define R_ARM_ALU_SBREL_19_12 36
-+#define R_ARM_ALU_SBREL_27_20 37
-+#define R_ARM_TARGET1 38
-+#define R_ARM_SBREL31 39
-+#define R_ARM_V4BX 40
-+#define R_ARM_TARGET2 41
-+#define R_ARM_PREL31 42
-+#define R_ARM_MOVW_ABS_NC 43
-+#define R_ARM_MOVT_ABS 44
-+#define R_ARM_MOVW_PREL_NC 45
-+#define R_ARM_MOVT_PREL 46
-+#define R_ARM_THM_MOVW_ABS_NC 47
-+#define R_ARM_THM_MOVT_ABS 48
-+#define R_ARM_THM_MOVW_PREL_NC 49
-+#define R_ARM_THM_MOVT_PREL 50
-+#define R_ARM_THM_JUMP19 51
-+#define R_ARM_THM_JUMP6 52
-+#define R_ARM_THM_ALU_PREL_11_0 53
-+#define R_ARM_THM_PC12 54
-+#define R_ARM_ABS32_NOI 55
-+#define R_ARM_REL32_NOI 56
-+#define R_ARM_ALU_PC_G0_NC 57
-+#define R_ARM_ALU_PC_G0 58
-+#define R_ARM_ALU_PC_G1_NC 59
-+#define R_ARM_ALU_PC_G1 60
-+#define R_ARM_ALU_PC_G2 61
-+#define R_ARM_LDR_PC_G1 62
-+#define R_ARM_LDR_PC_G2 63
-+#define R_ARM_LDRS_PC_G0 64
-+#define R_ARM_LDRS_PC_G1 65
-+#define R_ARM_LDRS_PC_G2 66
-+#define R_ARM_LDC_PC_G0 67
-+#define R_ARM_LDC_PC_G1 68
-+#define R_ARM_LDC_PC_G2 69
-+#define R_ARM_ALU_SB_G0_NC 70
-+#define R_ARM_ALU_SB_G0 71
-+#define R_ARM_ALU_SB_G1_NC 72
-+#define R_ARM_ALU_SB_G1 73
-+#define R_ARM_ALU_SB_G2 74
-+#define R_ARM_LDR_SB_G0 75
-+#define R_ARM_LDR_SB_G1 76
-+#define R_ARM_LDR_SB_G2 77
-+#define R_ARM_LDRS_SB_G0 78
-+#define R_ARM_LDRS_SB_G1 79
-+#define R_ARM_LDRS_SB_G2 80
-+#define R_ARM_LDC_SB_G0 81
-+#define R_ARM_LDC_SB_G1 82
-+#define R_ARM_LDC_SB_G2 83
-+#define R_ARM_MOVW_BREL_NC 84
-+#define R_ARM_MOVT_BREL 85
-+#define R_ARM_MOVW_BREL 86
-+#define R_ARM_THM_MOVW_BREL_NC 87
-+#define R_ARM_THM_MOVT_BREL 88
-+#define R_ARM_THM_MOVW_BREL 89
-+#define R_ARM_TLS_GOTDESC 90
-+#define R_ARM_TLS_CALL 91
-+#define R_ARM_TLS_DESCSEQ 92
-+#define R_ARM_THM_TLS_CALL 93
-+#define R_ARM_PLT32_ABS 94
-+#define R_ARM_GOT_ABS 95
-+#define R_ARM_GOT_PREL 96
-+#define R_ARM_GOT_BREL12 97
-+#define R_ARM_GOTOFF12 98
-+#define R_ARM_GOTRELAX 99
-+#define R_ARM_GNU_VTENTRY 100
-+#define R_ARM_GNU_VTINHERIT 101
-+#define R_ARM_THM_PC11 102
-+#define R_ARM_THM_PC9 103
-+#define R_ARM_TLS_GD32 104
-+
-+#define R_ARM_TLS_LDM32 105
-+
-+#define R_ARM_TLS_LDO32 106
-+
-+#define R_ARM_TLS_IE32 107
-+
-+#define R_ARM_TLS_LE32 108
-+#define R_ARM_TLS_LDO12 109
-+#define R_ARM_TLS_LE12 110
-+#define R_ARM_TLS_IE12GP 111
-+#define R_ARM_ME_TOO 128
-+#define R_ARM_THM_TLS_DESCSEQ 129
-+#define R_ARM_THM_TLS_DESCSEQ16 129
-+#define R_ARM_THM_TLS_DESCSEQ32 130
-+#define R_ARM_THM_GOT_BREL12 131
-+#define R_ARM_IRELATIVE 160
-+#define R_ARM_RXPC25 249
-+#define R_ARM_RSBREL32 250
-+#define R_ARM_THM_RPC22 251
-+#define R_ARM_RREL32 252
-+#define R_ARM_RABS22 253
-+#define R_ARM_RPC24 254
-+#define R_ARM_RBASE 255
-+
-+#define R_ARM_NUM 256
-+
-+
-+
-+
-+#define EF_IA_64_MASKOS 0x0000000f
-+#define EF_IA_64_ABI64 0x00000010
-+#define EF_IA_64_ARCH 0xff000000
-+
-+
-+#define PT_IA_64_ARCHEXT (PT_LOPROC + 0)
-+#define PT_IA_64_UNWIND (PT_LOPROC + 1)
-+#define PT_IA_64_HP_OPT_ANOT (PT_LOOS + 0x12)
-+#define PT_IA_64_HP_HSL_ANOT (PT_LOOS + 0x13)
-+#define PT_IA_64_HP_STACK (PT_LOOS + 0x14)
-+
-+
-+#define PF_IA_64_NORECOV 0x80000000
-+
-+
-+#define SHT_IA_64_EXT (SHT_LOPROC + 0)
-+#define SHT_IA_64_UNWIND (SHT_LOPROC + 1)
-+
-+
-+#define SHF_IA_64_SHORT 0x10000000
-+#define SHF_IA_64_NORECOV 0x20000000
-+
-+
-+#define DT_IA_64_PLT_RESERVE (DT_LOPROC + 0)
-+#define DT_IA_64_NUM 1
-+
-+
-+#define R_IA64_NONE 0x00
-+#define R_IA64_IMM14 0x21
-+#define R_IA64_IMM22 0x22
-+#define R_IA64_IMM64 0x23
-+#define R_IA64_DIR32MSB 0x24
-+#define R_IA64_DIR32LSB 0x25
-+#define R_IA64_DIR64MSB 0x26
-+#define R_IA64_DIR64LSB 0x27
-+#define R_IA64_GPREL22 0x2a
-+#define R_IA64_GPREL64I 0x2b
-+#define R_IA64_GPREL32MSB 0x2c
-+#define R_IA64_GPREL32LSB 0x2d
-+#define R_IA64_GPREL64MSB 0x2e
-+#define R_IA64_GPREL64LSB 0x2f
-+#define R_IA64_LTOFF22 0x32
-+#define R_IA64_LTOFF64I 0x33
-+#define R_IA64_PLTOFF22 0x3a
-+#define R_IA64_PLTOFF64I 0x3b
-+#define R_IA64_PLTOFF64MSB 0x3e
-+#define R_IA64_PLTOFF64LSB 0x3f
-+#define R_IA64_FPTR64I 0x43
-+#define R_IA64_FPTR32MSB 0x44
-+#define R_IA64_FPTR32LSB 0x45
-+#define R_IA64_FPTR64MSB 0x46
-+#define R_IA64_FPTR64LSB 0x47
-+#define R_IA64_PCREL60B 0x48
-+#define R_IA64_PCREL21B 0x49
-+#define R_IA64_PCREL21M 0x4a
-+#define R_IA64_PCREL21F 0x4b
-+#define R_IA64_PCREL32MSB 0x4c
-+#define R_IA64_PCREL32LSB 0x4d
-+#define R_IA64_PCREL64MSB 0x4e
-+#define R_IA64_PCREL64LSB 0x4f
-+#define R_IA64_LTOFF_FPTR22 0x52
-+#define R_IA64_LTOFF_FPTR64I 0x53
-+#define R_IA64_LTOFF_FPTR32MSB 0x54
-+#define R_IA64_LTOFF_FPTR32LSB 0x55
-+#define R_IA64_LTOFF_FPTR64MSB 0x56
-+#define R_IA64_LTOFF_FPTR64LSB 0x57
-+#define R_IA64_SEGREL32MSB 0x5c
-+#define R_IA64_SEGREL32LSB 0x5d
-+#define R_IA64_SEGREL64MSB 0x5e
-+#define R_IA64_SEGREL64LSB 0x5f
-+#define R_IA64_SECREL32MSB 0x64
-+#define R_IA64_SECREL32LSB 0x65
-+#define R_IA64_SECREL64MSB 0x66
-+#define R_IA64_SECREL64LSB 0x67
-+#define R_IA64_REL32MSB 0x6c
-+#define R_IA64_REL32LSB 0x6d
-+#define R_IA64_REL64MSB 0x6e
-+#define R_IA64_REL64LSB 0x6f
-+#define R_IA64_LTV32MSB 0x74
-+#define R_IA64_LTV32LSB 0x75
-+#define R_IA64_LTV64MSB 0x76
-+#define R_IA64_LTV64LSB 0x77
-+#define R_IA64_PCREL21BI 0x79
-+#define R_IA64_PCREL22 0x7a
-+#define R_IA64_PCREL64I 0x7b
-+#define R_IA64_IPLTMSB 0x80
-+#define R_IA64_IPLTLSB 0x81
-+#define R_IA64_COPY 0x84
-+#define R_IA64_SUB 0x85
-+#define R_IA64_LTOFF22X 0x86
-+#define R_IA64_LDXMOV 0x87
-+#define R_IA64_TPREL14 0x91
-+#define R_IA64_TPREL22 0x92
-+#define R_IA64_TPREL64I 0x93
-+#define R_IA64_TPREL64MSB 0x96
-+#define R_IA64_TPREL64LSB 0x97
-+#define R_IA64_LTOFF_TPREL22 0x9a
-+#define R_IA64_DTPMOD64MSB 0xa6
-+#define R_IA64_DTPMOD64LSB 0xa7
-+#define R_IA64_LTOFF_DTPMOD22 0xaa
-+#define R_IA64_DTPREL14 0xb1
-+#define R_IA64_DTPREL22 0xb2
-+#define R_IA64_DTPREL64I 0xb3
-+#define R_IA64_DTPREL32MSB 0xb4
-+#define R_IA64_DTPREL32LSB 0xb5
-+#define R_IA64_DTPREL64MSB 0xb6
-+#define R_IA64_DTPREL64LSB 0xb7
-+#define R_IA64_LTOFF_DTPREL22 0xba
-+
-+
-+
-+
-+#define R_SH_NONE 0
-+#define R_SH_DIR32 1
-+#define R_SH_REL32 2
-+#define R_SH_DIR8WPN 3
-+#define R_SH_IND12W 4
-+#define R_SH_DIR8WPL 5
-+#define R_SH_DIR8WPZ 6
-+#define R_SH_DIR8BP 7
-+#define R_SH_DIR8W 8
-+#define R_SH_DIR8L 9
-+#define R_SH_SWITCH16 25
-+#define R_SH_SWITCH32 26
-+#define R_SH_USES 27
-+#define R_SH_COUNT 28
-+#define R_SH_ALIGN 29
-+#define R_SH_CODE 30
-+#define R_SH_DATA 31
-+#define R_SH_LABEL 32
-+#define R_SH_SWITCH8 33
-+#define R_SH_GNU_VTINHERIT 34
-+#define R_SH_GNU_VTENTRY 35
-+#define R_SH_TLS_GD_32 144
-+#define R_SH_TLS_LD_32 145
-+#define R_SH_TLS_LDO_32 146
-+#define R_SH_TLS_IE_32 147
-+#define R_SH_TLS_LE_32 148
-+#define R_SH_TLS_DTPMOD32 149
-+#define R_SH_TLS_DTPOFF32 150
-+#define R_SH_TLS_TPOFF32 151
-+#define R_SH_GOT32 160
-+#define R_SH_PLT32 161
-+#define R_SH_COPY 162
-+#define R_SH_GLOB_DAT 163
-+#define R_SH_JMP_SLOT 164
-+#define R_SH_RELATIVE 165
-+#define R_SH_GOTOFF 166
-+#define R_SH_GOTPC 167
-+
-+#define R_SH_NUM 256
-+
-+
-+
-+#define R_390_NONE 0
-+#define R_390_8 1
-+#define R_390_12 2
-+#define R_390_16 3
-+#define R_390_32 4
-+#define R_390_PC32 5
-+#define R_390_GOT12 6
-+#define R_390_GOT32 7
-+#define R_390_PLT32 8
-+#define R_390_COPY 9
-+#define R_390_GLOB_DAT 10
-+#define R_390_JMP_SLOT 11
-+#define R_390_RELATIVE 12
-+#define R_390_GOTOFF32 13
-+#define R_390_GOTPC 14
-+#define R_390_GOT16 15
-+#define R_390_PC16 16
-+#define R_390_PC16DBL 17
-+#define R_390_PLT16DBL 18
-+#define R_390_PC32DBL 19
-+#define R_390_PLT32DBL 20
-+#define R_390_GOTPCDBL 21
-+#define R_390_64 22
-+#define R_390_PC64 23
-+#define R_390_GOT64 24
-+#define R_390_PLT64 25
-+#define R_390_GOTENT 26
-+#define R_390_GOTOFF16 27
-+#define R_390_GOTOFF64 28
-+#define R_390_GOTPLT12 29
-+#define R_390_GOTPLT16 30
-+#define R_390_GOTPLT32 31
-+#define R_390_GOTPLT64 32
-+#define R_390_GOTPLTENT 33
-+#define R_390_PLTOFF16 34
-+#define R_390_PLTOFF32 35
-+#define R_390_PLTOFF64 36
-+#define R_390_TLS_LOAD 37
-+#define R_390_TLS_GDCALL 38
-+
-+#define R_390_TLS_LDCALL 39
-+
-+#define R_390_TLS_GD32 40
-+
-+#define R_390_TLS_GD64 41
-+
-+#define R_390_TLS_GOTIE12 42
-+
-+#define R_390_TLS_GOTIE32 43
-+
-+#define R_390_TLS_GOTIE64 44
-+
-+#define R_390_TLS_LDM32 45
-+
-+#define R_390_TLS_LDM64 46
-+
-+#define R_390_TLS_IE32 47
-+
-+#define R_390_TLS_IE64 48
-+
-+#define R_390_TLS_IEENT 49
-+
-+#define R_390_TLS_LE32 50
-+
-+#define R_390_TLS_LE64 51
-+
-+#define R_390_TLS_LDO32 52
-+
-+#define R_390_TLS_LDO64 53
-+
-+#define R_390_TLS_DTPMOD 54
-+#define R_390_TLS_DTPOFF 55
-+#define R_390_TLS_TPOFF 56
-+
-+#define R_390_20 57
-+#define R_390_GOT20 58
-+#define R_390_GOTPLT20 59
-+#define R_390_TLS_GOTIE20 60
-+
-+
-+#define R_390_NUM 61
-+
-+
-+
-+#define R_CRIS_NONE 0
-+#define R_CRIS_8 1
-+#define R_CRIS_16 2
-+#define R_CRIS_32 3
-+#define R_CRIS_8_PCREL 4
-+#define R_CRIS_16_PCREL 5
-+#define R_CRIS_32_PCREL 6
-+#define R_CRIS_GNU_VTINHERIT 7
-+#define R_CRIS_GNU_VTENTRY 8
-+#define R_CRIS_COPY 9
-+#define R_CRIS_GLOB_DAT 10
-+#define R_CRIS_JUMP_SLOT 11
-+#define R_CRIS_RELATIVE 12
-+#define R_CRIS_16_GOT 13
-+#define R_CRIS_32_GOT 14
-+#define R_CRIS_16_GOTPLT 15
-+#define R_CRIS_32_GOTPLT 16
-+#define R_CRIS_32_GOTREL 17
-+#define R_CRIS_32_PLT_GOTREL 18
-+#define R_CRIS_32_PLT_PCREL 19
-+
-+#define R_CRIS_NUM 20
-+
-+
-+
-+#define R_X86_64_NONE 0
-+#define R_X86_64_64 1
-+#define R_X86_64_PC32 2
-+#define R_X86_64_GOT32 3
-+#define R_X86_64_PLT32 4
-+#define R_X86_64_COPY 5
-+#define R_X86_64_GLOB_DAT 6
-+#define R_X86_64_JUMP_SLOT 7
-+#define R_X86_64_RELATIVE 8
-+#define R_X86_64_GOTPCREL 9
-+
-+#define R_X86_64_32 10
-+#define R_X86_64_32S 11
-+#define R_X86_64_16 12
-+#define R_X86_64_PC16 13
-+#define R_X86_64_8 14
-+#define R_X86_64_PC8 15
-+#define R_X86_64_DTPMOD64 16
-+#define R_X86_64_DTPOFF64 17
-+#define R_X86_64_TPOFF64 18
-+#define R_X86_64_TLSGD 19
-+
-+#define R_X86_64_TLSLD 20
-+
-+#define R_X86_64_DTPOFF32 21
-+#define R_X86_64_GOTTPOFF 22
-+
-+#define R_X86_64_TPOFF32 23
-+#define R_X86_64_PC64 24
-+#define R_X86_64_GOTOFF64 25
-+#define R_X86_64_GOTPC32 26
-+#define R_X86_64_GOT64 27
-+#define R_X86_64_GOTPCREL64 28
-+#define R_X86_64_GOTPC64 29
-+#define R_X86_64_GOTPLT64 30
-+#define R_X86_64_PLTOFF64 31
-+#define R_X86_64_SIZE32 32
-+#define R_X86_64_SIZE64 33
-+
-+#define R_X86_64_GOTPC32_TLSDESC 34
-+#define R_X86_64_TLSDESC_CALL 35
-+
-+#define R_X86_64_TLSDESC 36
-+#define R_X86_64_IRELATIVE 37
-+#define R_X86_64_RELATIVE64 38
-+#define R_X86_64_NUM 39
-+
-+
-+
-+#define R_MN10300_NONE 0
-+#define R_MN10300_32 1
-+#define R_MN10300_16 2
-+#define R_MN10300_8 3
-+#define R_MN10300_PCREL32 4
-+#define R_MN10300_PCREL16 5
-+#define R_MN10300_PCREL8 6
-+#define R_MN10300_GNU_VTINHERIT 7
-+#define R_MN10300_GNU_VTENTRY 8
-+#define R_MN10300_24 9
-+#define R_MN10300_GOTPC32 10
-+#define R_MN10300_GOTPC16 11
-+#define R_MN10300_GOTOFF32 12
-+#define R_MN10300_GOTOFF24 13
-+#define R_MN10300_GOTOFF16 14
-+#define R_MN10300_PLT32 15
-+#define R_MN10300_PLT16 16
-+#define R_MN10300_GOT32 17
-+#define R_MN10300_GOT24 18
-+#define R_MN10300_GOT16 19
-+#define R_MN10300_COPY 20
-+#define R_MN10300_GLOB_DAT 21
-+#define R_MN10300_JMP_SLOT 22
-+#define R_MN10300_RELATIVE 23
-+
-+#define R_MN10300_NUM 24
-+
-+
-+
-+#define R_M32R_NONE 0
-+#define R_M32R_16 1
-+#define R_M32R_32 2
-+#define R_M32R_24 3
-+#define R_M32R_10_PCREL 4
-+#define R_M32R_18_PCREL 5
-+#define R_M32R_26_PCREL 6
-+#define R_M32R_HI16_ULO 7
-+#define R_M32R_HI16_SLO 8
-+#define R_M32R_LO16 9
-+#define R_M32R_SDA16 10
-+#define R_M32R_GNU_VTINHERIT 11
-+#define R_M32R_GNU_VTENTRY 12
-+
-+#define R_M32R_16_RELA 33
-+#define R_M32R_32_RELA 34
-+#define R_M32R_24_RELA 35
-+#define R_M32R_10_PCREL_RELA 36
-+#define R_M32R_18_PCREL_RELA 37
-+#define R_M32R_26_PCREL_RELA 38
-+#define R_M32R_HI16_ULO_RELA 39
-+#define R_M32R_HI16_SLO_RELA 40
-+#define R_M32R_LO16_RELA 41
-+#define R_M32R_SDA16_RELA 42
-+#define R_M32R_RELA_GNU_VTINHERIT 43
-+#define R_M32R_RELA_GNU_VTENTRY 44
-+#define R_M32R_REL32 45
-+
-+#define R_M32R_GOT24 48
-+#define R_M32R_26_PLTREL 49
-+#define R_M32R_COPY 50
-+#define R_M32R_GLOB_DAT 51
-+#define R_M32R_JMP_SLOT 52
-+#define R_M32R_RELATIVE 53
-+#define R_M32R_GOTOFF 54
-+#define R_M32R_GOTPC24 55
-+#define R_M32R_GOT16_HI_ULO 56
-+
-+#define R_M32R_GOT16_HI_SLO 57
-+
-+#define R_M32R_GOT16_LO 58
-+#define R_M32R_GOTPC_HI_ULO 59
-+
-+#define R_M32R_GOTPC_HI_SLO 60
-+
-+#define R_M32R_GOTPC_LO 61
-+
-+#define R_M32R_GOTOFF_HI_ULO 62
-+
-+#define R_M32R_GOTOFF_HI_SLO 63
-+
-+#define R_M32R_GOTOFF_LO 64
-+#define R_M32R_NUM 256
-+
-+#define R_MICROBLAZE_NONE 0
-+#define R_MICROBLAZE_32 1
-+#define R_MICROBLAZE_32_PCREL 2
-+#define R_MICROBLAZE_64_PCREL 3
-+#define R_MICROBLAZE_32_PCREL_LO 4
-+#define R_MICROBLAZE_64 5
-+#define R_MICROBLAZE_32_LO 6
-+#define R_MICROBLAZE_SRO32 7
-+#define R_MICROBLAZE_SRW32 8
-+#define R_MICROBLAZE_64_NONE 9
-+#define R_MICROBLAZE_32_SYM_OP_SYM 10
-+#define R_MICROBLAZE_GNU_VTINHERIT 11
-+#define R_MICROBLAZE_GNU_VTENTRY 12
-+#define R_MICROBLAZE_GOTPC_64 13
-+#define R_MICROBLAZE_GOT_64 14
-+#define R_MICROBLAZE_PLT_64 15
-+#define R_MICROBLAZE_REL 16
-+#define R_MICROBLAZE_JUMP_SLOT 17
-+#define R_MICROBLAZE_GLOB_DAT 18
-+#define R_MICROBLAZE_GOTOFF_64 19
-+#define R_MICROBLAZE_GOTOFF_32 20
-+#define R_MICROBLAZE_COPY 21
-+#define R_MICROBLAZE_TLS 22
-+#define R_MICROBLAZE_TLSGD 23
-+#define R_MICROBLAZE_TLSLD 24
-+#define R_MICROBLAZE_TLSDTPMOD32 25
-+#define R_MICROBLAZE_TLSDTPREL32 26
-+#define R_MICROBLAZE_TLSDTPREL64 27
-+#define R_MICROBLAZE_TLSGOTTPREL32 28
-+#define R_MICROBLAZE_TLSTPREL32 29
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+
-+#endif
diff --git a/target/linux/patches/3.15-rc7/sgidefs.patch b/target/linux/patches/3.15-rc7/sgidefs.patch
deleted file mode 100644
index f00a284d9..000000000
--- a/target/linux/patches/3.15-rc7/sgidefs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur linux-3.11.5.orig/arch/mips/include/uapi/asm/sgidefs.h linux-3.11.5/arch/mips/include/uapi/asm/sgidefs.h
---- linux-3.11.5.orig/arch/mips/include/uapi/asm/sgidefs.h 2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/mips/include/uapi/asm/sgidefs.h 2013-11-08 22:01:28.000000000 +0100
-@@ -11,14 +11,6 @@
- #define __ASM_SGIDEFS_H
-
- /*
-- * Using a Linux compiler for building Linux seems logic but not to
-- * everybody.
-- */
--#ifndef __linux__
--#error Use a Linux compiler or give up.
--#endif
--
--/*
- * Definitions for the ISA levels
- *
- * With the introduction of MIPS32 / MIPS64 instruction sets definitions
diff --git a/target/linux/patches/3.15-rc7/sortext.patch b/target/linux/patches/3.15-rc7/sortext.patch
deleted file mode 100644
index 8fd4e1d6b..000000000
--- a/target/linux/patches/3.15-rc7/sortext.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur linux-3.12.6.orig/arch/arm/Kconfig linux-3.12.6/arch/arm/Kconfig
---- linux-3.12.6.orig/arch/arm/Kconfig 2013-12-20 16:51:33.000000000 +0100
-+++ linux-3.12.6/arch/arm/Kconfig 2013-12-28 19:29:33.000000000 +0100
-@@ -6,7 +6,6 @@
- select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
- select ARCH_HAVE_CUSTOM_GPIO_H
- select ARCH_WANT_IPC_PARSE_VERSION
-- select BUILDTIME_EXTABLE_SORT if MMU
- select CLONE_BACKWARDS
- select CPU_PM if (SUSPEND || CPU_IDLE)
- select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN && MMU
-diff -Nur linux-3.12.6.orig/arch/mips/Kconfig linux-3.12.6/arch/mips/Kconfig
---- linux-3.12.6.orig/arch/mips/Kconfig 2013-12-20 16:51:33.000000000 +0100
-+++ linux-3.12.6/arch/mips/Kconfig 2013-12-28 19:30:06.000000000 +0100
-@@ -35,7 +35,6 @@
- select HAVE_MEMBLOCK_NODE_MAP
- select ARCH_DISCARD_MEMBLOCK
- select GENERIC_SMP_IDLE_THREAD
-- select BUILDTIME_EXTABLE_SORT
- select GENERIC_CLOCKEVENTS
- select GENERIC_CMOS_UPDATE
- select HAVE_MOD_ARCH_SPECIFIC
-diff -Nur linux-3.12.6.orig/arch/x86/Kconfig linux-3.12.6/arch/x86/Kconfig
---- linux-3.12.6.orig/arch/x86/Kconfig 2013-12-20 16:51:33.000000000 +0100
-+++ linux-3.12.6/arch/x86/Kconfig 2013-12-28 19:29:50.000000000 +0100
-@@ -100,7 +100,6 @@
- select GENERIC_SMP_IDLE_THREAD
- select ARCH_WANT_IPC_PARSE_VERSION if X86_32
- select HAVE_ARCH_SECCOMP_FILTER
-- select BUILDTIME_EXTABLE_SORT
- select GENERIC_CMOS_UPDATE
- select HAVE_ARCH_SOFT_DIRTY
- select CLOCKSOURCE_WATCHDOG
diff --git a/target/linux/patches/3.15-rc7/startup.patch b/target/linux/patches/3.15-rc7/startup.patch
deleted file mode 100644
index d396b75e4..000000000
--- a/target/linux/patches/3.15-rc7/startup.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c
---- linux-3.13.3.orig/init/main.c 2014-02-13 23:00:14.000000000 +0100
-+++ linux-3.13.3/init/main.c 2014-02-17 11:35:14.000000000 +0100
-@@ -916,6 +917,8 @@
- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
- pr_err("Warning: unable to open an initial console.\n");
-
-+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n");
-+
- (void) sys_dup(0);
- (void) sys_dup(0);
- /*
-diff -Nur linux-3.13.6.orig/init/initramfs.c linux-3.13.6/init/initramfs.c
---- linux-3.13.6.orig/init/initramfs.c 2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/init/initramfs.c 2014-03-15 12:11:31.882731916 +0100
-@@ -622,6 +622,9 @@
- */
- load_default_modules();
- }
-+#ifdef CONFIG_DEVTMPFS_MOUNT
-+ devtmpfs_mount("dev");
-+#endif
- return 0;
- }
- rootfs_initcall(populate_rootfs);
-diff -Nur linux-3.13.6.orig/init/main.c linux-3.13.6/init/main.c
---- linux-3.13.6.orig/init/main.c 2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/init/main.c 2014-03-15 12:13:16.459024452 +0100
-@@ -924,7 +924,7 @@
- */
-
- if (!ramdisk_execute_command)
-- ramdisk_execute_command = "/init";
-+ ramdisk_execute_command = "/sbin/init";
-
- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
- ramdisk_execute_command = NULL;
diff --git a/target/linux/patches/3.15-rc7/tcp-fastopen.patch b/target/linux/patches/3.15-rc7/tcp-fastopen.patch
deleted file mode 100644
index fc1d076ac..000000000
--- a/target/linux/patches/3.15-rc7/tcp-fastopen.patch
+++ /dev/null
@@ -1,2082 +0,0 @@
-diff -Nur linux-3.15-rc7.orig/include/linux/tcp.h linux-3.15-rc7/include/linux/tcp.h
---- linux-3.15-rc7.orig/include/linux/tcp.h 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/include/linux/tcp.h 2014-05-31 22:42:49.024605293 +0200
-@@ -359,6 +359,9 @@
- return (struct tcp_timewait_sock *)sk;
- }
-
-+extern void tcp_sock_destruct(struct sock *sk);
-+
-+#ifdef CONFIG_TCP_FASTOPEN
- static inline bool tcp_passive_fastopen(const struct sock *sk)
- {
- return (sk->sk_state == TCP_SYN_RECV &&
-@@ -370,8 +373,6 @@
- return foc->len != -1;
- }
-
--extern void tcp_sock_destruct(struct sock *sk);
--
- static inline int fastopen_init_queue(struct sock *sk, int backlog)
- {
- struct request_sock_queue *queue =
-@@ -391,4 +392,13 @@
- return 0;
- }
-
-+#else
-+static inline bool tcp_passive_fastopen(const struct sock *sk)
-+{ return false; }
-+static inline bool fastopen_cookie_present(struct tcp_fastopen_cookie *foc)
-+{ return false; }
-+static inline int fastopen_init_queue(struct sock *sk, int backlog)
-+{ return 0; }
-+#endif
-+
- #endif /* _LINUX_TCP_H */
-diff -Nur linux-3.15-rc7.orig/include/net/request_sock.h linux-3.15-rc7/include/net/request_sock.h
---- linux-3.15-rc7.orig/include/net/request_sock.h 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/include/net/request_sock.h 2014-05-31 22:42:49.024605293 +0200
-@@ -168,8 +168,13 @@
-
- void __reqsk_queue_destroy(struct request_sock_queue *queue);
- void reqsk_queue_destroy(struct request_sock_queue *queue);
-+#ifdef CONFIG_TCP_FASTOPEN
- void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req,
- bool reset);
-+#else
-+static inline void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req,
-+ bool reset) {}
-+#endif
-
- static inline struct request_sock *
- reqsk_queue_yank_acceptq(struct request_sock_queue *queue)
-diff -Nur linux-3.15-rc7.orig/include/net/tcp.h linux-3.15-rc7/include/net/tcp.h
---- linux-3.15-rc7.orig/include/net/tcp.h 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/include/net/tcp.h 2014-05-31 22:42:49.028605326 +0200
-@@ -251,7 +251,11 @@
- extern int sysctl_tcp_retries2;
- extern int sysctl_tcp_orphan_retries;
- extern int sysctl_tcp_syncookies;
-+#ifdef CONFIG_TCP_FASTOPEN
- extern int sysctl_tcp_fastopen;
-+#else
-+#define sysctl_tcp_fastopen 0
-+#endif
- extern int sysctl_tcp_retrans_collapse;
- extern int sysctl_tcp_stdurg;
- extern int sysctl_tcp_rfc1337;
-@@ -1308,7 +1312,12 @@
- size_t size;
- int copied; /* queued in tcp_connect() */
- };
-+
-+#ifdef CONFIG_TCP_FASTOPEN
- void tcp_free_fastopen_req(struct tcp_sock *tp);
-+#else
-+static inline void tcp_free_fastopen_req(struct tcp_sock *tp) {}
-+#endif
-
- extern struct tcp_fastopen_context __rcu *tcp_fastopen_ctx;
- int tcp_fastopen_reset_cipher(void *key, unsigned int len);
-diff -Nur linux-3.15-rc7.orig/include/net/tcp.h.orig linux-3.15-rc7/include/net/tcp.h.orig
---- linux-3.15-rc7.orig/include/net/tcp.h.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc7/include/net/tcp.h.orig 2014-05-26 01:06:00.000000000 +0200
-@@ -0,0 +1,1600 @@
-+/*
-+ * INET An implementation of the TCP/IP protocol suite for the LINUX
-+ * operating system. INET is implemented using the BSD Socket
-+ * interface as the means of communication with the user level.
-+ *
-+ * Definitions for the TCP module.
-+ *
-+ * Version: @(#)tcp.h 1.0.5 05/23/93
-+ *
-+ * Authors: Ross Biro
-+ * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+#ifndef _TCP_H
-+#define _TCP_H
-+
-+#define FASTRETRANS_DEBUG 1
-+
-+#include <linux/list.h>
-+#include <linux/tcp.h>
-+#include <linux/bug.h>
-+#include <linux/slab.h>
-+#include <linux/cache.h>
-+#include <linux/percpu.h>
-+#include <linux/skbuff.h>
-+#include <linux/dmaengine.h>
-+#include <linux/crypto.h>
-+#include <linux/cryptohash.h>
-+#include <linux/kref.h>
-+#include <linux/ktime.h>
-+
-+#include <net/inet_connection_sock.h>
-+#include <net/inet_timewait_sock.h>
-+#include <net/inet_hashtables.h>
-+#include <net/checksum.h>
-+#include <net/request_sock.h>
-+#include <net/sock.h>
-+#include <net/snmp.h>
-+#include <net/ip.h>
-+#include <net/tcp_states.h>
-+#include <net/inet_ecn.h>
-+#include <net/dst.h>
-+
-+#include <linux/seq_file.h>
-+#include <linux/memcontrol.h>
-+
-+extern struct inet_hashinfo tcp_hashinfo;
-+
-+extern struct percpu_counter tcp_orphan_count;
-+void tcp_time_wait(struct sock *sk, int state, int timeo);
-+
-+#define MAX_TCP_HEADER (128 + MAX_HEADER)
-+#define MAX_TCP_OPTION_SPACE 40
-+
-+/*
-+ * Never offer a window over 32767 without using window scaling. Some
-+ * poor stacks do signed 16bit maths!
-+ */
-+#define MAX_TCP_WINDOW 32767U
-+
-+/* Minimal accepted MSS. It is (60+60+8) - (20+20). */
-+#define TCP_MIN_MSS 88U
-+
-+/* The least MTU to use for probing */
-+#define TCP_BASE_MSS 512
-+
-+/* After receiving this amount of duplicate ACKs fast retransmit starts. */
-+#define TCP_FASTRETRANS_THRESH 3
-+
-+/* Maximal reordering. */
-+#define TCP_MAX_REORDERING 127
-+
-+/* Maximal number of ACKs sent quickly to accelerate slow-start. */
-+#define TCP_MAX_QUICKACKS 16U
-+
-+/* urg_data states */
-+#define TCP_URG_VALID 0x0100
-+#define TCP_URG_NOTYET 0x0200
-+#define TCP_URG_READ 0x0400
-+
-+#define TCP_RETR1 3 /*
-+ * This is how many retries it does before it
-+ * tries to figure out if the gateway is
-+ * down. Minimal RFC value is 3; it corresponds
-+ * to ~3sec-8min depending on RTO.
-+ */
-+
-+#define TCP_RETR2 15 /*
-+ * This should take at least
-+ * 90 minutes to time out.
-+ * RFC1122 says that the limit is 100 sec.
-+ * 15 is ~13-30min depending on RTO.
-+ */
-+
-+#define TCP_SYN_RETRIES 6 /* This is how many retries are done
-+ * when active opening a connection.
-+ * RFC1122 says the minimum retry MUST
-+ * be at least 180secs. Nevertheless
-+ * this value is corresponding to
-+ * 63secs of retransmission with the
-+ * current initial RTO.
-+ */
-+
-+#define TCP_SYNACK_RETRIES 5 /* This is how may retries are done
-+ * when passive opening a connection.
-+ * This is corresponding to 31secs of
-+ * retransmission with the current
-+ * initial RTO.
-+ */
-+
-+#define TCP_TIMEWAIT_LEN (60*HZ) /* how long to wait to destroy TIME-WAIT
-+ * state, about 60 seconds */
-+#define TCP_FIN_TIMEOUT TCP_TIMEWAIT_LEN
-+ /* BSD style FIN_WAIT2 deadlock breaker.
-+ * It used to be 3min, new value is 60sec,
-+ * to combine FIN-WAIT-2 timeout with
-+ * TIME-WAIT timer.
-+ */
-+
-+#define TCP_DELACK_MAX ((unsigned)(HZ/5)) /* maximal time to delay before sending an ACK */
-+#if HZ >= 100
-+#define TCP_DELACK_MIN ((unsigned)(HZ/25)) /* minimal time to delay before sending an ACK */
-+#define TCP_ATO_MIN ((unsigned)(HZ/25))
-+#else
-+#define TCP_DELACK_MIN 4U
-+#define TCP_ATO_MIN 4U
-+#endif
-+#define TCP_RTO_MAX ((unsigned)(120*HZ))
-+#define TCP_RTO_MIN ((unsigned)(HZ/5))
-+#define TCP_TIMEOUT_INIT ((unsigned)(1*HZ)) /* RFC6298 2.1 initial RTO value */
-+#define TCP_TIMEOUT_FALLBACK ((unsigned)(3*HZ)) /* RFC 1122 initial RTO value, now
-+ * used as a fallback RTO for the
-+ * initial data transmission if no
-+ * valid RTT sample has been acquired,
-+ * most likely due to retrans in 3WHS.
-+ */
-+
-+#define TCP_RESOURCE_PROBE_INTERVAL ((unsigned)(HZ/2U)) /* Maximal interval between probes
-+ * for local resources.
-+ */
-+
-+#define TCP_KEEPALIVE_TIME (120*60*HZ) /* two hours */
-+#define TCP_KEEPALIVE_PROBES 9 /* Max of 9 keepalive probes */
-+#define TCP_KEEPALIVE_INTVL (75*HZ)
-+
-+#define MAX_TCP_KEEPIDLE 32767
-+#define MAX_TCP_KEEPINTVL 32767
-+#define MAX_TCP_KEEPCNT 127
-+#define MAX_TCP_SYNCNT 127
-+
-+#define TCP_SYNQ_INTERVAL (HZ/5) /* Period of SYNACK timer */
-+
-+#define TCP_PAWS_24DAYS (60 * 60 * 24 * 24)
-+#define TCP_PAWS_MSL 60 /* Per-host timestamps are invalidated
-+ * after this time. It should be equal
-+ * (or greater than) TCP_TIMEWAIT_LEN
-+ * to provide reliability equal to one
-+ * provided by timewait state.
-+ */
-+#define TCP_PAWS_WINDOW 1 /* Replay window for per-host
-+ * timestamps. It must be less than
-+ * minimal timewait lifetime.
-+ */
-+/*
-+ * TCP option
-+ */
-+
-+#define TCPOPT_NOP 1 /* Padding */
-+#define TCPOPT_EOL 0 /* End of options */
-+#define TCPOPT_MSS 2 /* Segment size negotiating */
-+#define TCPOPT_WINDOW 3 /* Window scaling */
-+#define TCPOPT_SACK_PERM 4 /* SACK Permitted */
-+#define TCPOPT_SACK 5 /* SACK Block */
-+#define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */
-+#define TCPOPT_MD5SIG 19 /* MD5 Signature (RFC2385) */
-+#define TCPOPT_EXP 254 /* Experimental */
-+/* Magic number to be after the option value for sharing TCP
-+ * experimental options. See draft-ietf-tcpm-experimental-options-00.txt
-+ */
-+#define TCPOPT_FASTOPEN_MAGIC 0xF989
-+
-+/*
-+ * TCP option lengths
-+ */
-+
-+#define TCPOLEN_MSS 4
-+#define TCPOLEN_WINDOW 3
-+#define TCPOLEN_SACK_PERM 2
-+#define TCPOLEN_TIMESTAMP 10
-+#define TCPOLEN_MD5SIG 18
-+#define TCPOLEN_EXP_FASTOPEN_BASE 4
-+
-+/* But this is what stacks really send out. */
-+#define TCPOLEN_TSTAMP_ALIGNED 12
-+#define TCPOLEN_WSCALE_ALIGNED 4
-+#define TCPOLEN_SACKPERM_ALIGNED 4
-+#define TCPOLEN_SACK_BASE 2
-+#define TCPOLEN_SACK_BASE_ALIGNED 4
-+#define TCPOLEN_SACK_PERBLOCK 8
-+#define TCPOLEN_MD5SIG_ALIGNED 20
-+#define TCPOLEN_MSS_ALIGNED 4
-+
-+/* Flags in tp->nonagle */
-+#define TCP_NAGLE_OFF 1 /* Nagle's algo is disabled */
-+#define TCP_NAGLE_CORK 2 /* Socket is corked */
-+#define TCP_NAGLE_PUSH 4 /* Cork is overridden for already queued data */
-+
-+/* TCP thin-stream limits */
-+#define TCP_THIN_LINEAR_RETRIES 6 /* After 6 linear retries, do exp. backoff */
-+
-+/* TCP initial congestion window as per draft-hkchu-tcpm-initcwnd-01 */
-+#define TCP_INIT_CWND 10
-+
-+/* Bit Flags for sysctl_tcp_fastopen */
-+#define TFO_CLIENT_ENABLE 1
-+#define TFO_SERVER_ENABLE 2
-+#define TFO_CLIENT_NO_COOKIE 4 /* Data in SYN w/o cookie option */
-+
-+/* Process SYN data but skip cookie validation */
-+#define TFO_SERVER_COOKIE_NOT_CHKED 0x100
-+/* Accept SYN data w/o any cookie option */
-+#define TFO_SERVER_COOKIE_NOT_REQD 0x200
-+
-+/* Force enable TFO on all listeners, i.e., not requiring the
-+ * TCP_FASTOPEN socket option. SOCKOPT1/2 determine how to set max_qlen.
-+ */
-+#define TFO_SERVER_WO_SOCKOPT1 0x400
-+#define TFO_SERVER_WO_SOCKOPT2 0x800
-+/* Always create TFO child sockets on a TFO listener even when
-+ * cookie/data not present. (For testing purpose!)
-+ */
-+#define TFO_SERVER_ALWAYS 0x1000
-+
-+extern struct inet_timewait_death_row tcp_death_row;
-+
-+/* sysctl variables for tcp */
-+extern int sysctl_tcp_timestamps;
-+extern int sysctl_tcp_window_scaling;
-+extern int sysctl_tcp_sack;
-+extern int sysctl_tcp_fin_timeout;
-+extern int sysctl_tcp_keepalive_time;
-+extern int sysctl_tcp_keepalive_probes;
-+extern int sysctl_tcp_keepalive_intvl;
-+extern int sysctl_tcp_syn_retries;
-+extern int sysctl_tcp_synack_retries;
-+extern int sysctl_tcp_retries1;
-+extern int sysctl_tcp_retries2;
-+extern int sysctl_tcp_orphan_retries;
-+extern int sysctl_tcp_syncookies;
-+extern int sysctl_tcp_fastopen;
-+extern int sysctl_tcp_retrans_collapse;
-+extern int sysctl_tcp_stdurg;
-+extern int sysctl_tcp_rfc1337;
-+extern int sysctl_tcp_abort_on_overflow;
-+extern int sysctl_tcp_max_orphans;
-+extern int sysctl_tcp_fack;
-+extern int sysctl_tcp_reordering;
-+extern int sysctl_tcp_dsack;
-+extern long sysctl_tcp_mem[3];
-+extern int sysctl_tcp_wmem[3];
-+extern int sysctl_tcp_rmem[3];
-+extern int sysctl_tcp_app_win;
-+extern int sysctl_tcp_adv_win_scale;
-+extern int sysctl_tcp_tw_reuse;
-+extern int sysctl_tcp_frto;
-+extern int sysctl_tcp_low_latency;
-+extern int sysctl_tcp_dma_copybreak;
-+extern int sysctl_tcp_nometrics_save;
-+extern int sysctl_tcp_moderate_rcvbuf;
-+extern int sysctl_tcp_tso_win_divisor;
-+extern int sysctl_tcp_mtu_probing;
-+extern int sysctl_tcp_base_mss;
-+extern int sysctl_tcp_workaround_signed_windows;
-+extern int sysctl_tcp_slow_start_after_idle;
-+extern int sysctl_tcp_thin_linear_timeouts;
-+extern int sysctl_tcp_thin_dupack;
-+extern int sysctl_tcp_early_retrans;
-+extern int sysctl_tcp_limit_output_bytes;
-+extern int sysctl_tcp_challenge_ack_limit;
-+extern unsigned int sysctl_tcp_notsent_lowat;
-+extern int sysctl_tcp_min_tso_segs;
-+extern int sysctl_tcp_autocorking;
-+
-+extern atomic_long_t tcp_memory_allocated;
-+extern struct percpu_counter tcp_sockets_allocated;
-+extern int tcp_memory_pressure;
-+
-+/*
-+ * The next routines deal with comparing 32 bit unsigned ints
-+ * and worry about wraparound (automatic with unsigned arithmetic).
-+ */
-+
-+static inline bool before(__u32 seq1, __u32 seq2)
-+{
-+ return (__s32)(seq1-seq2) < 0;
-+}
-+#define after(seq2, seq1) before(seq1, seq2)
-+
-+/* is s2<=s1<=s3 ? */
-+static inline bool between(__u32 seq1, __u32 seq2, __u32 seq3)
-+{
-+ return seq3 - seq2 >= seq1 - seq2;
-+}
-+
-+static inline bool tcp_out_of_memory(struct sock *sk)
-+{
-+ if (sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&
-+ sk_memory_allocated(sk) > sk_prot_mem_limits(sk, 2))
-+ return true;
-+ return false;
-+}
-+
-+static inline bool tcp_too_many_orphans(struct sock *sk, int shift)
-+{
-+ struct percpu_counter *ocp = sk->sk_prot->orphan_count;
-+ int orphans = percpu_counter_read_positive(ocp);
-+
-+ if (orphans << shift > sysctl_tcp_max_orphans) {
-+ orphans = percpu_counter_sum_positive(ocp);
-+ if (orphans << shift > sysctl_tcp_max_orphans)
-+ return true;
-+ }
-+ return false;
-+}
-+
-+bool tcp_check_oom(struct sock *sk, int shift);
-+
-+/* syncookies: remember time of last synqueue overflow */
-+static inline void tcp_synq_overflow(struct sock *sk)
-+{
-+ tcp_sk(sk)->rx_opt.ts_recent_stamp = jiffies;
-+}
-+
-+/* syncookies: no recent synqueue overflow on this listening socket? */
-+static inline bool tcp_synq_no_recent_overflow(const struct sock *sk)
-+{
-+ unsigned long last_overflow = tcp_sk(sk)->rx_opt.ts_recent_stamp;
-+ return time_after(jiffies, last_overflow + TCP_TIMEOUT_FALLBACK);
-+}
-+
-+extern struct proto tcp_prot;
-+
-+#define TCP_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.tcp_statistics, field)
-+#define TCP_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.tcp_statistics, field)
-+#define TCP_DEC_STATS(net, field) SNMP_DEC_STATS((net)->mib.tcp_statistics, field)
-+#define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)
-+#define TCP_ADD_STATS(net, field, val) SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val)
-+
-+void tcp_tasklet_init(void);
-+
-+void tcp_v4_err(struct sk_buff *skb, u32);
-+
-+void tcp_shutdown(struct sock *sk, int how);
-+
-+void tcp_v4_early_demux(struct sk_buff *skb);
-+int tcp_v4_rcv(struct sk_buff *skb);
-+
-+int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
-+int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-+ size_t size);
-+int tcp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,
-+ int flags);
-+void tcp_release_cb(struct sock *sk);
-+void tcp_wfree(struct sk_buff *skb);
-+void tcp_write_timer_handler(struct sock *sk);
-+void tcp_delack_timer_handler(struct sock *sk);
-+int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg);
-+int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
-+ const struct tcphdr *th, unsigned int len);
-+void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
-+ const struct tcphdr *th, unsigned int len);
-+void tcp_rcv_space_adjust(struct sock *sk);
-+void tcp_cleanup_rbuf(struct sock *sk, int copied);
-+int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
-+void tcp_twsk_destructor(struct sock *sk);
-+ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos,
-+ struct pipe_inode_info *pipe, size_t len,
-+ unsigned int flags);
-+
-+static inline void tcp_dec_quickack_mode(struct sock *sk,
-+ const unsigned int pkts)
-+{
-+ struct inet_connection_sock *icsk = inet_csk(sk);
-+
-+ if (icsk->icsk_ack.quick) {
-+ if (pkts >= icsk->icsk_ack.quick) {
-+ icsk->icsk_ack.quick = 0;
-+ /* Leaving quickack mode we deflate ATO. */
-+ icsk->icsk_ack.ato = TCP_ATO_MIN;
-+ } else
-+ icsk->icsk_ack.quick -= pkts;
-+ }
-+}
-+
-+#define TCP_ECN_OK 1
-+#define TCP_ECN_QUEUE_CWR 2
-+#define TCP_ECN_DEMAND_CWR 4
-+#define TCP_ECN_SEEN 8
-+
-+enum tcp_tw_status {
-+ TCP_TW_SUCCESS = 0,
-+ TCP_TW_RST = 1,
-+ TCP_TW_ACK = 2,
-+ TCP_TW_SYN = 3
-+};
-+
-+
-+enum tcp_tw_status tcp_timewait_state_process(struct inet_timewait_sock *tw,
-+ struct sk_buff *skb,
-+ const struct tcphdr *th);
-+struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
-+ struct request_sock *req, struct request_sock **prev,
-+ bool fastopen);
-+int tcp_child_process(struct sock *parent, struct sock *child,
-+ struct sk_buff *skb);
-+void tcp_enter_loss(struct sock *sk, int how);
-+void tcp_clear_retrans(struct tcp_sock *tp);
-+void tcp_update_metrics(struct sock *sk);
-+void tcp_init_metrics(struct sock *sk);
-+void tcp_metrics_init(void);
-+bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst,
-+ bool paws_check);
-+bool tcp_remember_stamp(struct sock *sk);
-+bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw);
-+void tcp_fetch_timewait_stamp(struct sock *sk, struct dst_entry *dst);
-+void tcp_disable_fack(struct tcp_sock *tp);
-+void tcp_close(struct sock *sk, long timeout);
-+void tcp_init_sock(struct sock *sk);
-+unsigned int tcp_poll(struct file *file, struct socket *sock,
-+ struct poll_table_struct *wait);
-+int tcp_getsockopt(struct sock *sk, int level, int optname,
-+ char __user *optval, int __user *optlen);
-+int tcp_setsockopt(struct sock *sk, int level, int optname,
-+ char __user *optval, unsigned int optlen);
-+int compat_tcp_getsockopt(struct sock *sk, int level, int optname,
-+ char __user *optval, int __user *optlen);
-+int compat_tcp_setsockopt(struct sock *sk, int level, int optname,
-+ char __user *optval, unsigned int optlen);
-+void tcp_set_keepalive(struct sock *sk, int val);
-+void tcp_syn_ack_timeout(struct sock *sk, struct request_sock *req);
-+int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-+ size_t len, int nonblock, int flags, int *addr_len);
-+void tcp_parse_options(const struct sk_buff *skb,
-+ struct tcp_options_received *opt_rx,
-+ int estab, struct tcp_fastopen_cookie *foc);
-+const u8 *tcp_parse_md5sig_option(const struct tcphdr *th);
-+
-+/*
-+ * TCP v4 functions exported for the inet6 API
-+ */
-+
-+void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb);
-+int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb);
-+struct sock *tcp_create_openreq_child(struct sock *sk,
-+ struct request_sock *req,
-+ struct sk_buff *skb);
-+struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
-+ struct request_sock *req,
-+ struct dst_entry *dst);
-+int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb);
-+int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);
-+int tcp_connect(struct sock *sk);
-+struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
-+ struct request_sock *req,
-+ struct tcp_fastopen_cookie *foc);
-+int tcp_disconnect(struct sock *sk, int flags);
-+
-+void tcp_finish_connect(struct sock *sk, struct sk_buff *skb);
-+int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size);
-+void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb);
-+
-+/* From syncookies.c */
-+int __cookie_v4_check(const struct iphdr *iph, const struct tcphdr *th,
-+ u32 cookie);
-+struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
-+ struct ip_options *opt);
-+#ifdef CONFIG_SYN_COOKIES
-+
-+/* Syncookies use a monotonic timer which increments every 60 seconds.
-+ * This counter is used both as a hash input and partially encoded into
-+ * the cookie value. A cookie is only validated further if the delta
-+ * between the current counter value and the encoded one is less than this,
-+ * i.e. a sent cookie is valid only at most for 2*60 seconds (or less if
-+ * the counter advances immediately after a cookie is generated).
-+ */
-+#define MAX_SYNCOOKIE_AGE 2
-+
-+static inline u32 tcp_cookie_time(void)
-+{
-+ u64 val = get_jiffies_64();
-+
-+ do_div(val, 60 * HZ);
-+ return val;
-+}
-+
-+u32 __cookie_v4_init_sequence(const struct iphdr *iph, const struct tcphdr *th,
-+ u16 *mssp);
-+__u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb, __u16 *mss);
-+#else
-+static inline __u32 cookie_v4_init_sequence(struct sock *sk,
-+ struct sk_buff *skb,
-+ __u16 *mss)
-+{
-+ return 0;
-+}
-+#endif
-+
-+__u32 cookie_init_timestamp(struct request_sock *req);
-+bool cookie_check_timestamp(struct tcp_options_received *opt, struct net *net,
-+ bool *ecn_ok);
-+
-+/* From net/ipv6/syncookies.c */
-+int __cookie_v6_check(const struct ipv6hdr *iph, const struct tcphdr *th,
-+ u32 cookie);
-+struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb);
-+#ifdef CONFIG_SYN_COOKIES
-+u32 __cookie_v6_init_sequence(const struct ipv6hdr *iph,
-+ const struct tcphdr *th, u16 *mssp);
-+__u32 cookie_v6_init_sequence(struct sock *sk, const struct sk_buff *skb,
-+ __u16 *mss);
-+#else
-+static inline __u32 cookie_v6_init_sequence(struct sock *sk,
-+ struct sk_buff *skb,
-+ __u16 *mss)
-+{
-+ return 0;
-+}
-+#endif
-+/* tcp_output.c */
-+
-+void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,
-+ int nonagle);
-+bool tcp_may_send_now(struct sock *sk);
-+int __tcp_retransmit_skb(struct sock *, struct sk_buff *);
-+int tcp_retransmit_skb(struct sock *, struct sk_buff *);
-+void tcp_retransmit_timer(struct sock *sk);
-+void tcp_xmit_retransmit_queue(struct sock *);
-+void tcp_simple_retransmit(struct sock *);
-+int tcp_trim_head(struct sock *, struct sk_buff *, u32);
-+int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
-+
-+void tcp_send_probe0(struct sock *);
-+void tcp_send_partial(struct sock *);
-+int tcp_write_wakeup(struct sock *);
-+void tcp_send_fin(struct sock *sk);
-+void tcp_send_active_reset(struct sock *sk, gfp_t priority);
-+int tcp_send_synack(struct sock *);
-+bool tcp_syn_flood_action(struct sock *sk, const struct sk_buff *skb,
-+ const char *proto);
-+void tcp_push_one(struct sock *, unsigned int mss_now);
-+void tcp_send_ack(struct sock *sk);
-+void tcp_send_delayed_ack(struct sock *sk);
-+void tcp_send_loss_probe(struct sock *sk);
-+bool tcp_schedule_loss_probe(struct sock *sk);
-+
-+/* tcp_input.c */
-+void tcp_cwnd_application_limited(struct sock *sk);
-+void tcp_resume_early_retransmit(struct sock *sk);
-+void tcp_rearm_rto(struct sock *sk);
-+void tcp_reset(struct sock *sk);
-+
-+/* tcp_timer.c */
-+void tcp_init_xmit_timers(struct sock *);
-+static inline void tcp_clear_xmit_timers(struct sock *sk)
-+{
-+ inet_csk_clear_xmit_timers(sk);
-+}
-+
-+unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu);
-+unsigned int tcp_current_mss(struct sock *sk);
-+
-+/* Bound MSS / TSO packet size with the half of the window */
-+static inline int tcp_bound_to_half_wnd(struct tcp_sock *tp, int pktsize)
-+{
-+ int cutoff;
-+
-+ /* When peer uses tiny windows, there is no use in packetizing
-+ * to sub-MSS pieces for the sake of SWS or making sure there
-+ * are enough packets in the pipe for fast recovery.
-+ *
-+ * On the other hand, for extremely large MSS devices, handling
-+ * smaller than MSS windows in this way does make sense.
-+ */
-+ if (tp->max_window >= 512)
-+ cutoff = (tp->max_window >> 1);
-+ else
-+ cutoff = tp->max_window;
-+
-+ if (cutoff && pktsize > cutoff)
-+ return max_t(int, cutoff, 68U - tp->tcp_header_len);
-+ else
-+ return pktsize;
-+}
-+
-+/* tcp.c */
-+void tcp_get_info(const struct sock *, struct tcp_info *);
-+
-+/* Read 'sendfile()'-style from a TCP socket */
-+typedef int (*sk_read_actor_t)(read_descriptor_t *, struct sk_buff *,
-+ unsigned int, size_t);
-+int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
-+ sk_read_actor_t recv_actor);
-+
-+void tcp_initialize_rcv_mss(struct sock *sk);
-+
-+int tcp_mtu_to_mss(struct sock *sk, int pmtu);
-+int tcp_mss_to_mtu(struct sock *sk, int mss);
-+void tcp_mtup_init(struct sock *sk);
-+void tcp_init_buffer_space(struct sock *sk);
-+
-+static inline void tcp_bound_rto(const struct sock *sk)
-+{
-+ if (inet_csk(sk)->icsk_rto > TCP_RTO_MAX)
-+ inet_csk(sk)->icsk_rto = TCP_RTO_MAX;
-+}
-+
-+static inline u32 __tcp_set_rto(const struct tcp_sock *tp)
-+{
-+ return usecs_to_jiffies((tp->srtt_us >> 3) + tp->rttvar_us);
-+}
-+
-+static inline void __tcp_fast_path_on(struct tcp_sock *tp, u32 snd_wnd)
-+{
-+ tp->pred_flags = htonl((tp->tcp_header_len << 26) |
-+ ntohl(TCP_FLAG_ACK) |
-+ snd_wnd);
-+}
-+
-+static inline void tcp_fast_path_on(struct tcp_sock *tp)
-+{
-+ __tcp_fast_path_on(tp, tp->snd_wnd >> tp->rx_opt.snd_wscale);
-+}
-+
-+static inline void tcp_fast_path_check(struct sock *sk)
-+{
-+ struct tcp_sock *tp = tcp_sk(sk);
-+
-+ if (skb_queue_empty(&tp->out_of_order_queue) &&
-+ tp->rcv_wnd &&
-+ atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf &&
-+ !tp->urg_data)
-+ tcp_fast_path_on(tp);
-+}
-+
-+/* Compute the actual rto_min value */
-+static inline u32 tcp_rto_min(struct sock *sk)
-+{
-+ const struct dst_entry *dst = __sk_dst_get(sk);
-+ u32 rto_min = TCP_RTO_MIN;
-+
-+ if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
-+ rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN);
-+ return rto_min;
-+}
-+
-+static inline u32 tcp_rto_min_us(struct sock *sk)
-+{
-+ return jiffies_to_usecs(tcp_rto_min(sk));
-+}
-+
-+/* Compute the actual receive window we are currently advertising.
-+ * Rcv_nxt can be after the window if our peer push more data
-+ * than the offered window.
-+ */
-+static inline u32 tcp_receive_window(const struct tcp_sock *tp)
-+{
-+ s32 win = tp->rcv_wup + tp->rcv_wnd - tp->rcv_nxt;
-+
-+ if (win < 0)
-+ win = 0;
-+ return (u32) win;
-+}
-+
-+/* Choose a new window, without checks for shrinking, and without
-+ * scaling applied to the result. The caller does these things
-+ * if necessary. This is a "raw" window selection.
-+ */
-+u32 __tcp_select_window(struct sock *sk);
-+
-+void tcp_send_window_probe(struct sock *sk);
-+
-+/* TCP timestamps are only 32-bits, this causes a slight
-+ * complication on 64-bit systems since we store a snapshot
-+ * of jiffies in the buffer control blocks below. We decided
-+ * to use only the low 32-bits of jiffies and hide the ugly
-+ * casts with the following macro.
-+ */
-+#define tcp_time_stamp ((__u32)(jiffies))
-+
-+#define tcp_flag_byte(th) (((u_int8_t *)th)[13])
-+
-+#define TCPHDR_FIN 0x01
-+#define TCPHDR_SYN 0x02
-+#define TCPHDR_RST 0x04
-+#define TCPHDR_PSH 0x08
-+#define TCPHDR_ACK 0x10
-+#define TCPHDR_URG 0x20
-+#define TCPHDR_ECE 0x40
-+#define TCPHDR_CWR 0x80
-+
-+/* This is what the send packet queuing engine uses to pass
-+ * TCP per-packet control information to the transmission code.
-+ * We also store the host-order sequence numbers in here too.
-+ * This is 44 bytes if IPV6 is enabled.
-+ * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
-+ */
-+struct tcp_skb_cb {
-+ union {
-+ struct inet_skb_parm h4;
-+#if IS_ENABLED(CONFIG_IPV6)
-+ struct inet6_skb_parm h6;
-+#endif
-+ } header; /* For incoming frames */
-+ __u32 seq; /* Starting sequence number */
-+ __u32 end_seq; /* SEQ + FIN + SYN + datalen */
-+ __u32 when; /* used to compute rtt's */
-+ __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
-+
-+ __u8 sacked; /* State flags for SACK/FACK. */
-+#define TCPCB_SACKED_ACKED 0x01 /* SKB ACK'd by a SACK block */
-+#define TCPCB_SACKED_RETRANS 0x02 /* SKB retransmitted */
-+#define TCPCB_LOST 0x04 /* SKB is lost */
-+#define TCPCB_TAGBITS 0x07 /* All tag bits */
-+#define TCPCB_EVER_RETRANS 0x80 /* Ever retransmitted frame */
-+#define TCPCB_RETRANS (TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS)
-+
-+ __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
-+ /* 1 byte hole */
-+ __u32 ack_seq; /* Sequence number ACK'd */
-+};
-+
-+#define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
-+
-+/* RFC3168 : 6.1.1 SYN packets must not have ECT/ECN bits set
-+ *
-+ * If we receive a SYN packet with these bits set, it means a network is
-+ * playing bad games with TOS bits. In order to avoid possible false congestion
-+ * notifications, we disable TCP ECN negociation.
-+ */
-+static inline void
-+TCP_ECN_create_request(struct request_sock *req, const struct sk_buff *skb,
-+ struct net *net)
-+{
-+ const struct tcphdr *th = tcp_hdr(skb);
-+
-+ if (net->ipv4.sysctl_tcp_ecn && th->ece && th->cwr &&
-+ INET_ECN_is_not_ect(TCP_SKB_CB(skb)->ip_dsfield))
-+ inet_rsk(req)->ecn_ok = 1;
-+}
-+
-+/* Due to TSO, an SKB can be composed of multiple actual
-+ * packets. To keep these tracked properly, we use this.
-+ */
-+static inline int tcp_skb_pcount(const struct sk_buff *skb)
-+{
-+ return skb_shinfo(skb)->gso_segs;
-+}
-+
-+/* This is valid iff tcp_skb_pcount() > 1. */
-+static inline int tcp_skb_mss(const struct sk_buff *skb)
-+{
-+ return skb_shinfo(skb)->gso_size;
-+}
-+
-+/* Events passed to congestion control interface */
-+enum tcp_ca_event {
-+ CA_EVENT_TX_START, /* first transmit when no packets in flight */
-+ CA_EVENT_CWND_RESTART, /* congestion window restart */
-+ CA_EVENT_COMPLETE_CWR, /* end of congestion recovery */
-+ CA_EVENT_LOSS, /* loss timeout */
-+ CA_EVENT_FAST_ACK, /* in sequence ack */
-+ CA_EVENT_SLOW_ACK, /* other ack */
-+};
-+
-+/*
-+ * Interface for adding new TCP congestion control handlers
-+ */
-+#define TCP_CA_NAME_MAX 16
-+#define TCP_CA_MAX 128
-+#define TCP_CA_BUF_MAX (TCP_CA_NAME_MAX*TCP_CA_MAX)
-+
-+#define TCP_CONG_NON_RESTRICTED 0x1
-+
-+struct tcp_congestion_ops {
-+ struct list_head list;
-+ unsigned long flags;
-+
-+ /* initialize private data (optional) */
-+ void (*init)(struct sock *sk);
-+ /* cleanup private data (optional) */
-+ void (*release)(struct sock *sk);
-+
-+ /* return slow start threshold (required) */
-+ u32 (*ssthresh)(struct sock *sk);
-+ /* do new cwnd calculation (required) */
-+ void (*cong_avoid)(struct sock *sk, u32 ack, u32 acked, u32 in_flight);
-+ /* call before changing ca_state (optional) */
-+ void (*set_state)(struct sock *sk, u8 new_state);
-+ /* call when cwnd event occurs (optional) */
-+ void (*cwnd_event)(struct sock *sk, enum tcp_ca_event ev);
-+ /* new value of cwnd after loss (optional) */
-+ u32 (*undo_cwnd)(struct sock *sk);
-+ /* hook for packet ack accounting (optional) */
-+ void (*pkts_acked)(struct sock *sk, u32 num_acked, s32 rtt_us);
-+ /* get info for inet_diag (optional) */
-+ void (*get_info)(struct sock *sk, u32 ext, struct sk_buff *skb);
-+
-+ char name[TCP_CA_NAME_MAX];
-+ struct module *owner;
-+};
-+
-+int tcp_register_congestion_control(struct tcp_congestion_ops *type);
-+void tcp_unregister_congestion_control(struct tcp_congestion_ops *type);
-+
-+void tcp_init_congestion_control(struct sock *sk);
-+void tcp_cleanup_congestion_control(struct sock *sk);
-+int tcp_set_default_congestion_control(const char *name);
-+void tcp_get_default_congestion_control(char *name);
-+void tcp_get_available_congestion_control(char *buf, size_t len);
-+void tcp_get_allowed_congestion_control(char *buf, size_t len);
-+int tcp_set_allowed_congestion_control(char *allowed);
-+int tcp_set_congestion_control(struct sock *sk, const char *name);
-+int tcp_slow_start(struct tcp_sock *tp, u32 acked);
-+void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w);
-+
-+extern struct tcp_congestion_ops tcp_init_congestion_ops;
-+u32 tcp_reno_ssthresh(struct sock *sk);
-+void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked, u32 in_flight);
-+extern struct tcp_congestion_ops tcp_reno;
-+
-+static inline void tcp_set_ca_state(struct sock *sk, const u8 ca_state)
-+{
-+ struct inet_connection_sock *icsk = inet_csk(sk);
-+
-+ if (icsk->icsk_ca_ops->set_state)
-+ icsk->icsk_ca_ops->set_state(sk, ca_state);
-+ icsk->icsk_ca_state = ca_state;
-+}
-+
-+static inline void tcp_ca_event(struct sock *sk, const enum tcp_ca_event event)
-+{
-+ const struct inet_connection_sock *icsk = inet_csk(sk);
-+
-+ if (icsk->icsk_ca_ops->cwnd_event)
-+ icsk->icsk_ca_ops->cwnd_event(sk, event);
-+}
-+
-+/* These functions determine how the current flow behaves in respect of SACK
-+ * handling. SACK is negotiated with the peer, and therefore it can vary
-+ * between different flows.
-+ *
-+ * tcp_is_sack - SACK enabled
-+ * tcp_is_reno - No SACK
-+ * tcp_is_fack - FACK enabled, implies SACK enabled
-+ */
-+static inline int tcp_is_sack(const struct tcp_sock *tp)
-+{
-+ return tp->rx_opt.sack_ok;
-+}
-+
-+static inline bool tcp_is_reno(const struct tcp_sock *tp)
-+{
-+ return !tcp_is_sack(tp);
-+}
-+
-+static inline bool tcp_is_fack(const struct tcp_sock *tp)
-+{
-+ return tp->rx_opt.sack_ok & TCP_FACK_ENABLED;
-+}
-+
-+static inline void tcp_enable_fack(struct tcp_sock *tp)
-+{
-+ tp->rx_opt.sack_ok |= TCP_FACK_ENABLED;
-+}
-+
-+/* TCP early-retransmit (ER) is similar to but more conservative than
-+ * the thin-dupack feature. Enable ER only if thin-dupack is disabled.
-+ */
-+static inline void tcp_enable_early_retrans(struct tcp_sock *tp)
-+{
-+ tp->do_early_retrans = sysctl_tcp_early_retrans &&
-+ sysctl_tcp_early_retrans < 4 && !sysctl_tcp_thin_dupack &&
-+ sysctl_tcp_reordering == 3;
-+}
-+
-+static inline void tcp_disable_early_retrans(struct tcp_sock *tp)
-+{
-+ tp->do_early_retrans = 0;
-+}
-+
-+static inline unsigned int tcp_left_out(const struct tcp_sock *tp)
-+{
-+ return tp->sacked_out + tp->lost_out;
-+}
-+
-+/* This determines how many packets are "in the network" to the best
-+ * of our knowledge. In many cases it is conservative, but where
-+ * detailed information is available from the receiver (via SACK
-+ * blocks etc.) we can make more aggressive calculations.
-+ *
-+ * Use this for decisions involving congestion control, use just
-+ * tp->packets_out to determine if the send queue is empty or not.
-+ *
-+ * Read this equation as:
-+ *
-+ * "Packets sent once on transmission queue" MINUS
-+ * "Packets left network, but not honestly ACKed yet" PLUS
-+ * "Packets fast retransmitted"
-+ */
-+static inline unsigned int tcp_packets_in_flight(const struct tcp_sock *tp)
-+{
-+ return tp->packets_out - tcp_left_out(tp) + tp->retrans_out;
-+}
-+
-+#define TCP_INFINITE_SSTHRESH 0x7fffffff
-+
-+static inline bool tcp_in_initial_slowstart(const struct tcp_sock *tp)
-+{
-+ return tp->snd_ssthresh >= TCP_INFINITE_SSTHRESH;
-+}
-+
-+static inline bool tcp_in_cwnd_reduction(const struct sock *sk)
-+{
-+ return (TCPF_CA_CWR | TCPF_CA_Recovery) &
-+ (1 << inet_csk(sk)->icsk_ca_state);
-+}
-+
-+/* If cwnd > ssthresh, we may raise ssthresh to be half-way to cwnd.
-+ * The exception is cwnd reduction phase, when cwnd is decreasing towards
-+ * ssthresh.
-+ */
-+static inline __u32 tcp_current_ssthresh(const struct sock *sk)
-+{
-+ const struct tcp_sock *tp = tcp_sk(sk);
-+
-+ if (tcp_in_cwnd_reduction(sk))
-+ return tp->snd_ssthresh;
-+ else
-+ return max(tp->snd_ssthresh,
-+ ((tp->snd_cwnd >> 1) +
-+ (tp->snd_cwnd >> 2)));
-+}
-+
-+/* Use define here intentionally to get WARN_ON location shown at the caller */
-+#define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out)
-+
-+void tcp_enter_cwr(struct sock *sk, const int set_ssthresh);
-+__u32 tcp_init_cwnd(const struct tcp_sock *tp, const struct dst_entry *dst);
-+
-+/* The maximum number of MSS of available cwnd for which TSO defers
-+ * sending if not using sysctl_tcp_tso_win_divisor.
-+ */
-+static inline __u32 tcp_max_tso_deferred_mss(const struct tcp_sock *tp)
-+{
-+ return 3;
-+}
-+
-+/* Slow start with delack produces 3 packets of burst, so that
-+ * it is safe "de facto". This will be the default - same as
-+ * the default reordering threshold - but if reordering increases,
-+ * we must be able to allow cwnd to burst at least this much in order
-+ * to not pull it back when holes are filled.
-+ */
-+static __inline__ __u32 tcp_max_burst(const struct tcp_sock *tp)
-+{
-+ return tp->reordering;
-+}
-+
-+/* Returns end sequence number of the receiver's advertised window */
-+static inline u32 tcp_wnd_end(const struct tcp_sock *tp)
-+{
-+ return tp->snd_una + tp->snd_wnd;
-+}
-+bool tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight);
-+
-+static inline void tcp_check_probe_timer(struct sock *sk)
-+{
-+ const struct tcp_sock *tp = tcp_sk(sk);
-+ const struct inet_connection_sock *icsk = inet_csk(sk);
-+
-+ if (!tp->packets_out && !icsk->icsk_pending)
-+ inet_csk_reset_xmit_timer(sk, ICSK_TIME_PROBE0,
-+ icsk->icsk_rto, TCP_RTO_MAX);
-+}
-+
-+static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq)
-+{
-+ tp->snd_wl1 = seq;
-+}
-+
-+static inline void tcp_update_wl(struct tcp_sock *tp, u32 seq)
-+{
-+ tp->snd_wl1 = seq;
-+}
-+
-+/*
-+ * Calculate(/check) TCP checksum
-+ */
-+static inline __sum16 tcp_v4_check(int len, __be32 saddr,
-+ __be32 daddr, __wsum base)
-+{
-+ return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
-+}
-+
-+static inline __sum16 __tcp_checksum_complete(struct sk_buff *skb)
-+{
-+ return __skb_checksum_complete(skb);
-+}
-+
-+static inline bool tcp_checksum_complete(struct sk_buff *skb)
-+{
-+ return !skb_csum_unnecessary(skb) &&
-+ __tcp_checksum_complete(skb);
-+}
-+
-+/* Prequeue for VJ style copy to user, combined with checksumming. */
-+
-+static inline void tcp_prequeue_init(struct tcp_sock *tp)
-+{
-+ tp->ucopy.task = NULL;
-+ tp->ucopy.len = 0;
-+ tp->ucopy.memory = 0;
-+ skb_queue_head_init(&tp->ucopy.prequeue);
-+#ifdef CONFIG_NET_DMA
-+ tp->ucopy.dma_chan = NULL;
-+ tp->ucopy.wakeup = 0;
-+ tp->ucopy.pinned_list = NULL;
-+ tp->ucopy.dma_cookie = 0;
-+#endif
-+}
-+
-+bool tcp_prequeue(struct sock *sk, struct sk_buff *skb);
-+
-+#undef STATE_TRACE
-+
-+#ifdef STATE_TRACE
-+static const char *statename[]={
-+ "Unused","Established","Syn Sent","Syn Recv",
-+ "Fin Wait 1","Fin Wait 2","Time Wait", "Close",
-+ "Close Wait","Last ACK","Listen","Closing"
-+};
-+#endif
-+void tcp_set_state(struct sock *sk, int state);
-+
-+void tcp_done(struct sock *sk);
-+
-+static inline void tcp_sack_reset(struct tcp_options_received *rx_opt)
-+{
-+ rx_opt->dsack = 0;
-+ rx_opt->num_sacks = 0;
-+}
-+
-+u32 tcp_default_init_rwnd(u32 mss);
-+
-+/* Determine a window scaling and initial window to offer. */
-+void tcp_select_initial_window(int __space, __u32 mss, __u32 *rcv_wnd,
-+ __u32 *window_clamp, int wscale_ok,
-+ __u8 *rcv_wscale, __u32 init_rcv_wnd);
-+
-+static inline int tcp_win_from_space(int space)
-+{
-+ return sysctl_tcp_adv_win_scale<=0 ?
-+ (space>>(-sysctl_tcp_adv_win_scale)) :
-+ space - (space>>sysctl_tcp_adv_win_scale);
-+}
-+
-+/* Note: caller must be prepared to deal with negative returns */
-+static inline int tcp_space(const struct sock *sk)
-+{
-+ return tcp_win_from_space(sk->sk_rcvbuf -
-+ atomic_read(&sk->sk_rmem_alloc));
-+}
-+
-+static inline int tcp_full_space(const struct sock *sk)
-+{
-+ return tcp_win_from_space(sk->sk_rcvbuf);
-+}
-+
-+static inline void tcp_openreq_init(struct request_sock *req,
-+ struct tcp_options_received *rx_opt,
-+ struct sk_buff *skb)
-+{
-+ struct inet_request_sock *ireq = inet_rsk(req);
-+
-+ req->rcv_wnd = 0; /* So that tcp_send_synack() knows! */
-+ req->cookie_ts = 0;
-+ tcp_rsk(req)->rcv_isn = TCP_SKB_CB(skb)->seq;
-+ tcp_rsk(req)->rcv_nxt = TCP_SKB_CB(skb)->seq + 1;
-+ tcp_rsk(req)->snt_synack = 0;
-+ req->mss = rx_opt->mss_clamp;
-+ req->ts_recent = rx_opt->saw_tstamp ? rx_opt->rcv_tsval : 0;
-+ ireq->tstamp_ok = rx_opt->tstamp_ok;
-+ ireq->sack_ok = rx_opt->sack_ok;
-+ ireq->snd_wscale = rx_opt->snd_wscale;
-+ ireq->wscale_ok = rx_opt->wscale_ok;
-+ ireq->acked = 0;
-+ ireq->ecn_ok = 0;
-+ ireq->ir_rmt_port = tcp_hdr(skb)->source;
-+ ireq->ir_num = ntohs(tcp_hdr(skb)->dest);
-+}
-+
-+void tcp_enter_memory_pressure(struct sock *sk);
-+
-+static inline int keepalive_intvl_when(const struct tcp_sock *tp)
-+{
-+ return tp->keepalive_intvl ? : sysctl_tcp_keepalive_intvl;
-+}
-+
-+static inline int keepalive_time_when(const struct tcp_sock *tp)
-+{
-+ return tp->keepalive_time ? : sysctl_tcp_keepalive_time;
-+}
-+
-+static inline int keepalive_probes(const struct tcp_sock *tp)
-+{
-+ return tp->keepalive_probes ? : sysctl_tcp_keepalive_probes;
-+}
-+
-+static inline u32 keepalive_time_elapsed(const struct tcp_sock *tp)
-+{
-+ const struct inet_connection_sock *icsk = &tp->inet_conn;
-+
-+ return min_t(u32, tcp_time_stamp - icsk->icsk_ack.lrcvtime,
-+ tcp_time_stamp - tp->rcv_tstamp);
-+}
-+
-+static inline int tcp_fin_time(const struct sock *sk)
-+{
-+ int fin_timeout = tcp_sk(sk)->linger2 ? : sysctl_tcp_fin_timeout;
-+ const int rto = inet_csk(sk)->icsk_rto;
-+
-+ if (fin_timeout < (rto << 2) - (rto >> 1))
-+ fin_timeout = (rto << 2) - (rto >> 1);
-+
-+ return fin_timeout;
-+}
-+
-+static inline bool tcp_paws_check(const struct tcp_options_received *rx_opt,
-+ int paws_win)
-+{
-+ if ((s32)(rx_opt->ts_recent - rx_opt->rcv_tsval) <= paws_win)
-+ return true;
-+ if (unlikely(get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_24DAYS))
-+ return true;
-+ /*
-+ * Some OSes send SYN and SYNACK messages with tsval=0 tsecr=0,
-+ * then following tcp messages have valid values. Ignore 0 value,
-+ * or else 'negative' tsval might forbid us to accept their packets.
-+ */
-+ if (!rx_opt->ts_recent)
-+ return true;
-+ return false;
-+}
-+
-+static inline bool tcp_paws_reject(const struct tcp_options_received *rx_opt,
-+ int rst)
-+{
-+ if (tcp_paws_check(rx_opt, 0))
-+ return false;
-+
-+ /* RST segments are not recommended to carry timestamp,
-+ and, if they do, it is recommended to ignore PAWS because
-+ "their cleanup function should take precedence over timestamps."
-+ Certainly, it is mistake. It is necessary to understand the reasons
-+ of this constraint to relax it: if peer reboots, clock may go
-+ out-of-sync and half-open connections will not be reset.
-+ Actually, the problem would be not existing if all
-+ the implementations followed draft about maintaining clock
-+ via reboots. Linux-2.2 DOES NOT!
-+
-+ However, we can relax time bounds for RST segments to MSL.
-+ */
-+ if (rst && get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_MSL)
-+ return false;
-+ return true;
-+}
-+
-+static inline void tcp_mib_init(struct net *net)
-+{
-+ /* See RFC 2012 */
-+ TCP_ADD_STATS_USER(net, TCP_MIB_RTOALGORITHM, 1);
-+ TCP_ADD_STATS_USER(net, TCP_MIB_RTOMIN, TCP_RTO_MIN*1000/HZ);
-+ TCP_ADD_STATS_USER(net, TCP_MIB_RTOMAX, TCP_RTO_MAX*1000/HZ);
-+ TCP_ADD_STATS_USER(net, TCP_MIB_MAXCONN, -1);
-+}
-+
-+/* from STCP */
-+static inline void tcp_clear_retrans_hints_partial(struct tcp_sock *tp)
-+{
-+ tp->lost_skb_hint = NULL;
-+}
-+
-+static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp)
-+{
-+ tcp_clear_retrans_hints_partial(tp);
-+ tp->retransmit_skb_hint = NULL;
-+}
-+
-+/* MD5 Signature */
-+struct crypto_hash;
-+
-+union tcp_md5_addr {
-+ struct in_addr a4;
-+#if IS_ENABLED(CONFIG_IPV6)
-+ struct in6_addr a6;
-+#endif
-+};
-+
-+/* - key database */
-+struct tcp_md5sig_key {
-+ struct hlist_node node;
-+ u8 keylen;
-+ u8 family; /* AF_INET or AF_INET6 */
-+ union tcp_md5_addr addr;
-+ u8 key[TCP_MD5SIG_MAXKEYLEN];
-+ struct rcu_head rcu;
-+};
-+
-+/* - sock block */
-+struct tcp_md5sig_info {
-+ struct hlist_head head;
-+ struct rcu_head rcu;
-+};
-+
-+/* - pseudo header */
-+struct tcp4_pseudohdr {
-+ __be32 saddr;
-+ __be32 daddr;
-+ __u8 pad;
-+ __u8 protocol;
-+ __be16 len;
-+};
-+
-+struct tcp6_pseudohdr {
-+ struct in6_addr saddr;
-+ struct in6_addr daddr;
-+ __be32 len;
-+ __be32 protocol; /* including padding */
-+};
-+
-+union tcp_md5sum_block {
-+ struct tcp4_pseudohdr ip4;
-+#if IS_ENABLED(CONFIG_IPV6)
-+ struct tcp6_pseudohdr ip6;
-+#endif
-+};
-+
-+/* - pool: digest algorithm, hash description and scratch buffer */
-+struct tcp_md5sig_pool {
-+ struct hash_desc md5_desc;
-+ union tcp_md5sum_block md5_blk;
-+};
-+
-+/* - functions */
-+int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,
-+ const struct sock *sk, const struct request_sock *req,
-+ const struct sk_buff *skb);
-+int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,
-+ int family, const u8 *newkey, u8 newkeylen, gfp_t gfp);
-+int tcp_md5_do_del(struct sock *sk, const union tcp_md5_addr *addr,
-+ int family);
-+struct tcp_md5sig_key *tcp_v4_md5_lookup(struct sock *sk,
-+ struct sock *addr_sk);
-+
-+#ifdef CONFIG_TCP_MD5SIG
-+struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
-+ const union tcp_md5_addr *addr,
-+ int family);
-+#define tcp_twsk_md5_key(twsk) ((twsk)->tw_md5_key)
-+#else
-+static inline struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
-+ const union tcp_md5_addr *addr,
-+ int family)
-+{
-+ return NULL;
-+}
-+#define tcp_twsk_md5_key(twsk) NULL
-+#endif
-+
-+bool tcp_alloc_md5sig_pool(void);
-+
-+struct tcp_md5sig_pool *tcp_get_md5sig_pool(void);
-+static inline void tcp_put_md5sig_pool(void)
-+{
-+ local_bh_enable();
-+}
-+
-+int tcp_md5_hash_header(struct tcp_md5sig_pool *, const struct tcphdr *);
-+int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, const struct sk_buff *,
-+ unsigned int header_len);
-+int tcp_md5_hash_key(struct tcp_md5sig_pool *hp,
-+ const struct tcp_md5sig_key *key);
-+
-+/* From tcp_fastopen.c */
-+void tcp_fastopen_cache_get(struct sock *sk, u16 *mss,
-+ struct tcp_fastopen_cookie *cookie, int *syn_loss,
-+ unsigned long *last_syn_loss);
-+void tcp_fastopen_cache_set(struct sock *sk, u16 mss,
-+ struct tcp_fastopen_cookie *cookie, bool syn_lost);
-+struct tcp_fastopen_request {
-+ /* Fast Open cookie. Size 0 means a cookie request */
-+ struct tcp_fastopen_cookie cookie;
-+ struct msghdr *data; /* data in MSG_FASTOPEN */
-+ size_t size;
-+ int copied; /* queued in tcp_connect() */
-+};
-+void tcp_free_fastopen_req(struct tcp_sock *tp);
-+
-+extern struct tcp_fastopen_context __rcu *tcp_fastopen_ctx;
-+int tcp_fastopen_reset_cipher(void *key, unsigned int len);
-+void tcp_fastopen_cookie_gen(__be32 src, __be32 dst,
-+ struct tcp_fastopen_cookie *foc);
-+void tcp_fastopen_init_key_once(bool publish);
-+#define TCP_FASTOPEN_KEY_LENGTH 16
-+
-+/* Fastopen key context */
-+struct tcp_fastopen_context {
-+ struct crypto_cipher *tfm;
-+ __u8 key[TCP_FASTOPEN_KEY_LENGTH];
-+ struct rcu_head rcu;
-+};
-+
-+/* write queue abstraction */
-+static inline void tcp_write_queue_purge(struct sock *sk)
-+{
-+ struct sk_buff *skb;
-+
-+ while ((skb = __skb_dequeue(&sk->sk_write_queue)) != NULL)
-+ sk_wmem_free_skb(sk, skb);
-+ sk_mem_reclaim(sk);
-+ tcp_clear_all_retrans_hints(tcp_sk(sk));
-+}
-+
-+static inline struct sk_buff *tcp_write_queue_head(const struct sock *sk)
-+{
-+ return skb_peek(&sk->sk_write_queue);
-+}
-+
-+static inline struct sk_buff *tcp_write_queue_tail(const struct sock *sk)
-+{
-+ return skb_peek_tail(&sk->sk_write_queue);
-+}
-+
-+static inline struct sk_buff *tcp_write_queue_next(const struct sock *sk,
-+ const struct sk_buff *skb)
-+{
-+ return skb_queue_next(&sk->sk_write_queue, skb);
-+}
-+
-+static inline struct sk_buff *tcp_write_queue_prev(const struct sock *sk,
-+ const struct sk_buff *skb)
-+{
-+ return skb_queue_prev(&sk->sk_write_queue, skb);
-+}
-+
-+#define tcp_for_write_queue(skb, sk) \
-+ skb_queue_walk(&(sk)->sk_write_queue, skb)
-+
-+#define tcp_for_write_queue_from(skb, sk) \
-+ skb_queue_walk_from(&(sk)->sk_write_queue, skb)
-+
-+#define tcp_for_write_queue_from_safe(skb, tmp, sk) \
-+ skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp)
-+
-+static inline struct sk_buff *tcp_send_head(const struct sock *sk)
-+{
-+ return sk->sk_send_head;
-+}
-+
-+static inline bool tcp_skb_is_last(const struct sock *sk,
-+ const struct sk_buff *skb)
-+{
-+ return skb_queue_is_last(&sk->sk_write_queue, skb);
-+}
-+
-+static inline void tcp_advance_send_head(struct sock *sk, const struct sk_buff *skb)
-+{
-+ if (tcp_skb_is_last(sk, skb))
-+ sk->sk_send_head = NULL;
-+ else
-+ sk->sk_send_head = tcp_write_queue_next(sk, skb);
-+}
-+
-+static inline void tcp_check_send_head(struct sock *sk, struct sk_buff *skb_unlinked)
-+{
-+ if (sk->sk_send_head == skb_unlinked)
-+ sk->sk_send_head = NULL;
-+}
-+
-+static inline void tcp_init_send_head(struct sock *sk)
-+{
-+ sk->sk_send_head = NULL;
-+}
-+
-+static inline void __tcp_add_write_queue_tail(struct sock *sk, struct sk_buff *skb)
-+{
-+ __skb_queue_tail(&sk->sk_write_queue, skb);
-+}
-+
-+static inline void tcp_add_write_queue_tail(struct sock *sk, struct sk_buff *skb)
-+{
-+ __tcp_add_write_queue_tail(sk, skb);
-+
-+ /* Queue it, remembering where we must start sending. */
-+ if (sk->sk_send_head == NULL) {
-+ sk->sk_send_head = skb;
-+
-+ if (tcp_sk(sk)->highest_sack == NULL)
-+ tcp_sk(sk)->highest_sack = skb;
-+ }
-+}
-+
-+static inline void __tcp_add_write_queue_head(struct sock *sk, struct sk_buff *skb)
-+{
-+ __skb_queue_head(&sk->sk_write_queue, skb);
-+}
-+
-+/* Insert buff after skb on the write queue of sk. */
-+static inline void tcp_insert_write_queue_after(struct sk_buff *skb,
-+ struct sk_buff *buff,
-+ struct sock *sk)
-+{
-+ __skb_queue_after(&sk->sk_write_queue, skb, buff);
-+}
-+
-+/* Insert new before skb on the write queue of sk. */
-+static inline void tcp_insert_write_queue_before(struct sk_buff *new,
-+ struct sk_buff *skb,
-+ struct sock *sk)
-+{
-+ __skb_queue_before(&sk->sk_write_queue, skb, new);
-+
-+ if (sk->sk_send_head == skb)
-+ sk->sk_send_head = new;
-+}
-+
-+static inline void tcp_unlink_write_queue(struct sk_buff *skb, struct sock *sk)
-+{
-+ __skb_unlink(skb, &sk->sk_write_queue);
-+}
-+
-+static inline bool tcp_write_queue_empty(struct sock *sk)
-+{
-+ return skb_queue_empty(&sk->sk_write_queue);
-+}
-+
-+static inline void tcp_push_pending_frames(struct sock *sk)
-+{
-+ if (tcp_send_head(sk)) {
-+ struct tcp_sock *tp = tcp_sk(sk);
-+
-+ __tcp_push_pending_frames(sk, tcp_current_mss(sk), tp->nonagle);
-+ }
-+}
-+
-+/* Start sequence of the skb just after the highest skb with SACKed
-+ * bit, valid only if sacked_out > 0 or when the caller has ensured
-+ * validity by itself.
-+ */
-+static inline u32 tcp_highest_sack_seq(struct tcp_sock *tp)
-+{
-+ if (!tp->sacked_out)
-+ return tp->snd_una;
-+
-+ if (tp->highest_sack == NULL)
-+ return tp->snd_nxt;
-+
-+ return TCP_SKB_CB(tp->highest_sack)->seq;
-+}
-+
-+static inline void tcp_advance_highest_sack(struct sock *sk, struct sk_buff *skb)
-+{
-+ tcp_sk(sk)->highest_sack = tcp_skb_is_last(sk, skb) ? NULL :
-+ tcp_write_queue_next(sk, skb);
-+}
-+
-+static inline struct sk_buff *tcp_highest_sack(struct sock *sk)
-+{
-+ return tcp_sk(sk)->highest_sack;
-+}
-+
-+static inline void tcp_highest_sack_reset(struct sock *sk)
-+{
-+ tcp_sk(sk)->highest_sack = tcp_write_queue_head(sk);
-+}
-+
-+/* Called when old skb is about to be deleted (to be combined with new skb) */
-+static inline void tcp_highest_sack_combine(struct sock *sk,
-+ struct sk_buff *old,
-+ struct sk_buff *new)
-+{
-+ if (tcp_sk(sk)->sacked_out && (old == tcp_sk(sk)->highest_sack))
-+ tcp_sk(sk)->highest_sack = new;
-+}
-+
-+/* Determines whether this is a thin stream (which may suffer from
-+ * increased latency). Used to trigger latency-reducing mechanisms.
-+ */
-+static inline bool tcp_stream_is_thin(struct tcp_sock *tp)
-+{
-+ return tp->packets_out < 4 && !tcp_in_initial_slowstart(tp);
-+}
-+
-+/* /proc */
-+enum tcp_seq_states {
-+ TCP_SEQ_STATE_LISTENING,
-+ TCP_SEQ_STATE_OPENREQ,
-+ TCP_SEQ_STATE_ESTABLISHED,
-+};
-+
-+int tcp_seq_open(struct inode *inode, struct file *file);
-+
-+struct tcp_seq_afinfo {
-+ char *name;
-+ sa_family_t family;
-+ const struct file_operations *seq_fops;
-+ struct seq_operations seq_ops;
-+};
-+
-+struct tcp_iter_state {
-+ struct seq_net_private p;
-+ sa_family_t family;
-+ enum tcp_seq_states state;
-+ struct sock *syn_wait_sk;
-+ int bucket, offset, sbucket, num;
-+ kuid_t uid;
-+ loff_t last_pos;
-+};
-+
-+int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo);
-+void tcp_proc_unregister(struct net *net, struct tcp_seq_afinfo *afinfo);
-+
-+extern struct request_sock_ops tcp_request_sock_ops;
-+extern struct request_sock_ops tcp6_request_sock_ops;
-+
-+void tcp_v4_destroy_sock(struct sock *sk);
-+
-+struct sk_buff *tcp_gso_segment(struct sk_buff *skb,
-+ netdev_features_t features);
-+struct sk_buff **tcp_gro_receive(struct sk_buff **head, struct sk_buff *skb);
-+int tcp_gro_complete(struct sk_buff *skb);
-+
-+void __tcp_v4_send_check(struct sk_buff *skb, __be32 saddr, __be32 daddr);
-+
-+static inline u32 tcp_notsent_lowat(const struct tcp_sock *tp)
-+{
-+ return tp->notsent_lowat ?: sysctl_tcp_notsent_lowat;
-+}
-+
-+static inline bool tcp_stream_memory_free(const struct sock *sk)
-+{
-+ const struct tcp_sock *tp = tcp_sk(sk);
-+ u32 notsent_bytes = tp->write_seq - tp->snd_nxt;
-+
-+ return notsent_bytes < tcp_notsent_lowat(tp);
-+}
-+
-+#ifdef CONFIG_PROC_FS
-+int tcp4_proc_init(void);
-+void tcp4_proc_exit(void);
-+#endif
-+
-+/* TCP af-specific functions */
-+struct tcp_sock_af_ops {
-+#ifdef CONFIG_TCP_MD5SIG
-+ struct tcp_md5sig_key *(*md5_lookup) (struct sock *sk,
-+ struct sock *addr_sk);
-+ int (*calc_md5_hash) (char *location,
-+ struct tcp_md5sig_key *md5,
-+ const struct sock *sk,
-+ const struct request_sock *req,
-+ const struct sk_buff *skb);
-+ int (*md5_parse) (struct sock *sk,
-+ char __user *optval,
-+ int optlen);
-+#endif
-+};
-+
-+struct tcp_request_sock_ops {
-+#ifdef CONFIG_TCP_MD5SIG
-+ struct tcp_md5sig_key *(*md5_lookup) (struct sock *sk,
-+ struct request_sock *req);
-+ int (*calc_md5_hash) (char *location,
-+ struct tcp_md5sig_key *md5,
-+ const struct sock *sk,
-+ const struct request_sock *req,
-+ const struct sk_buff *skb);
-+#endif
-+};
-+
-+int tcpv4_offload_init(void);
-+
-+void tcp_v4_init(void);
-+void tcp_init(void);
-+
-+#endif /* _TCP_H */
-diff -Nur linux-3.15-rc7.orig/net/core/request_sock.c linux-3.15-rc7/net/core/request_sock.c
---- linux-3.15-rc7.orig/net/core/request_sock.c 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/net/core/request_sock.c 2014-05-31 22:42:49.028605326 +0200
-@@ -131,6 +131,7 @@
- kfree(lopt);
- }
-
-+#ifdef CONFIG_TCP_FASTOPEN
- /*
- * This function is called to set a Fast Open socket's "fastopen_rsk" field
- * to NULL when a TFO socket no longer needs to access the request_sock.
-@@ -222,3 +223,4 @@
- spin_unlock_bh(&fastopenq->lock);
- sock_put(lsk);
- }
-+#endif
-diff -Nur linux-3.15-rc7.orig/net/core/request_sock.c.orig linux-3.15-rc7/net/core/request_sock.c.orig
---- linux-3.15-rc7.orig/net/core/request_sock.c.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15-rc7/net/core/request_sock.c.orig 2014-05-26 01:06:00.000000000 +0200
-@@ -0,0 +1,224 @@
-+/*
-+ * NET Generic infrastructure for Network protocols.
-+ *
-+ * Authors: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ *
-+ * From code originally in include/net/tcp.h
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/random.h>
-+#include <linux/slab.h>
-+#include <linux/string.h>
-+#include <linux/tcp.h>
-+#include <linux/vmalloc.h>
-+
-+#include <net/request_sock.h>
-+
-+/*
-+ * Maximum number of SYN_RECV sockets in queue per LISTEN socket.
-+ * One SYN_RECV socket costs about 80bytes on a 32bit machine.
-+ * It would be better to replace it with a global counter for all sockets
-+ * but then some measure against one socket starving all other sockets
-+ * would be needed.
-+ *
-+ * The minimum value of it is 128. Experiments with real servers show that
-+ * it is absolutely not enough even at 100conn/sec. 256 cures most
-+ * of problems.
-+ * This value is adjusted to 128 for low memory machines,
-+ * and it will increase in proportion to the memory of machine.
-+ * Note : Dont forget somaxconn that may limit backlog too.
-+ */
-+int sysctl_max_syn_backlog = 256;
-+EXPORT_SYMBOL(sysctl_max_syn_backlog);
-+
-+int reqsk_queue_alloc(struct request_sock_queue *queue,
-+ unsigned int nr_table_entries)
-+{
-+ size_t lopt_size = sizeof(struct listen_sock);
-+ struct listen_sock *lopt;
-+
-+ nr_table_entries = min_t(u32, nr_table_entries, sysctl_max_syn_backlog);
-+ nr_table_entries = max_t(u32, nr_table_entries, 8);
-+ nr_table_entries = roundup_pow_of_two(nr_table_entries + 1);
-+ lopt_size += nr_table_entries * sizeof(struct request_sock *);
-+ if (lopt_size > PAGE_SIZE)
-+ lopt = vzalloc(lopt_size);
-+ else
-+ lopt = kzalloc(lopt_size, GFP_KERNEL);
-+ if (lopt == NULL)
-+ return -ENOMEM;
-+
-+ for (lopt->max_qlen_log = 3;
-+ (1 << lopt->max_qlen_log) < nr_table_entries;
-+ lopt->max_qlen_log++);
-+
-+ get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd));
-+ rwlock_init(&queue->syn_wait_lock);
-+ queue->rskq_accept_head = NULL;
-+ lopt->nr_table_entries = nr_table_entries;
-+
-+ write_lock_bh(&queue->syn_wait_lock);
-+ queue->listen_opt = lopt;
-+ write_unlock_bh(&queue->syn_wait_lock);
-+
-+ return 0;
-+}
-+
-+void __reqsk_queue_destroy(struct request_sock_queue *queue)
-+{
-+ struct listen_sock *lopt;
-+ size_t lopt_size;
-+
-+ /*
-+ * this is an error recovery path only
-+ * no locking needed and the lopt is not NULL
-+ */
-+
-+ lopt = queue->listen_opt;
-+ lopt_size = sizeof(struct listen_sock) +
-+ lopt->nr_table_entries * sizeof(struct request_sock *);
-+
-+ if (lopt_size > PAGE_SIZE)
-+ vfree(lopt);
-+ else
-+ kfree(lopt);
-+}
-+
-+static inline struct listen_sock *reqsk_queue_yank_listen_sk(
-+ struct request_sock_queue *queue)
-+{
-+ struct listen_sock *lopt;
-+
-+ write_lock_bh(&queue->syn_wait_lock);
-+ lopt = queue->listen_opt;
-+ queue->listen_opt = NULL;
-+ write_unlock_bh(&queue->syn_wait_lock);
-+
-+ return lopt;
-+}
-+
-+void reqsk_queue_destroy(struct request_sock_queue *queue)
-+{
-+ /* make all the listen_opt local to us */
-+ struct listen_sock *lopt = reqsk_queue_yank_listen_sk(queue);
-+ size_t lopt_size = sizeof(struct listen_sock) +
-+ lopt->nr_table_entries * sizeof(struct request_sock *);
-+
-+ if (lopt->qlen != 0) {
-+ unsigned int i;
-+
-+ for (i = 0; i < lopt->nr_table_entries; i++) {
-+ struct request_sock *req;
-+
-+ while ((req = lopt->syn_table[i]) != NULL) {
-+ lopt->syn_table[i] = req->dl_next;
-+ lopt->qlen--;
-+ reqsk_free(req);
-+ }
-+ }
-+ }
-+
-+ WARN_ON(lopt->qlen != 0);
-+ if (lopt_size > PAGE_SIZE)
-+ vfree(lopt);
-+ else
-+ kfree(lopt);
-+}
-+
-+/*
-+ * This function is called to set a Fast Open socket's "fastopen_rsk" field
-+ * to NULL when a TFO socket no longer needs to access the request_sock.
-+ * This happens only after 3WHS has been either completed or aborted (e.g.,
-+ * RST is received).
-+ *
-+ * Before TFO, a child socket is created only after 3WHS is completed,
-+ * hence it never needs to access the request_sock. things get a lot more
-+ * complex with TFO. A child socket, accepted or not, has to access its
-+ * request_sock for 3WHS processing, e.g., to retransmit SYN-ACK pkts,
-+ * until 3WHS is either completed or aborted. Afterwards the req will stay
-+ * until either the child socket is accepted, or in the rare case when the
-+ * listener is closed before the child is accepted.
-+ *
-+ * In short, a request socket is only freed after BOTH 3WHS has completed
-+ * (or aborted) and the child socket has been accepted (or listener closed).
-+ * When a child socket is accepted, its corresponding req->sk is set to
-+ * NULL since it's no longer needed. More importantly, "req->sk == NULL"
-+ * will be used by the code below to determine if a child socket has been
-+ * accepted or not, and the check is protected by the fastopenq->lock
-+ * described below.
-+ *
-+ * Note that fastopen_rsk is only accessed from the child socket's context
-+ * with its socket lock held. But a request_sock (req) can be accessed by
-+ * both its child socket through fastopen_rsk, and a listener socket through
-+ * icsk_accept_queue.rskq_accept_head. To protect the access a simple spin
-+ * lock per listener "icsk->icsk_accept_queue.fastopenq->lock" is created.
-+ * only in the rare case when both the listener and the child locks are held,
-+ * e.g., in inet_csk_listen_stop() do we not need to acquire the lock.
-+ * The lock also protects other fields such as fastopenq->qlen, which is
-+ * decremented by this function when fastopen_rsk is no longer needed.
-+ *
-+ * Note that another solution was to simply use the existing socket lock
-+ * from the listener. But first socket lock is difficult to use. It is not
-+ * a simple spin lock - one must consider sock_owned_by_user() and arrange
-+ * to use sk_add_backlog() stuff. But what really makes it infeasible is the
-+ * locking hierarchy violation. E.g., inet_csk_listen_stop() may try to
-+ * acquire a child's lock while holding listener's socket lock. A corner
-+ * case might also exist in tcp_v4_hnd_req() that will trigger this locking
-+ * order.
-+ *
-+ * When a TFO req is created, it needs to sock_hold its listener to prevent
-+ * the latter data structure from going away.
-+ *
-+ * This function also sets "treq->listener" to NULL and unreference listener
-+ * socket. treq->listener is used by the listener so it is protected by the
-+ * fastopenq->lock in this function.
-+ */
-+void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req,
-+ bool reset)
-+{
-+ struct sock *lsk = tcp_rsk(req)->listener;
-+ struct fastopen_queue *fastopenq =
-+ inet_csk(lsk)->icsk_accept_queue.fastopenq;
-+
-+ tcp_sk(sk)->fastopen_rsk = NULL;
-+ spin_lock_bh(&fastopenq->lock);
-+ fastopenq->qlen--;
-+ tcp_rsk(req)->listener = NULL;
-+ if (req->sk) /* the child socket hasn't been accepted yet */
-+ goto out;
-+
-+ if (!reset || lsk->sk_state != TCP_LISTEN) {
-+ /* If the listener has been closed don't bother with the
-+ * special RST handling below.
-+ */
-+ spin_unlock_bh(&fastopenq->lock);
-+ sock_put(lsk);
-+ reqsk_free(req);
-+ return;
-+ }
-+ /* Wait for 60secs before removing a req that has triggered RST.
-+ * This is a simple defense against TFO spoofing attack - by
-+ * counting the req against fastopen.max_qlen, and disabling
-+ * TFO when the qlen exceeds max_qlen.
-+ *
-+ * For more details see CoNext'11 "TCP Fast Open" paper.
-+ */
-+ req->expires = jiffies + 60*HZ;
-+ if (fastopenq->rskq_rst_head == NULL)
-+ fastopenq->rskq_rst_head = req;
-+ else
-+ fastopenq->rskq_rst_tail->dl_next = req;
-+
-+ req->dl_next = NULL;
-+ fastopenq->rskq_rst_tail = req;
-+ fastopenq->qlen++;
-+out:
-+ spin_unlock_bh(&fastopenq->lock);
-+ sock_put(lsk);
-+}
-diff -Nur linux-3.15-rc7.orig/net/ipv4/Kconfig linux-3.15-rc7/net/ipv4/Kconfig
---- linux-3.15-rc7.orig/net/ipv4/Kconfig 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/net/ipv4/Kconfig 2014-05-31 22:42:49.028605326 +0200
-@@ -307,6 +307,10 @@
- the notion of a secure tunnel for IPSEC and then use routing protocol
- on top.
-
-+config TCP_FASTOPEN
-+ bool "Enable TCP fastopen"
-+ default n
-+
- config INET_AH
- tristate "IP: AH transformation"
- select XFRM_ALGO
-diff -Nur linux-3.15-rc7.orig/net/ipv4/Makefile linux-3.15-rc7/net/ipv4/Makefile
---- linux-3.15-rc7.orig/net/ipv4/Makefile 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/net/ipv4/Makefile 2014-05-31 22:42:49.028605326 +0200
-@@ -7,7 +7,7 @@
- ip_output.o ip_sockglue.o inet_hashtables.o \
- inet_timewait_sock.o inet_connection_sock.o \
- tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o \
-- tcp_minisocks.o tcp_cong.o tcp_metrics.o tcp_fastopen.o \
-+ tcp_minisocks.o tcp_cong.o tcp_metrics.o \
- tcp_offload.o datagram.o raw.o udp.o udplite.o \
- udp_offload.o arp.o icmp.o devinet.o af_inet.o igmp.o \
- fib_frontend.o fib_semantics.o fib_trie.o \
-@@ -51,6 +51,7 @@
- obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
- obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
- obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
-+obj-$(CONFIG_TCP_FASTOPEN) += tcp_fastopen.o
- obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o
- obj-$(CONFIG_NETLABEL) += cipso_ipv4.o
-
-diff -Nur linux-3.15-rc7.orig/net/ipv4/sysctl_net_ipv4.c linux-3.15-rc7/net/ipv4/sysctl_net_ipv4.c
---- linux-3.15-rc7.orig/net/ipv4/sysctl_net_ipv4.c 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/net/ipv4/sysctl_net_ipv4.c 2014-05-31 22:42:49.028605326 +0200
-@@ -200,6 +200,7 @@
- return ret;
- }
-
-+#ifdef CONFIG_TCP_FASTOPEN
- static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
- void __user *buffer, size_t *lenp,
- loff_t *ppos)
-@@ -246,6 +247,7 @@
- kfree(tbl.data);
- return ret;
- }
-+#endif
-
- static struct ctl_table ipv4_table[] = {
- {
-@@ -388,6 +390,7 @@
- .proc_handler = proc_dointvec
- },
- #endif
-+#ifdef CONFIG_TCP_FASTOPEN
- {
- .procname = "tcp_fastopen",
- .data = &sysctl_tcp_fastopen,
-@@ -401,6 +404,7 @@
- .maxlen = ((TCP_FASTOPEN_KEY_LENGTH * 2) + 10),
- .proc_handler = proc_tcp_fastopen_key,
- },
-+#endif
- {
- .procname = "tcp_tw_recycle",
- .data = &tcp_death_row.sysctl_tw_recycle,
-diff -Nur linux-3.15-rc7.orig/net/ipv4/tcp.c linux-3.15-rc7/net/ipv4/tcp.c
---- linux-3.15-rc7.orig/net/ipv4/tcp.c 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/net/ipv4/tcp.c 2014-05-31 22:42:49.028605326 +0200
-@@ -1036,6 +1036,7 @@
- return tmp;
- }
-
-+#ifdef CONFIG_TCP_FASTOPEN
- void tcp_free_fastopen_req(struct tcp_sock *tp)
- {
- if (tp->fastopen_req != NULL) {
-@@ -1069,6 +1070,7 @@
- tcp_free_fastopen_req(tp);
- return err;
- }
-+#endif
-
- int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
- size_t size)
-@@ -1084,6 +1086,7 @@
- lock_sock(sk);
-
- flags = msg->msg_flags;
-+#ifdef CONFIG_TCP_FASTOPEN
- if (flags & MSG_FASTOPEN) {
- err = tcp_sendmsg_fastopen(sk, msg, &copied_syn, size);
- if (err == -EINPROGRESS && copied_syn > 0)
-@@ -1092,6 +1095,7 @@
- goto out_err;
- offset = copied_syn;
- }
-+#endif
-
- timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
-
-diff -Nur linux-3.15-rc7.orig/net/ipv4/tcp_ipv4.c linux-3.15-rc7/net/ipv4/tcp_ipv4.c
---- linux-3.15-rc7.orig/net/ipv4/tcp_ipv4.c 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/net/ipv4/tcp_ipv4.c 2014-05-31 22:42:49.032605359 +0200
-@@ -1260,6 +1260,7 @@
- };
- #endif
-
-+#ifdef CONFIG_TCP_FASTOPEN
- static bool tcp_fastopen_check(struct sock *sk, struct sk_buff *skb,
- struct request_sock *req,
- struct tcp_fastopen_cookie *foc,
-@@ -1440,6 +1441,23 @@
- WARN_ON(req->sk == NULL);
- return 0;
- }
-+#else
-+static bool tcp_fastopen_check(struct sock *sk, struct sk_buff *skb,
-+ struct request_sock *req,
-+ struct tcp_fastopen_cookie *foc,
-+ struct tcp_fastopen_cookie *valid_foc)
-+{
-+ return false;
-+}
-+
-+static int tcp_v4_conn_req_fastopen(struct sock *sk,
-+ struct sk_buff *skb,
-+ struct sk_buff *skb_synack,
-+ struct request_sock *req)
-+{
-+ return 0;
-+}
-+#endif
-
- int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
- {
-diff -Nur linux-3.15-rc7.orig/net/Kconfig linux-3.15-rc7/net/Kconfig
---- linux-3.15-rc7.orig/net/Kconfig 2014-05-26 01:06:00.000000000 +0200
-+++ linux-3.15-rc7/net/Kconfig 2014-05-31 22:42:49.028605326 +0200
-@@ -53,8 +53,8 @@
-
- config INET
- bool "TCP/IP networking"
-- select CRYPTO
-- select CRYPTO_AES
-+ select CRYPTO if TCP_FASTOPEN
-+ select CRYPTO_AES if TCP_FASTOPEN
- ---help---
- These are the protocols used on the Internet and on most local
- Ethernets. It is highly recommended to say Y here (this will enlarge
diff --git a/target/linux/patches/3.15-rc7/uuid.patch b/target/linux/patches/3.15-rc7/uuid.patch
deleted file mode 100644
index e8d523074..000000000
--- a/target/linux/patches/3.15-rc7/uuid.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-diff -Nur linux-3.14.1.orig/block/genhd.c linux-3.14.1/block/genhd.c
---- linux-3.14.1.orig/block/genhd.c 2014-04-14 15:50:10.000000000 +0200
-+++ linux-3.14.1/block/genhd.c 2014-04-24 09:50:05.281309701 +0200
-@@ -34,7 +34,7 @@
- static DEFINE_MUTEX(ext_devt_mutex);
- static DEFINE_IDR(ext_devt_idr);
-
--static struct device_type disk_type;
-+struct device_type disk_type;
-
- static void disk_check_events(struct disk_events *ev,
- unsigned int *clearing_ptr);
-@@ -1121,7 +1121,7 @@
- return NULL;
- }
-
--static struct device_type disk_type = {
-+struct device_type disk_type = {
- .name = "disk",
- .groups = disk_attr_groups,
- .release = disk_release,
-diff -Nur linux-3.14.1.orig/init/do_mounts.c linux-3.14.1/init/do_mounts.c
---- linux-3.14.1.orig/init/do_mounts.c 2014-04-14 15:50:10.000000000 +0200
-+++ linux-3.14.1/init/do_mounts.c 2014-04-24 10:17:54.043200973 +0200
-@@ -33,6 +33,7 @@
- #include <linux/nfs_fs_sb.h>
- #include <linux/nfs_mount.h>
-
-+#include "../fs/ext2/ext2.h"
- #include "do_mounts.h"
-
- int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */
-@@ -44,6 +45,132 @@
-
- dev_t ROOT_DEV;
-
-+#ifdef CONFIG_EXT2_FS
-+/* support for root=UUID=ce40d6b2-18eb-4a75-aefe-7ddb0995ce63 bootargs */
-+
-+#include <linux/ext2_fs.h>
-+
-+__u8 root_dev_uuid[16];
-+int root_dev_type; /* 0 = normal (/dev/hda1, 0301); 1 = UUID; 3 = bad */
-+
-+/* imported from block/genhd.c after removing its static qualifier */
-+extern struct device_type disk_type;
-+
-+/* helper function */
-+static __u8 __init fromhex(char c)
-+{
-+ if (c >= '0' && c <= '9')
-+ return (c - '0');
-+ c &= ~32;
-+ if (c >= 'A' && c <= 'F')
-+ return (c - 'A' + 10);
-+ return (0xFF);
-+}
-+
-+static void __init parse_uuid(const char *s)
-+{
-+ int i;
-+ __u8 j, k;
-+
-+ if (strlen(s) != 36 || s[8] != '-' || s[13] != '-' ||
-+ s[18] != '-' || s[23] != '-')
-+ goto bad_uuid;
-+ for (i = 0; i < 16; i++) {
-+ if (*s == '-')
-+ ++s;
-+ j = fromhex(*s++);
-+ k = fromhex(*s++);
-+ if (j == 0xFF || k == 0xFF)
-+ goto bad_uuid;
-+ root_dev_uuid[i] = (j << 4) | k;
-+ }
-+ return;
-+ bad_uuid:
-+ /* we cannot panic here, defer */
-+ root_dev_type = 3;
-+}
-+
-+/* from drivers/md/md.c */
-+static void __init initcode_bi_complete(struct bio *bio, int error)
-+{
-+ complete((struct completion*)bio->bi_private);
-+}
-+
-+static int __init initcode_sync_page_read(struct block_device *bdev,
-+ sector_t sector, int size, struct page *page)
-+{
-+ struct bio *bio = bio_alloc(GFP_NOIO, 1);
-+ struct completion event;
-+ int ret, rw = READ;
-+
-+ rw |= REQ_SYNC;
-+
-+ bio->bi_bdev = bdev;
-+ bio->bi_iter.bi_sector = sector;
-+ bio_add_page(bio, page, size, 0);
-+ init_completion(&event);
-+ bio->bi_private = &event;
-+ bio->bi_end_io = initcode_bi_complete;
-+ submit_bio(rw, bio);
-+ wait_for_completion(&event);
-+
-+ ret = test_bit(BIO_UPTODATE, &bio->bi_flags);
-+ bio_put(bio);
-+ /* 0 = failure */
-+ return ret;
-+}
-+
-+/* most of this taken from fs/ext2/super.c */
-+static int __init check_dev(struct gendisk *thedisk, dev_t devt,
-+ int blocksize, struct page *page)
-+{
-+ struct ext2_super_block * es;
-+ struct block_device *bdev;
-+ unsigned long sb_block = 1;
-+ unsigned long logic_sb_block;
-+ unsigned long offset = 0;
-+ int rv = /* not found */ 0;
-+ char bff[22];
-+
-+ bdev = bdget(devt);
-+ if (blkdev_get(bdev, FMODE_READ, NULL)) {
-+ printk(KERN_ERR "VFS: opening block device %s failed!\n",
-+ format_dev_t(bff, devt));
-+ return (0);
-+ }
-+
-+ if (blocksize != BLOCK_SIZE) {
-+ logic_sb_block = (sb_block*BLOCK_SIZE) / blocksize;
-+ offset = (sb_block*BLOCK_SIZE) % blocksize;
-+ } else {
-+ logic_sb_block = sb_block;
-+ }
-+
-+// printk(KERN_ERR "D: attempting to read %d @%lu from "
-+// "bdev %p devt %08X %s\n", blocksize, logic_sb_block,
-+// bdev, devt, format_dev_t(bff, devt));
-+ if (!initcode_sync_page_read(bdev, logic_sb_block, blocksize, page)) {
-+// printk(KERN_ERR "D: failed!\n");
-+ goto out;
-+ }
-+ es = (struct ext2_super_block *)(((char *)page_address(page)) + offset);
-+ if (le16_to_cpu(es->s_magic) == EXT2_SUPER_MAGIC) {
-+// printk(KERN_ERR "D: has uuid "
-+// "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X\n",
-+// es->s_uuid[0], es->s_uuid[1], es->s_uuid[2], es->s_uuid[3],
-+// es->s_uuid[4], es->s_uuid[5], es->s_uuid[6], es->s_uuid[7],
-+// es->s_uuid[8], es->s_uuid[9], es->s_uuid[10], es->s_uuid[11],
-+// es->s_uuid[12], es->s_uuid[13], es->s_uuid[14], es->s_uuid[15]);
-+ if (!memcmp(es->s_uuid, root_dev_uuid, 16))
-+ rv = /* found */ 1;
-+ }
-+// else printk(KERN_ERR "D: bad ext2fs magic\n");
-+ out:
-+ blkdev_put(bdev, FMODE_READ);
-+ return (rv);
-+}
-+#endif /* CONFIG_EXT2_FS for UUID support */
-+
- static int __init load_ramdisk(char *str)
- {
- rd_doload = simple_strtol(str,NULL,0) & 3;
-@@ -289,6 +416,13 @@
- static int __init root_dev_setup(char *line)
- {
- strlcpy(saved_root_name, line, sizeof(saved_root_name));
-+#ifdef CONFIG_EXT2_FS
-+ root_dev_type = 0;
-+ if (!strncmp(line, "UUID=", 5)) {
-+ root_dev_type = 1;
-+ parse_uuid(line + 5);
-+ }
-+#endif /* CONFIG_EXT2_FS for UUID support */
- return 1;
- }
-
-@@ -505,6 +639,83 @@
-
- void __init mount_root(void)
- {
-+#ifdef CONFIG_EXT2_FS
-+ /* UUID support */
-+// printk_all_partitions();
-+ if (root_dev_type == 1) {
-+ int blocksize;
-+
-+ /* from block/genhd.c printk_all_partitions */
-+ struct class_dev_iter iter;
-+ struct device *dev;
-+
-+ /* from drivers/md/md.c */
-+ struct page *sb_page;
-+
-+ if (!(sb_page = alloc_page(GFP_KERNEL))) {
-+ printk(KERN_ERR "VFS: no memory for bio page\n");
-+ goto nomemforbio;
-+ }
-+
-+// printk(KERN_ERR "D: root is: "
-+// "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X\n",
-+// root_dev_uuid[0], root_dev_uuid[1], root_dev_uuid[2], root_dev_uuid[3],
-+// root_dev_uuid[4], root_dev_uuid[5], root_dev_uuid[6], root_dev_uuid[7],
-+// root_dev_uuid[8], root_dev_uuid[9], root_dev_uuid[10], root_dev_uuid[11],
-+// root_dev_uuid[12], root_dev_uuid[13], root_dev_uuid[14], root_dev_uuid[15]);
-+ /* from block/genhd.c printk_all_partitions */
-+// printk(KERN_ERR "D: begin iter\n");
-+ class_dev_iter_init(&iter, &block_class, NULL, &disk_type);
-+ while (root_dev_type && (dev = class_dev_iter_next(&iter))) {
-+// char bff[22];
-+ struct gendisk *disk = dev_to_disk(dev);
-+ struct disk_part_iter piter;
-+ struct hd_struct *part;
-+ if (get_capacity(disk) == 0 ||
-+ (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)) {
-+// printk(KERN_ERR "D: ignoring\n");
-+ continue;
-+ }
-+ blocksize = queue_logical_block_size(disk->queue);
-+// printk(KERN_ERR "D: gendisk, blocksize %d "
-+// "name '%s' devt %08X %s #part %d\n", blocksize,
-+// disk->disk_name, dev->devt,
-+// format_dev_t(bff, dev->devt),
-+// disk_max_parts(disk));
-+ disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
-+ while (root_dev_type && (part = disk_part_iter_next(&piter))) {
-+ /* avoid empty or too small partitions */
-+// printk(KERN_ERR "D: part #%d start %llu "
-+// "nr %llu\n", part->partno,
-+// (__u64)part->start_sect,
-+// (__u64)part->nr_sects);
-+ if (part->nr_sects < 8)
-+ continue;
-+ if (check_dev(disk, MKDEV(MAJOR(dev->devt),
-+ MINOR(dev->devt) + part->partno),
-+ blocksize, sb_page)) {
-+ ROOT_DEV = part_devt(part);
-+// printk(KERN_ERR "D: got match!\n");
-+ // comment out below for debugging
-+ root_dev_type = 0;
-+ }
-+ }
-+ disk_part_iter_exit(&piter);
-+ }
-+// printk(KERN_ERR "D: end iter\n");
-+ class_dev_iter_exit(&iter);
-+ put_page(sb_page);
-+ }
-+ nomemforbio:
-+ if (root_dev_type == 1)
-+ printk(KERN_ERR "VFS: Unable to find root by UUID %s.\n",
-+ saved_root_name + 5);
-+ else if (root_dev_type == 3)
-+ /* execute deferred panic from parse_uuid */
-+ panic("Badly formatted UUID %s was supplied as kernel "
-+ "parameter root", saved_root_name + 5);
-+#endif /* CONFIG_EXT2_FS for UUID support */
-+
- #ifdef CONFIG_ROOT_NFS
- if (ROOT_DEV == Root_NFS) {
- if (mount_nfs_root())
diff --git a/target/linux/patches/3.15-rc7/wlan-cf.patch b/target/linux/patches/3.15-rc7/wlan-cf.patch
deleted file mode 100644
index fc20759e2..000000000
--- a/target/linux/patches/3.15-rc7/wlan-cf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-2.6.39.orig/drivers/net/wireless/hostap/hostap_cs.c linux-2.6.39/drivers/net/wireless/hostap/hostap_cs.c
---- linux-2.6.39.orig/drivers/net/wireless/hostap/hostap_cs.c 2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/drivers/net/wireless/hostap/hostap_cs.c 2011-09-12 02:46:26.987984145 +0200
-@@ -623,6 +623,7 @@
- static struct pcmcia_device_id hostap_cs_ids[] = {
- PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
- PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
-+ PCMCIA_DEVICE_MANF_CARD(0x0004, 0x2003),
- PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
- PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
- PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
diff --git a/target/linux/patches/3.15-rc7/xargs.patch b/target/linux/patches/3.15-rc7/xargs.patch
deleted file mode 100644
index 2c7b3df59..000000000
--- a/target/linux/patches/3.15-rc7/xargs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-3.12.6.orig/scripts/Makefile.modpost linux-3.12.6/scripts/Makefile.modpost
---- linux-3.12.6.orig/scripts/Makefile.modpost 2013-12-20 16:51:33.000000000 +0100
-+++ linux-3.12.6/scripts/Makefile.modpost 2014-01-25 14:55:33.000000000 +0100
-@@ -60,7 +60,7 @@
- modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
-
- # Step 1), find all modules listed in $(MODVERDIR)/
--MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u
-+MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs grep -h '\.ko$$' | sort -u
- __modules := $(shell $(MODLISTCMD))
- modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
-