generic-2.6: add kernel 2.6.35 preliminary support (patches)

SVN-Revision: 21696

diff --git a/target/linux/generic-2.6/config-2.6.35 b/target/linux/generic-2.6/config-2.6.35
new file mode 100644 (file)
index 0000000..6c8214a
--- /dev/null
+++ b/target/linux/generic-2.6/config-2.6.35
@@ -0,0 +1,2966 @@
+# CONFIG_6PACK is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_AB4500_CORE is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_ACENIC is not set
+# CONFIG_ACPI_POWER_METER is not set
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADM6996_PHY is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AGP is not set
+CONFIG_AIO=y
+# CONFIG_AIRO_CS is not set
+# CONFIG_AIRO is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_R8187SE is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ANDROID is not set
+CONFIG_ANON_INODES=y
+# CONFIG_APPLICOM is not set
+# CONFIG_AR8216_PHY is not set
+# CONFIG_AR9170_USB is not set
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5PC1XX is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCNET is not set
+# CONFIG_ARM_UNWIND is not set
+CONFIG_ARPD=y
+# CONFIG_ARTHUR is not set
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_AT24 is not set
+# CONFIG_AT76C50X_USB is not set
+# CONFIG_ATA_ACPI is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_ATA is not set
+# CONFIG_ATALK is not set
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_ATA_SFF=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL2 is not set
+# CONFIG_ATM_AMBASSADOR is not set
+CONFIG_ATM_BR2684_IPFILTER=y
+# CONFIG_ATM_BR2684 is not set
+# CONFIG_ATM_CLIP is not set
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATMEL is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_FORE200E_MAYBE is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_LANE is not set
+# CONFIG_ATM_MPOA is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_SOLOS is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_AUDIT is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AX25_DAMA_SLAVE is not set
+# CONFIG_AX25 is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B3DFG is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_B44 is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
+# CONFIG_BASLER_EXCITE is not set
+# CONFIG_BATTERY_BQ27000_HDQ is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+CONFIG_BCM43XX_DMA=y
+# CONFIG_BCM43XX is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
+CONFIG_BCM43XX_PIO=y
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_BLINK is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HD_ONLY is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_BLK_DEV=y
+CONFIG_BLOCK=y
+# CONFIG_BNX2 is not set
+# CONFIG_BONDING is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_BPQETHER is not set
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_EBT_802_3 is not set
+# CONFIG_BRIDGE_EBT_AMONG is not set
+# CONFIG_BRIDGE_EBT_ARP is not set
+# CONFIG_BRIDGE_EBT_ARPREPLY is not set
+# CONFIG_BRIDGE_EBT_BROUTE is not set
+# CONFIG_BRIDGE_EBT_DNAT is not set
+# CONFIG_BRIDGE_EBT_IP6 is not set
+# CONFIG_BRIDGE_EBT_IP is not set
+# CONFIG_BRIDGE_EBT_LIMIT is not set
+# CONFIG_BRIDGE_EBT_LOG is not set
+# CONFIG_BRIDGE_EBT_MARK is not set
+# CONFIG_BRIDGE_EBT_MARK_T is not set
+# CONFIG_BRIDGE_EBT_NFLOG is not set
+# CONFIG_BRIDGE_EBT_PKTTYPE is not set
+# CONFIG_BRIDGE_EBT_REDIRECT is not set
+# CONFIG_BRIDGE_EBT_SNAT is not set
+# CONFIG_BRIDGE_EBT_STP is not set
+# CONFIG_BRIDGE_EBT_T_FILTER is not set
+# CONFIG_BRIDGE_EBT_T_NAT is not set
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_BRIDGE_EBT_VLAN is not set
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BROADCOM_PHY is not set
+CONFIG_BROKEN_ON_SMP=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIUSB is not set
+CONFIG_BT_HCIUSB_SCO=y
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_HIDP is not set
+# CONFIG_BT is not set
+# CONFIG_BT_L2CAP is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_RFCOMM is not set
+CONFIG_BT_RFCOMM_TTY=y
+# CONFIG_BTRFS_FS is not set
+# CONFIG_BT_SCO is not set
+CONFIG_BUG=y
+# CONFIG_C2PORT is not set
+# CONFIG_CAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_CARDBUS=y
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_CASSINI is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CFG80211 is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_CIFS is not set
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CLASSIC_RCU=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_CLS_U32_PERF=y
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CNIC is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_COMEDI is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_COMPAT_NET_DEV_OPS=y
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_CONSTRUCTORS=y
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CROSSCOMPILE=y
+# CONFIG_CRYPTO_AEAD is not set
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_ALGAPI=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_BLKCIPHER is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_IFXMIPS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_FIPS is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_HASH is not set
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+# CONFIG_CRYPTO_MANAGER is not set
+CONFIG_CRYPTO_MANAGER_NO_TESTS=y
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+CONFIG_CRYPTO_PCOMP=y
+# CONFIG_CRYPTO_PRNG is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_TWOFISH_COMMON is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+CONFIG_CRYPTO_UNLZMA=y
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ZLIB=y
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CUSE is not set
+# CONFIG_DAB is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DCB is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_ERRORS is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DECNET is not set
+CONFIG_DECOMPRESS_LZMA_NEEDED=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_BIC is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_CUBIC is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_HTCP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_DEFAULT_NOOP is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="westwood"
+# CONFIG_DEFAULT_VEGAS is not set
+CONFIG_DEFAULT_WESTWOOD=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_DEVKMEM is not set
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DEVTMPFS_MOUNT is not set
+# CONFIG_DEVTMPFS is not set
+# CONFIG_DGRS is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DL2K is not set
+# CONFIG_DLM is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DMA_ENGINE is not set
+# CONFIG_DMASCC is not set
+# CONFIG_DMATEST is not set
+# CONFIG_DM_LOG_USERSPACE is not set
+# CONFIG_DNET is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_DRM is not set
+# CONFIG_DS1682 is not set
+# CONFIG_DST is not set
+# CONFIG_DT3155 is not set
+# CONFIG_DTLK is not set
+# CONFIG_DUMMY is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DVB is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000 is not set
+# CONFIG_E100 is not set
+# CONFIG_ECHO is not set
+# CONFIG_ECONET is not set
+# CONFIG_EDAC is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_EPIC100 is not set
+CONFIG_EPOLL=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ET131X is not set
+# CONFIG_ETHOC is not set
+CONFIG_EVENTFD=y
+# CONFIG_EVENT_TRACER is not set
+CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPORTFS is not set
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_DEBUG is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_USE_FOR_EXT23 is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_TARGETS=""
+# CONFIG_EZX_PCAP is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_FS is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_EARLYSUSPEND is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_GOLDFISH is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_PS3 is not set
+# CONFIG_FB_PXA is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FCOE_FNIC is not set
+# CONFIG_FCOE is not set
+# CONFIG_FDDI is not set
+# CONFIG_FEALNX is not set
+CONFIG_FIB_RULES=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FORCEDETH is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_FREEZER is not set
+# CONFIG_FSCACHE is not set
+CONFIG_FSNOTIFY=y
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_FTL is not set
+# CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_FUSE_FS is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SAS is not set
+# CONFIG_FUSION_SPI is not set
+CONFIG_FUTEX=y
+CONFIG_FW_LOADER=y
+CONFIG_GACT_PROB=y
+# CONFIG_GAMEPORT is not set
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_TIME=y
+# CONFIG_GIGASET_CAPI is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_DEVICE is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_HAMACHI is not set
+CONFIG_HAMRADIO=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_HAVE_MLOCK=y
+# CONFIG_HCALL_STATS is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_RAW_ETH is not set
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HECI is not set
+# CONFIG_HERMES is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HID_3M_PCT is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_BRIGHT is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_COMPAT is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HID_DELL is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_FF is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MOSART is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_STANTUM is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIPPI is not set
+# CONFIG_HOSTAP_CS is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_HOSTAP_PCI is not set
+# CONFIG_HOSTAP_PLX is not set
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HOTPLUG_PCI is not set
+CONFIG_HOTPLUG=y
+# CONFIG_HP100 is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_HVC_UDBG is not set
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
+CONFIG_HZ=100
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ_100=y
+# CONFIG_HZ_1024 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_48 is not set
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCA is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_CHARDEV is not set
+# CONFIG_I2C_COMPAT is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_IBM_IIC is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2O is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_IDE_GD is not set
+# CONFIG_IDE is not set
+CONFIG_IDE_MAX_HWIFS=4
+# CONFIG_IDEPCI_SHARE_IRQ is not set
+# CONFIG_IDE_PHISON is not set
+CONFIG_IDE_PROC_FS=y
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IEEE1394_DV1394 is not set
+# CONFIG_IEEE1394_ETH1394 is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_IEEE1394_OHCI1394 is not set
+# CONFIG_IEEE1394_PCILYNX is not set
+# CONFIG_IEEE1394_RAWIO is not set
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_VIDEO1394 is not set
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_IEEE80211_SOFTMAC is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_IFB is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IIO is not set
+# CONFIG_RAMZSWAP is not set
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IMAGE_CMDLINE_HACK is not set
+# CONFIG_IMQ_BEHAVIOR_AA is not set
+# CONFIG_IMQ_BEHAVIOR_AB is not set
+# CONFIG_IMQ_BEHAVIOR_BA is not set
+# CONFIG_IMQ_BEHAVIOR_BB is not set
+# CONFIG_IMQ is not set
+CONFIG_IMQ_NUM_DEVS=2
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_TCP_DIAG is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET=y
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFTL is not set
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+# CONFIG_INOTIFY is not set
+# CONFIG_INOTIFY_USER is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_MIMIO is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_WINBOND_CIR is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INSTRUMENTATION is not set
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IP1000 is not set
+# CONFIG_IP175C_PHY is not set
+# CONFIG_IP6_NF_FILTER is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_LIMIT is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_OWNER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_IMQ is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_TARGET_ROUTE is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IPC_NS is not set
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK=y
+CONFIG_IP_NF_CT_ACCT=y
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+# CONFIG_IP_NF_FILTER is not set
+# CONFIG_IP_NF_FTP is not set
+# CONFIG_IP_NF_H323 is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_IRC is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
+# CONFIG_IP_NF_MATCH_IPP2P is not set
+# CONFIG_IP_NF_MATCH_OWNER is not set
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_SET is not set
+# CONFIG_IP_NF_MATCH_TIME is not set
+# CONFIG_IP_NF_MATCH_TOS is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_NAT_AMANDA is not set
+# CONFIG_IP_NF_NAT_FTP is not set
+# CONFIG_IP_NF_NAT_H323 is not set
+# CONFIG_IP_NF_NAT_IRC is not set
+CONFIG_IP_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_NAT_PPTP is not set
+# CONFIG_IP_NF_NAT_SIP is not set
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+# CONFIG_IP_NF_NAT_TFTP is not set
+CONFIG_IP_NF_NAT=y
+# CONFIG_IP_NF_NETBIOS_NS is not set
+# CONFIG_IP_NF_PPTP is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+CONFIG_IP_NF_SET_HASHSIZE=1024
+# CONFIG_IP_NF_SET_IPHASH is not set
+# CONFIG_IP_NF_SET_IPMAP is not set
+# CONFIG_IP_NF_SET_IPPORTHASH is not set
+# CONFIG_IP_NF_SET_IPTREE is not set
+# CONFIG_IP_NF_SET_IPTREEMAP is not set
+# CONFIG_IP_NF_SET is not set
+# CONFIG_IP_NF_SET_MACIPMAP is not set
+CONFIG_IP_NF_SET_MAX=256
+# CONFIG_IP_NF_SET_NETHASH is not set
+# CONFIG_IP_NF_SET_PORTMAP is not set
+# CONFIG_IP_NF_SIP is not set
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_IMQ is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_ROUTE is not set
+# CONFIG_IP_NF_TARGET_SAME is not set
+# CONFIG_IP_NF_TARGET_SET is not set
+# CONFIG_IP_NF_TARGET_TOS is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_IP_PNP is not set
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
+# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
+# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
+# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_SCTP is not set
+CONFIG_IPSEC_NAT_TRAVERSAL=y
+# CONFIG_IPV6 is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTE_INFO is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_SIT_6RD is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IPW2100_DEBUG is not set
+# CONFIG_IPW2100 is not set
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW2200 is not set
+CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_PROMISCUOUS is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_RADIOTAP is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_IPX is not set
+# CONFIG_IRDA is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_ISCSI_TCP is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_I4L is not set
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_EICON is not set
+# CONFIG_ISDN_DRV_GIGASET is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_WITH_ABC is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISO9660_FS is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLCORE is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_IWMC3200TOP is not set
+# CONFIG_IXGB is not set
+# CONFIG_JBD2_DEBUG is not set
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_JBD is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_ZLIB is not set
+CONFIG_JFFS2_LZMA=y
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_JME is not set
+CONFIG_JOLIET=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYS is not set
+# CONFIG_KGDB is not set
+# CONFIG_KMEMTRACE is not set
+CONFIG_KMOD=y
+# CONFIG_KPROBES is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSM is not set
+# CONFIG_KSZ884X_PCI is not set
+# CONFIG_LANMEDIA is not set
+# CONFIG_LAPB is not set
+# CONFIG_LASAT is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_LBDAF=y
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_ALIX is not set
+# CONFIG_LEDS_BD2802 is not set
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_NETDEV=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LIB80211_CRYPT_CCMP is not set
+# CONFIG_LIB80211_CRYPT_TKIP is not set
+# CONFIG_LIB80211_CRYPT_WEP is not set
+# CONFIG_LIB80211_DEBUG is not set
+# CONFIG_LIB80211 is not set
+# CONFIG_LIBCRC32C is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_LIBERTAS_USB is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_LKDTM is not set
+# CONFIG_LLC2 is not set
+CONFIG_LLC=y
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_LOCKD is not set
+CONFIG_LOCKD_V4=y
+# CONFIG_LOCK_STAT is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_LOGFS is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGO is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_LSF is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
+# CONFIG_LXT_PHY is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+CCONFIG_MAC80211_DEFAULT_PS_VALUE=1
+CONFIG_MAC80211_DEFAULT_PS=y
+# CONFIG_MAC80211 is not set
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_MACVTAP is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MARKERS is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MD is not set
+# CONFIG_ME4000 is not set
+# CONFIG_MEDIA_ATTACH is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_MEILHAUS is not set
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_MFD_88PM8607 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MIGRATION is not set
+CONFIG_MII=y
+CONFIG_MINI_FO=y
+# CONFIG_MINIX_FS is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_FPU_EMU is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_MISDN_AVMFRITZ is not set
+# CONFIG_MISDN_HFCPCI is not set
+# CONFIG_MISDN_HFCUSB is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN is not set
+# CONFIG_MISDN_NETJET is not set
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MKISS is not set
+# CONFIG_MMC_ARMMMCI is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_BLOCK is not set
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC is not set
+# CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDRICOH_CS is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+CONFIG_MMU=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_BLKDEVS=y
+# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_MYLOADER_PARTS is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_ROOTFS_SPLIT=y
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+CONFIG_MTD=y
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_MVSWITCH_PHY is not set
+# CONFIG_MWAVE is not set
+# CONFIG_MWL8K is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_NEC_MARKEINS is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_POLICE is not set
+# CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_ACT_SKBEDIT=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_CLS_BASIC=y
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_IND=y
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_U32 is not set
+CONFIG_NET_CLS=y
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETDEBUG is not set
+# CONFIG_NETDEV_10000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEVICES_MULTIQUEUE=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_EMATCH_CMP is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_EMATCH_META is not set
+# CONFIG_NET_EMATCH_NBYTE is not set
+CONFIG_NET_EMATCH_STACK=32
+# CONFIG_NET_EMATCH_TEXT is not set
+# CONFIG_NET_EMATCH_U32 is not set
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_FC is not set
+CONFIG_NETFILTER_ADVANCED=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_TPROXY is not set
+# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER=y
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_NET_IPGRE is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_NET_PCI=y
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NETPOLL is not set
+CONFIG_NET_RADIO=y
+# CONFIG_NETROM is not set
+# CONFIG_NET_SB1000 is not set
+# CONFIG_NET_SCH_ATM is not set
+# CONFIG_NET_SCH_CBQ is not set
+# CONFIG_NET_SCH_CLK_CPU is not set
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_DSMARK is not set
+CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_ESFQ is not set
+CONFIG_NET_SCH_ESFQ_NFCT=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_RR is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NET_WIRELESS_RTNETLINK=y
+CONFIG_NET_WIRELESS=y
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETXEN_NIC is not set
+CONFIG_NET=y
+# CONFIG_NEW_GPIO is not set
+CONFIG_NEW_LEDS=y
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_ENABLED=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IPV4 is not set
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_RTSP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_ACCT is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_GRE is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_H323 is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT is not set
+CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_PROTO_GRE is not set
+# CONFIG_NF_NAT_RTSP is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NFS_ACL_SUPPORT is not set
+CONFIG_NFS_COMMON=y
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_NFSD_TCP=y
+# CONFIG_NFSD_V2_ACL is not set
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFTL is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_NL80211=y
+CONFIG_NLATTR=y
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_NS83820 is not set
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_NVRAM is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_HIFNHIPP is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_KIRKWOOD is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_ORION_WATCHDOG is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_P54_COMMON is not set
+CONFIG_PACKET_MMAP=y
+CONFIG_PACKET=y
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+# CONFIG_PC300TOO is not set
+# CONFIG_PCCARD is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_PCI200SYN is not set
+# CONFIG_PCI_ATMEL is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCI_HERMES is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_LEGACY is not set
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCIPCWATCHDOG is not set
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_ATMEL is not set
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_HERMES is not set
+# CONFIG_PCMCIA_IOCTL is not set
+# CONFIG_PCMCIA is not set
+# CONFIG_PCMCIA_LOAD_CIS is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_PCMCIA_SPECTRUM is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_PD6729 is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PID_NS is not set
+# CONFIG_PLAN9AUTH is not set
+CONFIG_PLIST=y
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PM is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+CONFIG_PPC4xx_GPIO=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_DISABLE_WERROR is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_FILTER=y
+# CONFIG_PPP is not set
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPPOATM is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPS is not set
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_TI_DAC7512 is not set
+CONFIG_TINY_RCU=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_PROBE_INITRD_HEADER is not set
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_SYSCTL=y
+# CONFIG_PROFILING is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_QEMU is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_QT2160 is not set
+# CONFIG_QUOTA is not set
+# CONFIG_R3964 is not set
+# CONFIG_R6040 is not set
+# CONFIG_R8169 is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_RAID_ATTRS is not set
+CONFIG_RAMFS=y
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RDC_17F3101X is not set
+# CONFIG_RD_GZIP is not set
+CONFIG_RD_LZMA=y
+# CONFIG_RD_LZO is not set
+# CONFIG_RDS is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_REDWOOD is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_RELAY is not set
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RFKILL is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_ROSE is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_RT3070 is not set
+# CONFIG_RT3090 is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_PCF50606 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_HCTOSYS=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB=y
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8192SU is not set
+# CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
+# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_RUNTIME_DEBUG is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_S2IO is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_SC92031 is not set
+# CONFIG_SCC is not set
+# CONFIG_SCHED_BFS is not set
+CONFIG_SCHED_CFS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_ESP_CORE is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_MPT2SAS is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PROC_FS=y
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+# CONFIG_SCSI_SEAGATE is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SECCOMP is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATK0110 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_M41T00 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_PCI is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SFI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_SHAPER is not set
+CONFIG_SHMEM=y
+CONFIG_SIGNALFD=y
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2_DEBUG is not set
+# CONFIG_SKY2 is not set
+CONFIG_SLABINFO=y
+CONFIG_SLAB=y
+# CONFIG_SLHC is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SLIP is not set
+# CONFIG_SLOB is not set
+# CONFIG_SLOW_WORK_DEBUG is not set
+# CONFIG_SLOW_WORK is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB is not set
+# CONFIG_SMARTJOYPLUS_FF is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DT019X is not set
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_HWDEP is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_ISA is not set
+# CONFIG_SND is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_MIPS is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_OXYGEN is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_PCMCIA is not set
+# CONFIG_SND_PCM is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_RAWMIDI is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TIMER is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_USX2Y is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_SOUND is not set
+# CONFIG_SOUND_PRIME is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_GPIO_OLD is not set
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_ORION is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPINLOCK_TEST is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_SQUASHFS_LZMA=y
+CONFIG_SQUASHFS_SUPPORT_ZLIB=y
+# CONFIG_SQUASHFS_VMALLOC is not set
+CONFIG_SQUASHFS=y
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB is not set
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSFDC is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_STACKTRACE_SUPPORT=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_STAGING=y
+CONFIG_STANDALONE=y
+CONFIG_STDBINUTILS=y
+# CONFIG_STE10XP is not set
+CONFIG_STP=y
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_STRIP is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_SUNRPC_GSS is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_SUNRPC_REGISTER_V4 is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SWAP=y
+# CONFIG_SWCONFIG is not set
+# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSFS=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_SYSV_FS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_SYSVIPC=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCIC is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+# CONFIG_TCP_CONG_CUBIC is not set
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_VENO is not set
+CONFIG_TCP_CONG_WESTWOOD=y
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_TEXTSEARCH_BM is not set
+# CONFIG_TEXTSEARCH_FSM is not set
+# CONFIG_TEXTSEARCH_KMP is not set
+CONFIG_TEXTSEARCH=y
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_TICK_ONESHOT=y
+# CONFIG_TIFM_CORE is not set
+# CONFIG_TIGON3 is not set
+CONFIG_TIMERFD=y
+# CONFIG_TINY_SHMEM is not set
+# CONFIG_TIPC is not set
+# CONFIG_TLAN is not set
+# CONFIG_TMD_HERMES is not set
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FILTER is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_TRANZPORT is not set
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_TR is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_TUNER_TEA5761 is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UDF_FS is not set
+CONFIG_UDF_NLS=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_UFS_FS is not set
+# CONFIG_UIO is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_UNEVICTABLE_LRU is not set
+# CONFIG_UNION_MOUNT is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_UNIX=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AIPTEK is not set
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_APPLETOUCH is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATMEL is not set
+# CONFIG_USB_ATM is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_BELKIN=y
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CPC is not set
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DABUSB is not set
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_ET61X251 is not set
+CONFIG_USB_EZUSB=y
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+CONFIG_USB_HIDINPUT=y
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LIBUSUAL is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD_PCI is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_STKWEBCAM is not set
+CONFIG_USB_STORAGE_ALAUDA=y
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE is not set
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+# CONFIG_USB_STORAGE_SIERRA is not set
+CONFIG_USB_STORAGE_USBAT=y
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_VICAM is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_VIDEO_CLASS is not set
+# CONFIG_USB_VST is not set
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_XHCI_HCD is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_UWB is not set
+# CONFIG_VETH is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_VGA_ARB is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_ALLOW_V4L1 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_DPC is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_IR_I2C is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_MEDIA is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA7111 is not set
+# CONFIG_VIDEO_SAA7114 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA9875 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_USBVISION is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_VIDEO_V4L1 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIRQ_DEBUG is not set
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VME_BUS is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_VMSPLIT_1G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_3G_OPT is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMXNET3 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_VT is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_W1_CON is not set
+# CONFIG_W1 is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_WAN is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_WANXL is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WDTPCI is not set
+# CONFIG_WIMAX is not set
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_OLD_REGULATORY=y
+CONFIG_WIRELESS=y
+CONFIG_WLAN_80211=y
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN=y
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_WR_PPMC is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_SPY=y
+# CONFIG_X25 is not set
+# CONFIG_XFRM_IPCOMP is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_USER is not set
+CONFIG_XFRM=y
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_SECURITY is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_YAFFS_FS is not set
+# CONFIG_YAM is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_YENTA is not set
+# CONFIG_YENTA_O2 is not set
+# CONFIG_YENTA_RICOH is not set
+# CONFIG_YENTA_TI is not set
+# CONFIG_YENTA_TOSHIBA is not set
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_ZISOFS_FS is not set
+CONFIG_ZISOFS=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA=y
+CONFIG_DEFAULT_SECURITY_DAC=y
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY=""
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set

diff --git a/target/linux/generic-2.6/patches-2.6.35/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.35/006-squashfs_add_lzma.patch
new file mode 100644 (file)
index 0000000..ef40486
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/006-squashfs_add_lzma.patch
@@ -0,0 +1,219 @@
+From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
+From: Phillip Lougher <phillip@lougher.demon.co.uk>
+Date: Tue, 20 Oct 2009 10:54:36 +0100
+Subject: [PATCH] Squashfs: add LZMA compression
+
+Add support for LZMA compressed filesystems.  This is an initial
+implementation.
+
+Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
+---
+ fs/squashfs/Kconfig        |    5 ++
+ fs/squashfs/Makefile       |    1 +
+ fs/squashfs/decompressor.c |    4 +
+ fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
+ fs/squashfs/squashfs.h     |    3 +
+ 5 files changed, 164 insertions(+), 0 deletions(-)
+ create mode 100644 fs/squashfs/lzma_wrapper.c
+
+--- a/fs/squashfs/Kconfig
++++ b/fs/squashfs/Kconfig
+@@ -26,6 +26,11 @@ config SQUASHFS
+ 
+         If unsure, say N.
+ 
++config SQUASHFS_LZMA
++      bool "Include support for LZMA compressed file systems"
++      depends on SQUASHFS
++      select DECOMPRESS_LZMA
++
+ config SQUASHFS_EMBEDDED
+ 
+       bool "Additional option for memory-constrained systems" 
+--- a/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
+@@ -5,5 +5,5 @@
+ obj-$(CONFIG_SQUASHFS) += squashfs.o
+ squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
+ squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
+-squashfs-$(CONFIG_SQUASHFS_XATTRS) += xattr.o xattr_id.o
++squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
+ 
+--- a/fs/squashfs/decompressor.c
++++ b/fs/squashfs/decompressor.c
+@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
+ 
+ static const struct squashfs_decompressor *decompressor[] = {
+       &squashfs_zlib_comp_ops,
++#ifdef CONFIG_SQUASHFS_LZMA
++      &squashfs_lzma_comp_ops,
++#else
+       &squashfs_lzma_unsupported_comp_ops,
++#endif
+       &squashfs_lzo_unsupported_comp_ops,
+       &squashfs_unknown_comp_ops
+ };
+--- /dev/null
++++ b/fs/squashfs/lzma_wrapper.c
+@@ -0,0 +1,152 @@
++/*
++ * Squashfs - a compressed read only filesystem for Linux
++ *
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++ * Phillip Lougher <phillip@lougher.demon.co.uk>
++ *
++ * 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,
++ * or (at your option) any later version.
++ *
++ * This program 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 General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ *
++ * lzma_wrapper.c
++ */
++
++#include <asm/unaligned.h>
++#include <linux/buffer_head.h>
++#include <linux/mutex.h>
++#include <linux/vmalloc.h>
++#include <linux/decompress/unlzma.h>
++#include <linux/slab.h>
++
++#include "squashfs_fs.h"
++#include "squashfs_fs_sb.h"
++#include "squashfs_fs_i.h"
++#include "squashfs.h"
++#include "decompressor.h"
++
++struct squashfs_lzma {
++      void    *input;
++      void    *output;
++};
++
++/* decompress_unlzma.c is currently non re-entrant... */
++DEFINE_MUTEX(lzma_mutex);
++
++/* decompress_unlzma.c doesn't provide any context in its callbacks... */
++static int lzma_error;
++
++static void error(char *m)
++{
++      ERROR("unlzma error: %s\n", m);
++      lzma_error = 1;
++}
++
++      
++static void *lzma_init(struct squashfs_sb_info *msblk)
++{
++      struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
++      if (stream == NULL)
++              goto failed;
++      stream->input = vmalloc(msblk->block_size);
++      if (stream->input == NULL)
++              goto failed;
++      stream->output = vmalloc(msblk->block_size);
++      if (stream->output == NULL)
++              goto failed2;
++
++      return stream;
++
++failed2:
++      vfree(stream->input);
++failed:
++      ERROR("failed to allocate lzma workspace\n");
++      kfree(stream);
++      return NULL;
++}
++
++
++static void lzma_free(void *strm)
++{
++      struct squashfs_lzma *stream = strm;
++
++      if (stream) {
++              vfree(stream->input);
++              vfree(stream->output);
++      }
++      kfree(stream);
++}
++
++
++static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
++      struct buffer_head **bh, int b, int offset, int length, int srclength,
++      int pages)
++{
++      struct squashfs_lzma *stream = msblk->stream;
++      void *buff = stream->input;
++      int avail, i, bytes = length, res;
++
++      mutex_lock(&lzma_mutex);
++
++      for (i = 0; i < b; i++) {
++              wait_on_buffer(bh[i]);
++              if (!buffer_uptodate(bh[i]))
++                      goto block_release;
++
++              avail = min(bytes, msblk->devblksize - offset);
++              memcpy(buff, bh[i]->b_data + offset, avail);
++              buff += avail;
++              bytes -= avail;
++              offset = 0;
++              put_bh(bh[i]);
++      }
++
++      lzma_error = 0;
++      res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
++                                                      error);
++      if (res || lzma_error)
++              goto failed;
++
++      /* uncompressed size is stored in the LZMA header (5 byte offset) */
++      res = bytes = get_unaligned_le32(stream->input + 5);
++      for (i = 0, buff = stream->output; bytes && i < pages; i++) {
++              avail = min_t(int, bytes, PAGE_CACHE_SIZE);
++              memcpy(buffer[i], buff, avail);
++              buff += avail;
++              bytes -= avail;
++      }
++      if (bytes)
++              goto failed;
++
++      mutex_unlock(&lzma_mutex);
++      return res;
++
++block_release:
++      for (; i < b; i++)
++              put_bh(bh[i]);
++
++failed:
++      mutex_unlock(&lzma_mutex);
++
++      ERROR("lzma decompression failed, data probably corrupt\n");
++      return -EIO;
++}
++
++const struct squashfs_decompressor squashfs_lzma_comp_ops = {
++      .init = lzma_init,
++      .free = lzma_free,
++      .decompress = lzma_uncompress,
++      .id = LZMA_COMPRESSION,
++      .name = "lzma",
++      .supported = 1
++};
++
+--- a/fs/squashfs/squashfs.h
++++ b/fs/squashfs/squashfs.h
+@@ -94,3 +94,6 @@ extern const struct address_space_operat
+ 
+ /* zlib_wrapper.c */
+ extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
++
++/* lzma wrapper.c */
++extern const struct squashfs_decompressor squashfs_lzma_comp_ops;

diff --git a/target/linux/generic-2.6/patches-2.6.35/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.35/007-squashfs_make_lzma_available.patch
new file mode 100644 (file)
index 0000000..c1a105d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/007-squashfs_make_lzma_available.patch
@@ -0,0 +1,165 @@
+From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
+From: Phillip Lougher <phillip@lougher.demon.co.uk>
+Date: Thu, 22 Oct 2009 04:57:38 +0100
+Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
+
+Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
+specify they need the unlzma code.  Normally decompress_unlzma.c is
+compiled with __init and unlzma is not exported to modules.
+
+Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
+---
+ fs/squashfs/Kconfig                   |    1 +
+ include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
+ include/linux/decompress/inflate_mm.h |   12 ++++++++++++
+ include/linux/decompress/mm.h         |    3 ---
+ include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
+ lib/Kconfig                           |    3 +++
+ lib/decompress_bunzip2.c              |    1 +
+ lib/decompress_inflate.c              |    1 +
+ lib/decompress_unlzma.c               |    5 ++++-
+ 9 files changed, 54 insertions(+), 4 deletions(-)
+ create mode 100644 include/linux/decompress/bunzip2_mm.h
+ create mode 100644 include/linux/decompress/inflate_mm.h
+ create mode 100644 include/linux/decompress/unlzma_mm.h
+
+--- a/fs/squashfs/Kconfig
++++ b/fs/squashfs/Kconfig
+@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
+       bool "Include support for LZMA compressed file systems"
+       depends on SQUASHFS
+       select DECOMPRESS_LZMA
++      select DECOMPRESS_LZMA_NEEDED
+ 
+ config SQUASHFS_EMBEDDED
+ 
+--- /dev/null
++++ b/include/linux/decompress/bunzip2_mm.h
+@@ -0,0 +1,12 @@
++#ifndef BUNZIP2_MM_H
++#define BUNZIP2_MM_H
++
++#ifdef STATIC
++/* Code active when included from pre-boot environment: */
++#define INIT
++#else
++/* Compile for initramfs/initrd code only */
++#define INIT __init
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/decompress/inflate_mm.h
+@@ -0,0 +1,12 @@
++#ifndef INFLATE_MM_H
++#define INFLATE_MM_H
++
++#ifdef STATIC
++/* Code active when included from pre-boot environment: */
++#define INIT
++#else
++/* Compile for initramfs/initrd code only */
++#define INIT __init
++#endif
++
++#endif
+--- a/include/linux/decompress/mm.h
++++ b/include/linux/decompress/mm.h
+@@ -63,8 +63,6 @@ static void free(void *where)
+ 
+ #define set_error_fn(x)
+ 
+-#define INIT
+-
+ #else /* STATIC */
+ 
+ /* Code active when compiled standalone for use when loading ramdisk: */
+@@ -87,7 +85,6 @@ static void free(void *where)
+ static void(*error)(char *m);
+ #define set_error_fn(x) error = x;
+ 
+-#define INIT __init
+ #define STATIC
+ 
+ #include <linux/init.h>
+--- /dev/null
++++ b/include/linux/decompress/unlzma_mm.h
+@@ -0,0 +1,20 @@
++#ifndef UNLZMA_MM_H
++#define UNLZMA_MM_H
++
++#ifdef STATIC
++
++/* Code active when included from pre-boot environment: */
++#define INIT
++
++#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
++
++/* Make it available to non initramfs/initrd code */
++#define INIT
++#include <linux/module.h>
++#else
++
++/* Compile for initramfs/initrd code only */
++#define INIT __init
++#endif
++
++#endif
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -121,6 +121,9 @@ config DECOMPRESS_LZO
+       select LZO_DECOMPRESS
+       tristate
+ 
++config DECOMPRESS_LZMA_NEEDED
++       boolean
++
+ #
+ # Generic allocator support is selected if needed
+ #
+--- a/lib/decompress_bunzip2.c
++++ b/lib/decompress_bunzip2.c
+@@ -52,6 +52,7 @@
+ #include <linux/slab.h>
+ #endif /* STATIC */
+ 
++#include <linux/decompress/bunzip2_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #ifndef INT_MAX
+--- a/lib/decompress_inflate.c
++++ b/lib/decompress_inflate.c
+@@ -23,6 +23,7 @@
+ 
+ #endif /* STATIC */
+ 
++#include <linux/decompress/inflate_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #define GZIP_IOBUF_SIZE (16*1024)
+--- a/lib/decompress_unlzma.c
++++ b/lib/decompress_unlzma.c
+@@ -36,6 +36,7 @@
+ #include <linux/slab.h>
+ #endif /* STATIC */
+ 
++#include <linux/decompress/unlzma_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #define       MIN(a, b) (((a) < (b)) ? (a) : (b))
+@@ -531,7 +532,7 @@ static inline void INIT process_bit1(str
+ 
+ 
+ 
+-STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
++STATIC int INIT unlzma(unsigned char *buf, int in_len,
+                             int(*fill)(void*, unsigned int),
+                             int(*flush)(void*, unsigned int),
+                             unsigned char *output,
+@@ -664,4 +665,6 @@ STATIC int INIT decompress(unsigned char
+ {
+       return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
+ }
++#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
++EXPORT_SYMBOL(unlzma);
+ #endif

diff --git a/target/linux/generic-2.6/patches-2.6.35/008-jffs2_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.35/008-jffs2_make_lzma_available.patch
new file mode 100644 (file)
index 0000000..5ab2e72
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/008-jffs2_make_lzma_available.patch
@@ -0,0 +1,5142 @@
+--- a/fs/jffs2/Kconfig
++++ b/fs/jffs2/Kconfig
+@@ -139,6 +139,15 @@ config JFFS2_LZO
+         This feature was added in July, 2007. Say 'N' if you need
+         compatibility with older bootloaders or kernels.
+ 
++config JFFS2_LZMA
++      bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
++      select LZMA_COMPRESS
++      select LZMA_DECOMPRESS
++      depends on JFFS2_FS
++      default n
++      help
++        JFFS2 wrapper to the LZMA C SDK
++
+ config JFFS2_RTIME
+       bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
+       depends on JFFS2_FS
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
+@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)  += compr_rub
+ jffs2-$(CONFIG_JFFS2_RTIME)   += compr_rtime.o
+ jffs2-$(CONFIG_JFFS2_ZLIB)    += compr_zlib.o
+ jffs2-$(CONFIG_JFFS2_LZO)     += compr_lzo.o
++jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
+ jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
++
++CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
+--- a/fs/jffs2/compr.c
++++ b/fs/jffs2/compr.c
+@@ -319,6 +319,9 @@ int __init jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+       jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_init();
++#endif
+ /* Setting default compression mode */
+ #ifdef CONFIG_JFFS2_CMODE_NONE
+       jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
+@@ -342,6 +345,9 @@ int __init jffs2_compressors_init(void)
+ int jffs2_compressors_exit(void)
+ {
+ /* Unregistering compressors */
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_exit();
++#endif
+ #ifdef CONFIG_JFFS2_LZO
+       jffs2_lzo_exit();
+ #endif
+--- a/fs/jffs2/compr.h
++++ b/fs/jffs2/compr.h
+@@ -28,9 +28,9 @@
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_LZARI_PRIORITY     30
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
+-
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
+ #define JFFS2_DYNRUBIN_DISABLED  /*      for decompression */
+@@ -98,5 +98,9 @@ void jffs2_zlib_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/fs/jffs2/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++      static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++      LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++      if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++      {
++              PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++              return -ENOMEM;
++      }
++
++      if (LzmaEnc_SetProps(p, props) != SZ_OK)
++      {
++              lzma_free_workspace();
++              return -1;
++      }
++      
++      if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++      {
++              lzma_free_workspace();
++              return -1;
++      }
++
++        return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++                            uint32_t *sourcelen, uint32_t *dstlen, void *model)
++{
++      SizeT compress_size = (SizeT)(*dstlen);
++      int ret;
++
++      #ifdef __KERNEL__
++              mutex_lock(&deflate_mutex);
++      #endif
++
++      ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++              0, NULL, &lzma_alloc, &lzma_alloc);
++
++      #ifdef __KERNEL__
++              mutex_unlock(&deflate_mutex);
++      #endif
++
++      if (ret != SZ_OK)
++              return -1;
++
++      *dstlen = (uint32_t)compress_size;
++
++      return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++                               uint32_t srclen, uint32_t destlen, void *model)
++{
++      int ret;
++      SizeT dl = (SizeT)destlen;
++      SizeT sl = (SizeT)srclen;
++      ELzmaStatus status;
++      
++      ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++              propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++      if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++              return -1;
++
++      return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++      .priority = JFFS2_LZMA_PRIORITY,
++      .name = "lzma",
++      .compr = JFFS2_COMPR_LZMA,
++      .compress = &jffs2_lzma_compress,
++      .decompress = &jffs2_lzma_decompress,
++      .disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++        int ret;
++      CLzmaEncProps props;
++      LzmaEncProps_Init(&props);
++
++        props.dictSize = LZMA_BEST_DICT(0x2000);
++        props.level = LZMA_BEST_LEVEL;
++        props.lc = LZMA_BEST_LC;
++        props.lp = LZMA_BEST_LP;
++        props.pb = LZMA_BEST_PB;
++        props.fb = LZMA_BEST_FB;
++
++      ret = lzma_alloc_workspace(&props);
++        if (ret < 0)
++                return ret;
++
++      ret = jffs2_register_compressor(&jffs2_lzma_comp);
++      if (ret)
++              lzma_free_workspace();
++      
++        return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++      jffs2_unregister_compressor(&jffs2_lzma_comp);
++      lzma_free_workspace();
++}
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
+@@ -254,14 +254,41 @@ static int __init init_jffs2_fs(void)
+       BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
+       BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
+ 
+-      printk(KERN_INFO "JFFS2 version 2.2."
++      printk(KERN_INFO "JFFS2 version 2.2"
+ #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
+              " (NAND)"
+ #endif
+ #ifdef CONFIG_JFFS2_SUMMARY
+-             " (SUMMARY) "
++             " (SUMMARY)"
+ #endif
+-             " © 2001-2006 Red Hat, Inc.\n");
++#ifdef CONFIG_JFFS2_ZLIB
++             " (ZLIB)"
++#endif
++#ifdef CONFIG_JFFS2_LZO
++             " (LZO)"
++#endif
++#ifdef CONFIG_JFFS2_LZMA
++             " (LZMA)"
++#endif
++#ifdef CONFIG_JFFS2_RTIME
++             " (RTIME)"
++#endif
++#ifdef CONFIG_JFFS2_RUBIN
++             " (RUBIN)"
++#endif
++#ifdef  CONFIG_JFFS2_CMODE_NONE
++             " (CMODE_NONE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_PRIORITY
++             " (CMODE_PRIORITY)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_SIZE
++             " (CMODE_SIZE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
++             " (CMODE_FAVOURLZO)"
++#endif
++             " (c) 2001-2006 Red Hat, Inc.\n");
+ 
+       jffs2_inode_cachep = kmem_cache_create("jffs2_i",
+                                            sizeof(struct jffs2_inode_info),
+--- a/include/linux/jffs2.h
++++ b/include/linux/jffs2.h
+@@ -45,6 +45,7 @@
+ #define JFFS2_COMPR_DYNRUBIN  0x05
+ #define JFFS2_COMPR_ZLIB      0x06
+ #define JFFS2_COMPR_LZO               0x07
++#define JFFS2_COMPR_LZMA      0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,62 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++      #include <linux/kernel.h>
++      #include <linux/sched.h>
++      #include <linux/slab.h>
++      #include <linux/vmalloc.h>
++      #include <linux/init.h>
++      #define LZMA_MALLOC vmalloc
++      #define LZMA_FREE vfree
++      #define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++      #define INIT __init
++      #define STATIC static
++#else
++      #include <stdint.h>
++      #include <stdlib.h>
++      #include <stdio.h>
++      #include <unistd.h>
++      #include <string.h>
++      #include <asm/types.h>
++      #include <errno.h>
++      #include <linux/jffs2.h>
++      #ifndef PAGE_SIZE
++              extern int page_size;
++              #define PAGE_SIZE page_size
++      #endif
++      #define LZMA_MALLOC malloc
++      #define LZMA_FREE free
++      #define PRINT_ERROR(msg) fprintf(stderr, msg)
++      #define INIT
++      #define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++        if (size == 0)
++                return NULL;
++
++        return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++        if (address != NULL)
++                LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,115 @@
++/* LzFind.h -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_FIND_H
++#define __LZ_FIND_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  size_t directInputRem;
++  int btMode;
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
++    UInt32 *distances, UInt32 maxLen);
++
++/*
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,54 @@
++/* LzHash.h -- HASH functions for LZ algorithms
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_HASH_H
++#define __LZ_HASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,231 @@
++/* LzmaDec.h -- LZMA Decoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_DEC_H
++#define __LZMA_DEC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs,
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum
++{
++  LZMA_FINISH_ANY,   /* finish at any point */
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
++        You must use correct finish mode in that case. */
++
++typedef enum
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually.
++   For Buffer Interface you must always use variant 1.
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */
++
++/* You can use it, if you want to eliminate the overhead for data copying from
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,80 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_ENC_H
++#define __LZMA_ENC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */
++  int lp;          /* 0 <= lp <= 4, default = 0 */
++  int pb;          /* 0 <= pb <= 4, default = 2 */
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,226 @@
++/* Types.h -- Basic types
++2009-11-23 : Igor Pavlov : Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#include <stddef.h>
++
++#ifdef _WIN32
++#include <windows.h>
++#endif
++
++#ifndef EXTERN_C_BEGIN
++#ifdef __cplusplus
++#define EXTERN_C_BEGIN extern "C" {
++#define EXTERN_C_END }
++#else
++#define EXTERN_C_BEGIN
++#define EXTERN_C_END
++#endif
++#endif
++
++EXTERN_C_BEGIN
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifdef _WIN32
++typedef DWORD WRes;
++#else
++typedef int WRes;
++#endif
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++#ifdef _SZ_NO_INT_64
++
++/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
++   NOTES: Some code will work incorrectly in that case! */
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _WIN32
++#define MY_STD_CALL __stdcall
++#else
++#define MY_STD_CALL
++#endif
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_FAST_CALL __fastcall
++
++#else
++
++#define MY_CDECL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++/* it can return SZ_ERROR_INPUT_EOF */
++SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
++SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
++SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++       (result < size) means error */
++} ISeqOutStream;
++
++typedef enum
++{
++  SZ_SEEK_SET = 0,
++  SZ_SEEK_CUR = 1,
++  SZ_SEEK_END = 2
++} ESzSeek;
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ISeekInStream;
++
++typedef struct
++{
++  SRes (*Look)(void *p, void **buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) > input(*size)) is not allowed
++       (output(*size) < input(*size)) is allowed */
++  SRes (*Skip)(void *p, size_t offset);
++    /* offset must be <= output(*size) of Look */
++
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* reads directly (without buffer). It's same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ILookInStream;
++
++SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
++SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
++
++/* reads via ILookInStream::Read */
++SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
++SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
++
++#define LookToRead_BUF_SIZE (1 << 14)
++
++typedef struct
++{
++  ILookInStream s;
++  ISeekInStream *realStream;
++  size_t pos;
++  size_t size;
++  Byte buf[LookToRead_BUF_SIZE];
++} CLookToRead;
++
++void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
++void LookToRead_Init(CLookToRead *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToLook;
++
++void SecToLook_CreateVTable(CSecToLook *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToRead;
++
++void SecToRead_CreateVTable(CSecToRead *p);
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++EXTERN_C_END
++
++#endif
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -103,6 +103,12 @@ config LZO_COMPRESS
+ config LZO_DECOMPRESS
+       tristate
+ 
++config LZMA_COMPRESS
++    tristate
++
++config LZMA_DECOMPRESS
++    tristate
++
+ #
+ # These all provide a common interface (hence the apparent duplication with
+ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,6 +2,16 @@
+ # Makefile for some libs needed in the kernel.
+ #
+ 
++ifdef CONFIG_JFFS2_ZLIB
++      CONFIG_ZLIB_INFLATE:=y
++      CONFIG_ZLIB_DEFLATE:=y
++endif
++
++ifdef CONFIG_JFFS2_LZMA
++      CONFIG_LZMA_DECOMPRESS:=y
++      CONFIG_LZMA_COMPRESS:=y
++endif
++
+ ifdef CONFIG_FUNCTION_TRACER
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+@@ -66,6 +76,8 @@ obj-$(CONFIG_ZLIB_DEFLATE) += zlib_defla
+ obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
+ obj-$(CONFIG_LZO_COMPRESS) += lzo/
+ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
++obj-$(CONFIG_LZMA_COMPRESS) += lzma/
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
+ 
+ lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+ lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+--- /dev/null
++++ b/lib/lzma/LzFind.c
+@@ -0,0 +1,761 @@
++/* LzFind.c -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  if (p->directInput)
++  {
++    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
++    if (curSize > p->directInputRem)
++      curSize = (UInt32)p->directInputRem;
++    p->directInputRem -= curSize;
++    p->streamPos += curSize;
++    if (p->directInputRem == 0)
++      p->streamEndWasReached = 1;
++    return;
++  }
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase,
++    p->buffer - p->keepSizeBefore,
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  if (p->directInput)
++    return 0;
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached)
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = historySize + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit)
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit)
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for (i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
++{
++  return (p->pos - p->historySize - 1) & kNormalizeMask;
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while (++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] =
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2)
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lib/lzma/LzmaDec.c
+@@ -0,0 +1,999 @@
++/* LzmaDec.c -- LZMA Decoder
++2009-09-20 : Igor Pavlov : Public domain */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; }
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded.
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
++Out:
++  Result:
++    SZ_OK - OK
++    SZ_ERROR_DATA - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        state -= (state < 4) ? state : 3;
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        state -= (state < 10) ? 3 : 6;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++      continue;
++    }
++    else
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance;
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while (--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1;
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++      }
++
++      len += kMatchMinLen;
++
++      if (limit == dicPos)
++        return SZ_ERROR_DATA;
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do
++            *(dest) = (Byte)*(dest + src);
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE *
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while (--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++{
++  p->needFlush = 1;
++  p->remainLen = 0;
++  p->tempBufSize = 0;
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p)
++{
++  p->dicPos = 0;
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1;
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = (SizeT)(p->buf - src);
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0)
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->probs);
++  p->probs = 0;
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->dic);
++  p->dic = 0;
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize;
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/LzmaEnc.c
+@@ -0,0 +1,2271 @@
++/* LzmaEnc.c -- LZMA Encoder
++2009-11-24 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include "LzmaEnc.h"
++
++/* disable MT */
++#define _7ZIP_ST
++
++#include "LzFind.h"
++#ifndef _7ZIP_ST
++#include "LzFindMt.h"
++#endif
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3;
++  if (p->lp < 0) p->lp = 0;
++  if (p->pb < 0) p->pb = 2;
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
++  if (p->numHashBytes < 0) p->numHashBytes = 4;
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0)
++    p->numThreads =
++      #ifndef _7ZIP_ST
++      ((p->btMode && p->algo) ? 2 : 1);
++      #else
++      1;
++      #endif
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos)
++{
++  UInt32 res;
++  BSR2_RET(pos, res);
++  return res;
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct
++{
++  UInt32 price;
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;
++
++  UInt32 posPrev;
++  UInt32 backPrev;
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6
++#define kDicLogSizeMin 0
++#define kDicLogSizeMax 32
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifndef _7ZIP_ST
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifndef _7ZIP_ST
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  UInt32 longestMatchLength;
++  UInt32 numPairs;
++  UInt32 numAvail;
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  int needInit;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifndef _7ZIP_ST
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++#define IsCharState(s) ((s) < 7)
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);
++  }
++  p->cacheSize++;
++  p->low = (UInt32)p->low << 8;
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++}
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numPairs;
++  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
++  ttt++;
++  {
++    UInt32 i;
++    for (i = 0; i < numPairs; i += 2)
++      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
++  }
++  #endif
++  if (numPairs > 0)
++  {
++    lenRes = p->matches[numPairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matches[numPairs - 1] + 1;
++      UInt32 numAvail = p->numAvail;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numPairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex;
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
++  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
++  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
++  UInt32 *matches;
++  const Byte *data;
++  Byte curByte, matchByte;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  if (numAvail < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++  curByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
++        (!IsCharState(p->state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == curByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= mainLen)
++  {
++    UInt32 offs = 0;
++    while (len > matches[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matches[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matches[offs])
++      {
++        offs += 2;
++        if (offs == numPairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
++    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
++    Bool nextIsChar;
++    Byte curByte, matchByte;
++    const Byte *data;
++    COptimal *curOpt;
++    COptimal *nextOpt;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    newLen = ReadMatchDistances(p, &numPairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numPairs = numPairs;
++      p->longestMatchLength = newLen;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price;
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    curByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price +=
++        (!IsCharState(state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++    }
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price)
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++    numAvailFull = p->numAvail;
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp < numAvailFull)
++        numAvailFull = temp;
++    }
++
++    if (numAvailFull < 2)
++      continue;
++    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
++
++    if (!nextIsChar && matchByte != curByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailFull)
++        limit = numAvailFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price +
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price)
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice =
++                price + p->repLenEnc.prices[posState][lenTest - 2] +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvail)
++    {
++      newLen = numAvail;
++      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
++      matches[numPairs] = newLen;
++      numPairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matches[offs])
++        offs += 2;
++      curBack = matches[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matches[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numPairs)
++            break;
++          curBack = matches[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
++  const Byte *data;
++  const UInt32 *matches;
++
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  *backRes = (UInt32)-1;
++  if (numAvail < 2)
++    return 1;
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++
++  repLen = repIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    if (len > repLen)
++    {
++      repIndex = i;
++      repLen = len;
++    }
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++
++  mainDist = 0; /* for GCC */
++  if (mainLen >= 2)
++  {
++    mainDist = matches[numPairs - 1];
++    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
++    {
++      if (!ChangePair(matches[numPairs - 3], mainDist))
++        break;
++      numPairs -= 2;
++      mainLen = matches[numPairs - 2];
++      mainDist = matches[numPairs - 1];
++    }
++    if (mainLen == 2 && mainDist >= 0x80)
++      mainLen = 1;
++  }
++
++  if (repLen >= 2 && (
++        (repLen + 1 >= mainLen) ||
++        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
++        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
++  {
++    *backRes = repIndex;
++    MovePos(p, repLen - 1);
++    return repLen;
++  }
++  
++  if (mainLen < 2 || numAvail <= 2)
++    return 1;
++
++  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
++  if (p->longestMatchLength >= 2)
++  {
++    UInt32 newDistance = matches[p->numPairs - 1];
++    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
++        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
++        (p->longestMatchLength > mainLen + 1) ||
++        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
++      return 1;
++  }
++  
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len, limit;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    limit = mainLen - 1;
++    for (len = 2; len < limit && data[len] == data2[len]; len++);
++    if (len >= limit)
++      return 1;
++  }
++  *backRes = mainDist + LZMA_NUM_REPS;
++  MovePos(p, mainLen - 2);
++  return mainLen;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  {
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->needInit)
++  {
++    p->matchFinder.Init(p->matchFinderObj);
++    p->needInit = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numPairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numPairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == (UInt32)-1)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifndef _7ZIP_ST
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifndef _7ZIP_ST
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for (i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize =
++  p->repLenEnc.tableSize =
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->matchFinderBase.directInput = 1;
++  p->matchFinderBase.bufferBase = (Byte *)src;
++  p->matchFinderBase.directInputRem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->needInit = 1;
++
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifndef _7ZIP_ST
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #else
++  pp = pp;
++  #endif
++}
++
++typedef struct
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
++{
++  SRes res = SZ_OK;
++
++  #ifndef _7ZIP_ST
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(p);
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
++  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++
++  p->rc.outStream = &outStream.funcTable;
++  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
++  if (res == SZ_OK)
++    res = LzmaEnc_Encode2(p, progress);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/Makefile
+@@ -0,0 +1,7 @@
++lzma_compress-objs := LzFind.o LzmaEnc.o
++lzma_decompress-objs := LzmaDec.o
++
++obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
++
++EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h

diff --git a/target/linux/generic-2.6/patches-2.6.35/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.35/011-mips_boot.patch
new file mode 100644 (file)
index 0000000..c2a043a
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/011-mips_boot.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
+@@ -121,6 +121,8 @@
+ #endif
+       .endm
+ 
++      j kernel_entry
++      nop
+ #ifndef CONFIG_NO_EXCEPT_FILL
+       /*
+        * Reserved space for exception handlers.

diff --git a/target/linux/generic-2.6/patches-2.6.35/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.35/012-extra_optimization.patch
new file mode 100644 (file)
index 0000000..0b5174c
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/012-extra_optimization.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -529,7 +529,7 @@ all: vmlinux
+ ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+ KBUILD_CFLAGS += -Os
+ else
+-KBUILD_CFLAGS += -O2
++KBUILD_CFLAGS += -O2 -fno-reorder-blocks -fno-tree-ch
+ endif
+ 
+ include $(srctree)/arch/$(SRCARCH)/Makefile
+@@ -567,6 +567,9 @@ endif
+ NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+ CHECKFLAGS     += $(NOSTDINC_FLAGS)
+ 
++# improve gcc optimization
++CFLAGS += $(call cc-option,-funit-at-a-time,)
++
+ # warn about C99 declaration after statement
+ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.35/013-gcc4_inline_fix.patch
new file mode 100644 (file)
index 0000000..a7082de
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/013-gcc4_inline_fix.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/include/asm/system.h
++++ b/arch/mips/include/asm/system.h
+@@ -198,7 +198,7 @@ extern __u64 __xchg_u64_unsupported_on_3
+ #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
+ #endif
+ 
+-static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
++static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
+ {
+       switch (size) {
+       case 4:

diff --git a/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash b/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash
new file mode 100644 (file)
index 0000000..e448dfe
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash
@@ -0,0 +1,36 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -48,6 +48,7 @@
+ #define SST49LF040B           0x0050
+ #define SST49LF008A           0x005a
+ #define AT49BV6416            0x00d6
++#define MANUFACTURER_SAMSUNG  0x00ec
+ 
+ static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
+ static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
+@@ -419,12 +420,19 @@ struct mtd_info *cfi_cmdset_0002(struct
+ 
+                       if (extp->MajorVersion != '1' ||
+                           (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+-                              printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
+-                                     "version %c.%c.\n",  extp->MajorVersion,
+-                                     extp->MinorVersion);
+-                              kfree(extp);
+-                              kfree(mtd);
+-                              return NULL;
++                              if (cfi->mfr == MANUFACTURER_SAMSUNG &&
++                                  (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
++                                  printk(KERN_NOTICE "  Newer Samsung flash detected, "
++                                         "should be compatibile with Amd/Fujitsu.\n");
++                              }
++                              else {
++                                  printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
++                                         "version %c.%c.\n",  extp->MajorVersion,
++                                         extp->MinorVersion);
++                                  kfree(extp);
++                                  kfree(mtd);
++                                  return NULL;
++                              }
+                       }
+ 
+                       /* Install our own private info structure */

diff --git a/target/linux/generic-2.6/patches-2.6.35/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.35/020-mips_multi_machine_support.patch
new file mode 100644 (file)
index 0000000..ca0c10b
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/020-mips_multi_machine_support.patch
@@ -0,0 +1,208 @@
+--- /dev/null
++++ b/arch/mips/include/asm/mips_machine.h
+@@ -0,0 +1,54 @@
++/*
++ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
++ *
++ *  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.
++ *
++ */
++
++#ifndef __ASM_MIPS_MACHINE_H
++#define __ASM_MIPS_MACHINE_H
++
++#include <linux/init.h>
++#include <linux/list.h>
++
++#include <asm/bootinfo.h>
++
++struct mips_machine {
++      unsigned long           mach_type;
++      const char              *mach_id;
++      const char              *mach_name;
++      void                    (*mach_setup)(void);
++};
++
++#define MIPS_MACHINE(_type, _id, _name, _setup)               \
++static const char machine_name_##_type[] __initconst          \
++                      __aligned(1) = _name;                   \
++static const char machine_id_##_type[] __initconst            \
++                      __aligned(1) = _id;                     \
++static struct mips_machine machine_##_type                    \
++              __used __section(.mips.machines.init) =         \
++{                                                             \
++      .mach_type      = _type,                                \
++      .mach_id        = machine_id_##_type,                   \
++      .mach_name      = machine_name_##_type,                 \
++      .mach_setup     = _setup,                               \
++};
++
++extern long __mips_machines_start;
++extern long __mips_machines_end;
++
++#ifdef CONFIG_MIPS_MACHINE
++int  mips_machtype_setup(char *id) __init;
++void mips_machine_setup(void) __init;
++void mips_set_machine_name(const char *name) __init;
++char *mips_get_machine_name(void);
++#else
++static inline int mips_machtype_setup(char *id) { return 1; }
++static inline void mips_machine_setup(void) { }
++static inline void mips_set_machine_name(const char *name) { }
++static inline char *mips_get_machine_name(void) { return NULL; }
++#endif /* CONFIG_MIPS_MACHINE */
++
++#endif /* __ASM_MIPS_MACHINE_H */
+--- /dev/null
++++ b/arch/mips/kernel/mips_machine.c
+@@ -0,0 +1,86 @@
++/*
++ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
++ *
++ *  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 <linux/mm.h>
++#include <linux/string.h>
++#include <linux/slab.h>
++
++#include <asm/mips_machine.h>
++
++static struct mips_machine *mips_machine __initdata;
++static char *mips_machine_name = "Unknown";
++
++#define for_each_machine(mach) \
++      for ((mach) = (struct mips_machine *)&__mips_machines_start; \
++           (mach) && \
++           (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
++           (mach)++)
++
++__init void mips_set_machine_name(const char *name)
++{
++      char *p;
++
++      if (name == NULL)
++              return;
++
++      p = kstrdup(name, GFP_KERNEL);
++      if (!p)
++              pr_err("MIPS: no memory for machine_name\n");
++
++      mips_machine_name = p;
++}
++
++char *mips_get_machine_name(void)
++{
++      return mips_machine_name;
++}
++
++__init int mips_machtype_setup(char *id)
++{
++      struct mips_machine *mach;
++
++      for_each_machine(mach) {
++              if (mach->mach_id == NULL)
++                      continue;
++
++              if (strcmp(mach->mach_id, id) == 0) {
++                      mips_machtype = mach->mach_type;
++                      return 0;
++              }
++      }
++
++      pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
++      pr_err("%-24s : %s\n", "id", "name");
++      for_each_machine(mach)
++              pr_err("%-24s : %s\n", mach->mach_id, mach->mach_name);
++
++      return 1;
++}
++
++__setup("machtype=", mips_machtype_setup);
++
++__init void mips_machine_setup(void)
++{
++      struct mips_machine *mach;
++
++      for_each_machine(mach) {
++              if (mips_machtype == mach->mach_type) {
++                      mips_machine = mach;
++                      break;
++              }
++      }
++
++      if (!mips_machine)
++              return;
++
++      mips_set_machine_name(mips_machine->mach_name);
++      pr_info("MIPS: machine is %s\n", mips_machine_name);
++
++      if (mips_machine->mach_setup)
++              mips_machine->mach_setup();
++}
+--- a/arch/mips/kernel/Makefile
++++ b/arch/mips/kernel/Makefile
+@@ -94,6 +94,7 @@ obj-$(CONFIG_GPIO_TXX9)              += gpio_txx9.o
+ obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o
+ obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
+ obj-$(CONFIG_SPINLOCK_TEST)   += spinlock_test.o
++obj-$(CONFIG_MIPS_MACHINE)    += mips_machine.o
+ 
+ CFLAGS_cpu-bugs64.o   = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
+ 
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -853,6 +853,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
+ config SYNC_R4K
+       bool
+ 
++config MIPS_MACHINE
++      def_bool n
++
+ config NO_IOPORT
+       def_bool n
+ 
+--- a/arch/mips/kernel/proc.c
++++ b/arch/mips/kernel/proc.c
+@@ -12,6 +12,7 @@
+ #include <asm/cpu-features.h>
+ #include <asm/mipsregs.h>
+ #include <asm/processor.h>
++#include <asm/mips_machine.h>
+ 
+ unsigned int vced_count, vcei_count;
+ 
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
+       /*
+        * For the first processor also print the system type
+        */
+-      if (n == 0)
++      if (n == 0) {
+               seq_printf(m, "system type\t\t: %s\n", get_system_type());
++              if (mips_get_machine_name())
++                      seq_printf(m, "machine\t\t\t: %s\n",
++                                 mips_get_machine_name());
++      }
+ 
+       seq_printf(m, "processor\t\t: %ld\n", n);
+       sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -98,6 +98,13 @@ SECTIONS
+       INIT_TEXT_SECTION(PAGE_SIZE)
+       INIT_DATA_SECTION(16)
+ 
++      . = ALIGN(4);
++      .mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
++              __mips_machines_start = .;
++              *(.mips.machines.init)
++              __mips_machines_end = .;
++      }
++
+       /* .exit.text is discarded at runtime, not link time, to deal with
+        * references from .rodata
+        */

diff --git a/target/linux/generic-2.6/patches-2.6.35/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.35/021-mips_image_cmdline_hack.patch
new file mode 100644 (file)
index 0000000..a304f0b
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/021-mips_image_cmdline_hack.patch
@@ -0,0 +1,28 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -856,6 +856,10 @@ config SYNC_R4K
+ config MIPS_MACHINE
+       def_bool n
+ 
++config IMAGE_CMDLINE_HACK
++      bool "OpenWrt specific image command line hack"
++      default n
++
+ config NO_IOPORT
+       def_bool n
+ 
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
+@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
+       j       kernel_entry
+ #endif
+ 
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++      .ascii  "CMDLINE:"
++EXPORT(__image_cmdline)
++      .fill   0x400
++#endif /* CONFIG_IMAGE_CMDLINE_HACK */
++
+       __REF
+ 
+ NESTED(kernel_entry, 16, sp)                  # kernel entry point

diff --git a/target/linux/generic-2.6/patches-2.6.35/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.35/022-mips_use_generic_thread_info_allocator.patch
new file mode 100644 (file)
index 0000000..786afd1
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/022-mips_use_generic_thread_info_allocator.patch
@@ -0,0 +1,18 @@
+--- a/arch/mips/include/asm/thread_info.h
++++ b/arch/mips/include/asm/thread_info.h
+@@ -83,6 +83,7 @@ register struct thread_info *__current_t
+ #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
+ #define THREAD_MASK (THREAD_SIZE - 1UL)
+ 
++#if 0
+ #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
+ 
+ #ifdef CONFIG_DEBUG_STACK_USAGE
+@@ -92,6 +93,7 @@ register struct thread_info *__current_t
+ #endif
+ 
+ #define free_thread_info(info) kfree(info)
++#endif
+ 
+ #endif /* !__ASSEMBLY__ */
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.35/023-mips-fix-kexec.patch
new file mode 100644 (file)
index 0000000..e6928dd
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/023-mips-fix-kexec.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
+       reboot_code_buffer =
+         (unsigned long)page_address(image->control_code_page);
+ 
+-      kexec_start_address = image->start;
++      kexec_start_address = (unsigned long) phys_to_virt(image->start);
+       kexec_indirection_page =
+               (unsigned long) phys_to_virt(image->head & PAGE_MASK);
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.35/025-mips_disable_fpu.patch
new file mode 100644 (file)
index 0000000..a65be6f
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/025-mips_disable_fpu.patch
@@ -0,0 +1,161 @@
+MIPS: allow disabling the kernel FPU emulator
+
+This patch allows turning off the in-kernel Algorithmics
+FPU emulator support, which allows one to save a couple of
+precious blocks on an embedded system.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+--
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -841,6 +841,17 @@ config I8259
+ config MIPS_BONITO64
+       bool
+ 
++config MIPS_FPU_EMU
++      bool "Enable FPU emulation"
++      default y
++      help
++         This option allows building a kernel with or without the Algorithmics
++         FPU emulator enabled. Turning off this option results in a kernel which
++         does not catch floating operations exceptions. Make sure that your toolchain
++         is configured to enable software floating point emulation in that case.
++              
++         If unsure say Y here.
++
+ config MIPS_MSC
+       bool
+ 
+--- a/arch/mips/math-emu/Makefile
++++ b/arch/mips/math-emu/Makefile
+@@ -2,12 +2,14 @@
+ # Makefile for the Linux/MIPS kernel FPU emulation.
+ #
+ 
+-obj-y := cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
++obj-y :=      kernel_linkage.o dsemul.o cp1emu.o
++
++obj-$(CONFIG_MIPS_FPU_EMU)    += ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
+          ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
+          dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
+          dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
+          sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
+          sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
+-         dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
++         dp_sqrt.o sp_sqrt.o
+ 
+ EXTRA_CFLAGS += -Werror
+--- a/arch/mips/math-emu/cp1emu.c
++++ b/arch/mips/math-emu/cp1emu.c
+@@ -58,7 +58,11 @@
+ #define __mips 4
+ 
+ /* Function which emulates a floating point instruction. */
++#ifdef CONFIG_DEBUG_FS
++DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
++#endif
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
+       mips_instruction);
+ 
+@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
+ 
+ /* Further private data for which no space exists in mips_fpu_struct */
+ 
+-#ifdef CONFIG_DEBUG_FS
+-DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
+-#endif
+-
+ /* Control registers */
+ 
+ #define FPCREG_RID    0       /* $0  = revision id */
+@@ -1284,7 +1284,6 @@ int fpu_emulator_cop1Handler(struct pt_r
+ 
+       return sig;
+ }
+-
+ #ifdef CONFIG_DEBUG_FS
+ 
+ static int fpuemu_stat_get(void *data, u64 *val)
+@@ -1333,4 +1332,11 @@ static int __init debugfs_fpuemu(void)
+       return 0;
+ }
+ __initcall(debugfs_fpuemu);
+-#endif
++#endif /* CONFIG_DEBUGFS */
++#else
++int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
++        int has_fpu)
++{
++      return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/math-emu/dsemul.c
++++ b/arch/mips/math-emu/dsemul.c
+@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
+       return SIGILL;          /* force out of emulation loop */
+ }
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ int do_dsemulret(struct pt_regs *xcp)
+ {
+       struct emuframe __user *fr;
+@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
+ 
+       return 1;
+ }
++#else
++int do_dsemulret(struct pt_regs *xcp)
++{
++      return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/math-emu/kernel_linkage.c
++++ b/arch/mips/math-emu/kernel_linkage.c
+@@ -29,6 +29,7 @@
+ 
+ #define SIGNALLING_NAN 0x7ff800007ff80000LL
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ void fpu_emulator_init_fpu(void)
+ {
+       static int first = 1;
+@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
+ 
+       return err;
+ }
+-#endif
++#endif        /* CONFIG_64BIT */
++#else
++
++void fpu_emulator_init_fpu(void)
++{
++      printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
++              "was compiled with software floating point support (soft-float)\n");
++      return;
++}
++
++int fpu_emulator_save_context(struct sigcontext __user *sc)
++{
++      return 0;
++}
++
++int fpu_emulator_restore_context(struct sigcontext __user *sc)
++{
++      return 0;
++}
++
++int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
++{
++      return 0;
++}
++
++int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
++{
++      return 0;
++}
++
++#ifdef CONFIG_64BIT
++#endif        /* CONFIG_64BIT */
++#endif /* CONFIG_MIPS_FPU_EMU */

diff --git a/target/linux/generic-2.6/patches-2.6.35/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.35/027-mips_module_reloc.patch
new file mode 100644 (file)
index 0000000..024e7f1
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/027-mips_module_reloc.patch
@@ -0,0 +1,368 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -93,7 +93,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ cflags-y                      += -G 0 -mno-abicalls -fno-pic -pipe
+ cflags-y                      += -msoft-float
+ LDFLAGS_vmlinux                       += -G 0 -static -n -nostdlib
+-MODFLAGS                      += -mlong-calls
++MODFLAGS                      += -mno-long-calls
+ 
+ cflags-y += -ffreestanding
+ 
+--- a/arch/mips/include/asm/module.h
++++ b/arch/mips/include/asm/module.h
+@@ -9,6 +9,11 @@ struct mod_arch_specific {
+       struct list_head dbe_list;
+       const struct exception_table_entry *dbe_start;
+       const struct exception_table_entry *dbe_end;
++
++      void *phys_plt_tbl;
++      void *virt_plt_tbl;
++      unsigned int phys_plt_offset;
++      unsigned int virt_plt_offset;
+ };
+ 
+ typedef uint8_t Elf64_Byte;           /* Type for a 8-bit quantity.  */
+--- a/arch/mips/kernel/module.c
++++ b/arch/mips/kernel/module.c
+@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
+ static LIST_HEAD(dbe_list);
+ static DEFINE_SPINLOCK(dbe_lock);
+ 
++/*
++ * Get the potential max trampolines size required of the init and
++ * non-init sections. Only used if we cannot find enough contiguous
++ * physically mapped memory to put the module into.
++ */
++static unsigned int
++get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
++             const char *secstrings, unsigned int symindex, bool is_init)
++{
++      unsigned long ret = 0;
++      unsigned int i, j;
++      Elf_Sym *syms;
++
++      /* Everything marked ALLOC (this includes the exported symbols) */
++      for (i = 1; i < hdr->e_shnum; ++i) {
++              unsigned int info = sechdrs[i].sh_info;
++
++              if (sechdrs[i].sh_type != SHT_REL
++                  && sechdrs[i].sh_type != SHT_RELA)
++                      continue;
++
++              /* Not a valid relocation section? */
++              if (info >= hdr->e_shnum)
++                      continue;
++
++              /* Don't bother with non-allocated sections */
++              if (!(sechdrs[info].sh_flags & SHF_ALLOC))
++                      continue;
++
++              /* If it's called *.init*, and we're not init, we're
++                   not interested */
++              if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
++                  != is_init)
++                      continue;
++
++              syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
++              if (sechdrs[i].sh_type == SHT_REL) {
++                      Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
++                      unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
++
++                      for (j = 0; j < size; ++j) {
++                              Elf_Sym *sym;
++
++                              if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
++                                      continue;
++
++                              sym = syms + ELF_MIPS_R_SYM(rel[j]);
++                              if (!is_init && sym->st_shndx != SHN_UNDEF)
++                                      continue;
++
++                              ret += 4 * sizeof(int);
++                      }
++              } else {
++                      Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
++                      unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
++
++                      for (j = 0; j < size; ++j) {
++                              Elf_Sym *sym;
++
++                              if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
++                                      continue;
++
++                              sym = syms + ELF_MIPS_R_SYM(rela[j]);
++                              if (!is_init && sym->st_shndx != SHN_UNDEF)
++                                      continue;
++
++                              ret += 4 * sizeof(int);
++                      }
++              }
++      }
++
++      return ret;
++}
++
++#ifndef MODULE_START
++static void *alloc_phys(unsigned long size)
++{
++      unsigned order;
++      struct page *page;
++      struct page *p;
++
++      size = PAGE_ALIGN(size);
++      order = get_order(size);
++
++      page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
++                      __GFP_THISNODE, order);
++      if (!page)
++              return NULL;
++
++      split_page(page, order);
++
++      for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
++              __free_page(p);
++
++      return page_address(page);
++}
++#endif
++
++static void free_phys(void *ptr, unsigned long size)
++{
++      struct page *page;
++      struct page *end;
++
++      page = virt_to_page(ptr);
++      end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
++
++      for (; page < end; ++page)
++              __free_page(page);
++}
++
++
+ void *module_alloc(unsigned long size)
+ {
+ #ifdef MODULE_START
+@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
+ 
+       return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
+ #else
++      void *ptr;
++
+       if (size == 0)
+               return NULL;
+-      return vmalloc(size);
++
++      ptr = alloc_phys(size);
++
++      /* If we failed to allocate physically contiguous memory,
++       * fall back to regular vmalloc. The module loader code will
++       * create jump tables to handle long jumps */
++      if (!ptr)
++              return vmalloc(size);
++
++      return ptr;
++#endif
++}
++
++static inline bool is_phys_addr(void *ptr)
++{
++#ifdef CONFIG_64BIT
++      return (KSEGX((unsigned long)ptr) == CKSEG0);
++#else
++      return (KSEGX(ptr) == KSEG0);
+ #endif
+ }
+ 
+ /* Free memory returned from module_alloc */
+ void module_free(struct module *mod, void *module_region)
+ {
+-      vfree(module_region);
++      if (is_phys_addr(module_region)) {
++              if (mod->module_init == module_region)
++                      free_phys(module_region, mod->init_size);
++              else if (mod->module_core == module_region)
++                      free_phys(module_region, mod->core_size);
++              else
++                      BUG();
++      } else {
++              vfree(module_region);
++      }
++}
++
++static void *__module_alloc(int size, bool phys)
++{
++      void *ptr;
++
++      if (phys)
++              ptr = kmalloc(size, GFP_KERNEL);
++      else
++              ptr = vmalloc(size);
++      return ptr;
++}
++
++static void __module_free(void *ptr)
++{
++      if (is_phys_addr(ptr))
++              kfree(ptr);
++      else
++              vfree(ptr);
+ }
+ 
+ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
+                             char *secstrings, struct module *mod)
+ {
++      unsigned int symindex = 0;
++      unsigned int core_size, init_size;
++      int i;
++
++      for (i = 1; i < hdr->e_shnum; i++)
++              if (sechdrs[i].sh_type == SHT_SYMTAB)
++                      symindex = i;
++
++      core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
++      init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
++
++      mod->arch.phys_plt_offset = 0;
++      mod->arch.virt_plt_offset = 0;
++      mod->arch.phys_plt_tbl = NULL;
++      mod->arch.virt_plt_tbl = NULL;
++
++      if ((core_size + init_size) == 0)
++              return 0;
++
++      mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
++      if (!mod->arch.phys_plt_tbl)
++              return -ENOMEM;
++
++      mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
++      if (!mod->arch.virt_plt_tbl) {
++              __module_free(mod->arch.phys_plt_tbl);
++              mod->arch.phys_plt_tbl = NULL;
++              return -ENOMEM;
++      }
++
+       return 0;
+ }
+ 
+@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
+       return 0;
+ }
+ 
+-static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
++static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
++                               void *start, Elf_Addr v)
+ {
+-      if (v % 4) {
+-              pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
+-                     me->name);
+-              return -ENOEXEC;
+-      }
++      unsigned *tramp = start + *plt_offset;
++      *plt_offset += 4 * sizeof(int);
+ 
+-      if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-              printk(KERN_ERR
+-                     "module %s: relocation overflow\n",
+-                     me->name);
+-              return -ENOEXEC;
+-      }
++      /* adjust carry for addiu */
++      if (v & 0x00008000)
++              v += 0x10000;
+ 
+-      *location = (*location & ~0x03ffffff) |
+-                  ((*location + (v >> 2)) & 0x03ffffff);
++      tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
++      tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
++      tramp[2] = 0x03200008;                  /* jr t9 */
++      tramp[3] = 0x00000000;                  /* nop */
+ 
+-      return 0;
++      return (Elf_Addr) tramp;
+ }
+ 
+-static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
++static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
++{
++      if (is_phys_addr(location))
++              return add_plt_entry_to(&me->arch.phys_plt_offset,
++                              me->arch.phys_plt_tbl, v);
++      else
++              return add_plt_entry_to(&me->arch.virt_plt_offset,
++                              me->arch.virt_plt_tbl, v);
++
++}
++
++static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
+ {
+       if (v % 4) {
+               pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
+@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
+       }
+ 
+       if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-              printk(KERN_ERR
++          v = add_plt_entry(me, location, v + (ofs << 2));
++              if (!v) {
++                      printk(KERN_ERR
+                      "module %s: relocation overflow\n",
+                      me->name);
+-              return -ENOEXEC;
++                      return -ENOEXEC;
++              }
++              ofs = 0;
+       }
+ 
+-      *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
++      *location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
+ 
+       return 0;
+ }
+ 
++static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
++{
++      return set_r_mips_26(me, location, *location & 0x03ffffff, v);
++}
++
++static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
++{
++      return set_r_mips_26(me, location, 0, v);
++}
++
+ static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
+ {
+       struct mips_hi16 *n;
+@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+               list_add(&me->arch.dbe_list, &dbe_list);
+               spin_unlock_irq(&dbe_lock);
+       }
++
++      /* Get rid of the fixup trampoline if we're running the module
++       * from physically mapped address space */
++      if (me->arch.phys_plt_offset == 0) {
++              __module_free(me->arch.phys_plt_tbl);
++              me->arch.phys_plt_tbl = NULL;
++      }
++      if (me->arch.virt_plt_offset == 0) {
++              __module_free(me->arch.virt_plt_tbl);
++              me->arch.virt_plt_tbl = NULL;
++      }
++
+       return 0;
+ }
+ 
+ void module_arch_cleanup(struct module *mod)
+ {
++      if (mod->arch.phys_plt_tbl) {
++              __module_free(mod->arch.phys_plt_tbl);
++              mod->arch.phys_plt_tbl = NULL;
++      }
++      if (mod->arch.virt_plt_tbl) {
++              __module_free(mod->arch.virt_plt_tbl);
++              mod->arch.virt_plt_tbl = NULL;
++      }
++
+       spin_lock_irq(&dbe_lock);
+       list_del(&mod->arch.dbe_list);
+       spin_unlock_irq(&dbe_lock);

diff --git a/target/linux/generic-2.6/patches-2.6.35/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.35/028-module_exports.patch
new file mode 100644 (file)
index 0000000..ad9074a
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/028-module_exports.patch
@@ -0,0 +1,119 @@
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -52,6 +52,27 @@
+ #define LOAD_OFFSET 0
+ #endif
+ 
++#ifndef SYMTAB_KEEP_STR
++#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
++#define SYMTAB_DISCARD_STR
++#else
++#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
++#endif
++
++#ifndef SYMTAB_KEEP
++#define SYMTAB_KEEP *(__ksymtab.*)
++#define SYMTAB_DISCARD
++#else
++#define SYMTAB_DISCARD *(__ksymtab.*)
++#endif
++
++#ifndef SYMTAB_KEEP_GPL
++#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
++#define SYMTAB_DISCARD_GPL
++#else
++#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
++#endif
++
+ #ifndef SYMBOL_PREFIX
+ #define VMLINUX_SYMBOL(sym) sym
+ #else
+@@ -258,35 +279,35 @@
+       /* Kernel symbol table: Normal symbols */                       \
+       __ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {         \
+               VMLINUX_SYMBOL(__start___ksymtab) = .;                  \
+-              *(__ksymtab)                                            \
++              SYMTAB_KEEP                                             \
+               VMLINUX_SYMBOL(__stop___ksymtab) = .;                   \
+       }                                                               \
+                                                                       \
+       /* Kernel symbol table: GPL-only symbols */                     \
+       __ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {     \
+               VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;              \
+-              *(__ksymtab_gpl)                                        \
++              SYMTAB_KEEP_GPL                                         \
+               VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;               \
+       }                                                               \
+                                                                       \
+       /* Kernel symbol table: Normal unused symbols */                \
+       __ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {  \
+               VMLINUX_SYMBOL(__start___ksymtab_unused) = .;           \
+-              *(__ksymtab_unused)                                     \
++              *(__ksymtab_unused.*)                                   \
+               VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;            \
+       }                                                               \
+                                                                       \
+       /* Kernel symbol table: GPL-only unused symbols */              \
+       __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
+               VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;       \
+-              *(__ksymtab_unused_gpl)                                 \
++              *(__ksymtab_unused_gpl.*)                               \
+               VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;        \
+       }                                                               \
+                                                                       \
+       /* Kernel symbol table: GPL-future-only symbols */              \
+       __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
+               VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;       \
+-              *(__ksymtab_gpl_future)                                 \
++              *(__ksymtab_gpl_future.*)                               \
+               VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;        \
+       }                                                               \
+                                                                       \
+@@ -327,7 +348,7 @@
+                                                                       \
+       /* Kernel symbol table: strings */                              \
+         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {       \
+-              *(__ksymtab_strings)                                    \
++              SYMTAB_KEEP_STR                                         \
+       }                                                               \
+                                                                       \
+       /* __*init sections */                                          \
+@@ -642,6 +663,9 @@
+       EXIT_TEXT                                                       \
+       EXIT_DATA                                                       \
+       EXIT_CALL                                                       \
++      SYMTAB_DISCARD                                                  \
++      SYMTAB_DISCARD_GPL                                              \
++      SYMTAB_DISCARD_STR                                              \
+       *(.discard)                                                     \
+       }
+ 
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -195,16 +195,24 @@ void *__symbol_get_gpl(const char *symbo
+ #define __CRC_SYMBOL(sym, sec)
+ #endif
+ 
++#ifdef MODULE
++#define __EXPORT_SUFFIX(sym)
++#else
++#define __EXPORT_SUFFIX(sym) "." #sym
++#endif
++
+ /* For every exported symbol, place a struct in the __ksymtab section */
+ #define __EXPORT_SYMBOL(sym, sec)                             \
+       extern typeof(sym) sym;                                 \
+       __CRC_SYMBOL(sym, sec)                                  \
+       static const char __kstrtab_##sym[]                     \
+-      __attribute__((section("__ksymtab_strings"), aligned(1))) \
++      __attribute__((section("__ksymtab_strings"              \
++        __EXPORT_SUFFIX(sym)), aligned(1)))                   \
+       = MODULE_SYMBOL_PREFIX #sym;                            \
+       static const struct kernel_symbol __ksymtab_##sym       \
+       __used                                                  \
+-      __attribute__((section("__ksymtab" sec), unused))       \
++      __attribute__((section("__ksymtab" sec                  \
++        __EXPORT_SUFFIX(sym)), unused))                       \
+       = { (unsigned long)&sym, __kstrtab_##sym }
+ 
+ #define EXPORT_SYMBOL(sym)                                    \

diff --git a/target/linux/generic-2.6/patches-2.6.35/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.35/029-arm_module_unresolved_weak_sym.patch
new file mode 100644 (file)
index 0000000..8a3b2e2
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/029-arm_module_unresolved_weak_sym.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -121,6 +121,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+                       return -ENOEXEC;
+               }
+ 
++              if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++                  ELF_ST_BIND(sym->st_info) == STB_WEAK)
++                      continue;
++
+               loc = dstsec->sh_addr + rel->r_offset;
+ 
+               switch (ELF32_R_TYPE(rel->r_info)) {

diff --git a/target/linux/generic-2.6/patches-2.6.35/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.35/030-pci_disable_common_quirks.patch
new file mode 100644 (file)
index 0000000..0cf1978
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/030-pci_disable_common_quirks.patch
@@ -0,0 +1,43 @@
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -40,6 +40,12 @@ config PCI_STUB
+ 
+         When in doubt, say N.
+ 
++config PCI_DISABLE_COMMON_QUIRKS
++      bool "PCI disable common quirks"
++      depends on PCI
++      help
++        If you don't know what to do here, say N.
++
+ config HT_IRQ
+       bool "Interrupts on hypertransport devices"
+       default y
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -91,6 +91,7 @@ static void __devinit quirk_resource_ali
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* The Mellanox Tavor device gives false positive parity errors
+  * Mark this device with a broken_parity_status, to allow
+  * PCI scanning code to "skip" this now blacklisted device.
+@@ -1901,7 +1902,9 @@ static void __devinit fixup_rev1_53c810(
+       }
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* Enable 1k I/O space granularity on the Intel P64H2 */
+ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
+ {
+@@ -2551,6 +2554,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
+ 
+ #endif        /* CONFIG_PCI_IOV */
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
+ /*
+  * This is a quirk for the Ricoh MMC controller found as a part of

diff --git a/target/linux/generic-2.6/patches-2.6.35/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.35/031-ppc_gcc_build_fix.patch
new file mode 100644 (file)
index 0000000..be4d2bf
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/031-ppc_gcc_build_fix.patch
@@ -0,0 +1,226 @@
+GCC 4.4.x looks to be adding support for generating out-of-line register
+saves/restores based on:
+
+http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
+
+This breaks the kernel build as we'd have to link with libgcc to get the
+implementation of the register save/restores.
+
+To workaround this issue, we just stole the save/restore code from gcc
+and simplified it down for our needs (integer only).  We only do this if
+PPC32 as gcc makes believe the linker on ppc64 will deal with this and
+only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
+
+Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
+---
+
+If someone using cutting edge toolchains for ppc64 could test and make
+sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
+nice.
+
+- k
+
+ arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
+ arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 188 insertions(+), 0 deletions(-)
+
+--- a/arch/powerpc/kernel/misc_32.S
++++ b/arch/powerpc/kernel/misc_32.S
+@@ -802,3 +802,80 @@ relocate_new_kernel_end:
+ relocate_new_kernel_size:
+       .long relocate_new_kernel_end - relocate_new_kernel
+ #endif
++
++#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
++/* Routines for saving integer registers, called by the compiler.  */
++/* Called with r11 pointing to the stack header word of the caller of the */
++/* function, just beyond the end of the integer save area.  */
++
++_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
++_GLOBAL(_savegpr_15)   stw     15,-68(11)
++_GLOBAL(_savegpr_16)   stw     16,-64(11)
++_GLOBAL(_savegpr_17)   stw     17,-60(11)
++_GLOBAL(_savegpr_18)   stw     18,-56(11)
++_GLOBAL(_savegpr_19)   stw     19,-52(11)
++_GLOBAL(_savegpr_20)   stw     20,-48(11)
++_GLOBAL(_savegpr_21)   stw     21,-44(11)
++_GLOBAL(_savegpr_22)   stw     22,-40(11)
++_GLOBAL(_savegpr_23)   stw     23,-36(11)
++_GLOBAL(_savegpr_24)   stw     24,-32(11)
++_GLOBAL(_savegpr_25)   stw     25,-28(11)
++_GLOBAL(_savegpr_26)   stw     26,-24(11)
++_GLOBAL(_savegpr_27)   stw     27,-20(11)
++_GLOBAL(_savegpr_28)   stw     28,-16(11)
++_GLOBAL(_savegpr_29)   stw     29,-12(11)
++_GLOBAL(_savegpr_30)   stw     30,-8(11)
++_GLOBAL(_savegpr_31)   stw     31,-4(11)
++                       blr
++
++/* Routines for restoring integer registers, called by the compiler.  */
++/* Called with r11 pointing to the stack header word of the caller of the */
++/* function, just beyond the end of the integer restore area.  */
++
++_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
++_GLOBAL(_restgpr_15)   lwz     15,-68(11)
++_GLOBAL(_restgpr_16)   lwz     16,-64(11)
++_GLOBAL(_restgpr_17)   lwz     17,-60(11)
++_GLOBAL(_restgpr_18)   lwz     18,-56(11)
++_GLOBAL(_restgpr_19)   lwz     19,-52(11)
++_GLOBAL(_restgpr_20)   lwz     20,-48(11)
++_GLOBAL(_restgpr_21)   lwz     21,-44(11)
++_GLOBAL(_restgpr_22)   lwz     22,-40(11)
++_GLOBAL(_restgpr_23)   lwz     23,-36(11)
++_GLOBAL(_restgpr_24)   lwz     24,-32(11)
++_GLOBAL(_restgpr_25)   lwz     25,-28(11)
++_GLOBAL(_restgpr_26)   lwz     26,-24(11)
++_GLOBAL(_restgpr_27)   lwz     27,-20(11)
++_GLOBAL(_restgpr_28)   lwz     28,-16(11)
++_GLOBAL(_restgpr_29)   lwz     29,-12(11)
++_GLOBAL(_restgpr_30)   lwz     30,-8(11)
++_GLOBAL(_restgpr_31)   lwz     31,-4(11)
++                       blr
++
++/* Routines for restoring integer registers, called by the compiler.  */
++/* Called with r11 pointing to the stack header word of the caller of the */
++/* function, just beyond the end of the integer restore area.  */
++
++_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
++_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
++_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
++_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
++_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
++_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
++_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
++_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
++_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
++_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
++_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
++_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
++_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
++_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
++_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
++_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
++_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
++_GLOBAL(_restgpr_31_x) lwz     0,4(11)
++                       lwz     31,-4(11)
++                       mtlr    0
++                       mr      1,11
++                       blr
++#endif
+--- a/arch/powerpc/kernel/ppc_ksyms.c
++++ b/arch/powerpc/kernel/ppc_ksyms.c
+@@ -186,3 +186,114 @@ EXPORT_SYMBOL(__mtdcr);
+ EXPORT_SYMBOL(__mfdcr);
+ #endif
+ EXPORT_SYMBOL(empty_zero_page);
++
++#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
++void _savegpr_14(void);
++void _savegpr_15(void);
++void _savegpr_16(void);
++void _savegpr_17(void);
++void _savegpr_18(void);
++void _savegpr_19(void);
++void _savegpr_20(void);
++void _savegpr_21(void);
++void _savegpr_22(void);
++void _savegpr_23(void);
++void _savegpr_24(void);
++void _savegpr_25(void);
++void _savegpr_26(void);
++void _savegpr_27(void);
++void _savegpr_28(void);
++void _savegpr_29(void);
++void _savegpr_30(void);
++void _savegpr_31(void);
++void _restgpr_14(void);
++void _restgpr_15(void);
++void _restgpr_16(void);
++void _restgpr_17(void);
++void _restgpr_18(void);
++void _restgpr_19(void);
++void _restgpr_20(void);
++void _restgpr_21(void);
++void _restgpr_22(void);
++void _restgpr_23(void);
++void _restgpr_24(void);
++void _restgpr_25(void);
++void _restgpr_26(void);
++void _restgpr_27(void);
++void _restgpr_28(void);
++void _restgpr_29(void);
++void _restgpr_30(void);
++void _restgpr_31(void);
++void _restgpr_14_x(void);
++void _restgpr_15_x(void);
++void _restgpr_16_x(void);
++void _restgpr_17_x(void);
++void _restgpr_18_x(void);
++void _restgpr_19_x(void);
++void _restgpr_20_x(void);
++void _restgpr_21_x(void);
++void _restgpr_22_x(void);
++void _restgpr_23_x(void);
++void _restgpr_24_x(void);
++void _restgpr_25_x(void);
++void _restgpr_26_x(void);
++void _restgpr_27_x(void);
++void _restgpr_28_x(void);
++void _restgpr_29_x(void);
++void _restgpr_30_x(void);
++void _restgpr_31_x(void);
++EXPORT_SYMBOL(_savegpr_14);
++EXPORT_SYMBOL(_savegpr_15);
++EXPORT_SYMBOL(_savegpr_16);
++EXPORT_SYMBOL(_savegpr_17);
++EXPORT_SYMBOL(_savegpr_18);
++EXPORT_SYMBOL(_savegpr_19);
++EXPORT_SYMBOL(_savegpr_20);
++EXPORT_SYMBOL(_savegpr_21);
++EXPORT_SYMBOL(_savegpr_22);
++EXPORT_SYMBOL(_savegpr_23);
++EXPORT_SYMBOL(_savegpr_24);
++EXPORT_SYMBOL(_savegpr_25);
++EXPORT_SYMBOL(_savegpr_26);
++EXPORT_SYMBOL(_savegpr_27);
++EXPORT_SYMBOL(_savegpr_28);
++EXPORT_SYMBOL(_savegpr_29);
++EXPORT_SYMBOL(_savegpr_30);
++EXPORT_SYMBOL(_savegpr_31);
++EXPORT_SYMBOL(_restgpr_14);
++EXPORT_SYMBOL(_restgpr_15);
++EXPORT_SYMBOL(_restgpr_16);
++EXPORT_SYMBOL(_restgpr_17);
++EXPORT_SYMBOL(_restgpr_18);
++EXPORT_SYMBOL(_restgpr_19);
++EXPORT_SYMBOL(_restgpr_20);
++EXPORT_SYMBOL(_restgpr_21);
++EXPORT_SYMBOL(_restgpr_22);
++EXPORT_SYMBOL(_restgpr_23);
++EXPORT_SYMBOL(_restgpr_24);
++EXPORT_SYMBOL(_restgpr_25);
++EXPORT_SYMBOL(_restgpr_26);
++EXPORT_SYMBOL(_restgpr_27);
++EXPORT_SYMBOL(_restgpr_28);
++EXPORT_SYMBOL(_restgpr_29);
++EXPORT_SYMBOL(_restgpr_30);
++EXPORT_SYMBOL(_restgpr_31);
++EXPORT_SYMBOL(_restgpr_14_x);
++EXPORT_SYMBOL(_restgpr_15_x);
++EXPORT_SYMBOL(_restgpr_16_x);
++EXPORT_SYMBOL(_restgpr_17_x);
++EXPORT_SYMBOL(_restgpr_18_x);
++EXPORT_SYMBOL(_restgpr_19_x);
++EXPORT_SYMBOL(_restgpr_20_x);
++EXPORT_SYMBOL(_restgpr_21_x);
++EXPORT_SYMBOL(_restgpr_22_x);
++EXPORT_SYMBOL(_restgpr_23_x);
++EXPORT_SYMBOL(_restgpr_24_x);
++EXPORT_SYMBOL(_restgpr_25_x);
++EXPORT_SYMBOL(_restgpr_26_x);
++EXPORT_SYMBOL(_restgpr_27_x);
++EXPORT_SYMBOL(_restgpr_28_x);
++EXPORT_SYMBOL(_restgpr_29_x);
++EXPORT_SYMBOL(_restgpr_30_x);
++EXPORT_SYMBOL(_restgpr_31_x);
++#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */

diff --git a/target/linux/generic-2.6/patches-2.6.35/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.35/060-block2mtd_init.patch
new file mode 100644 (file)
index 0000000..7ff9c27
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/060-block2mtd_init.patch
@@ -0,0 +1,115 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -14,6 +14,7 @@
+ #include <linux/list.h>
+ #include <linux/init.h>
+ #include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
+ #include <linux/buffer_head.h>
+ #include <linux/mutex.h>
+ #include <linux/mount.h>
+@@ -233,10 +234,11 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+ {
+       struct block_device *bdev;
+       struct block2mtd_dev *dev;
++      struct mtd_partition *part;
+       char *name;
+ 
+       if (!devname)
+@@ -276,13 +278,16 @@ static struct block2mtd_dev *add_device(
+ 
+       /* Setup the MTD structure */
+       /* make the name contain the block device in */
+-      name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
++      if (!mtdname)
++              mtdname = devname;
++      name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
+       if (!name)
+               goto devinit_err;
+ 
++      strcpy(name, mtdname);
+       dev->mtd.name = name;
+ 
+-      dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
++      dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
+       dev->mtd.erasesize = erase_size;
+       dev->mtd.writesize = 1;
+       dev->mtd.type = MTD_RAM;
+@@ -295,14 +300,17 @@ static struct block2mtd_dev *add_device(
+       dev->mtd.priv = dev;
+       dev->mtd.owner = THIS_MODULE;
+ 
+-      if (add_mtd_device(&dev->mtd)) {
++      part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
++      part->name = dev->mtd.name;
++      part->offset = 0;
++      part->size = dev->mtd.size;
++      if (add_mtd_partitions(&dev->mtd, part, 1)) {
+               /* Device didnt get added, so free the entry */
+               goto devinit_err;
+       }
+       list_add(&dev->list, &blkmtd_device_list);
+       INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
+-                      dev->mtd.name + strlen("block2mtd: "),
+-                      dev->mtd.erasesize >> 10, dev->mtd.erasesize);
++                      mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
+       return dev;
+ 
+ devinit_err:
+@@ -375,9 +383,9 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-      char buf[80 + 12]; /* 80 for device, 12 for erase size */
++      char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
+       char *str = buf;
+-      char *token[2];
++      char *token[3];
+       char *name;
+       size_t erase_size = PAGE_SIZE;
+       int i, ret;
+@@ -388,7 +396,7 @@ static int block2mtd_setup2(const char *
+       strcpy(str, val);
+       kill_final_newline(str);
+ 
+-      for (i = 0; i < 2; i++)
++      for (i = 0; i < 3; i++)
+               token[i] = strsep(&str, ",");
+ 
+       if (str)
+@@ -407,8 +415,10 @@ static int block2mtd_setup2(const char *
+                       parse_err("illegal erase size");
+               }
+       }
++      if (token[2] && (strlen(token[2]) + 1 > 80))
++              parse_err("mtd device name too long");
+ 
+-      add_device(name, erase_size);
++      add_device(name, erase_size, token[2]);
+ 
+       return 0;
+ }
+@@ -442,7 +452,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
+--- a/fs/partitions/check.c
++++ b/fs/partitions/check.c
+@@ -639,6 +639,7 @@ try_scan:
+       kfree(state);
+       return 0;
+ }
++EXPORT_SYMBOL(rescan_partitions);
+ 
+ unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
+ {

diff --git a/target/linux/generic-2.6/patches-2.6.35/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.35/065-rootfs_split.patch
new file mode 100644 (file)
index 0000000..d70d183
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/065-rootfs_split.patch
@@ -0,0 +1,625 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -53,6 +53,16 @@ config MTD_PARTITIONS
+         devices. Partitioning on NFTL 'devices' is a different - that's the
+         'normal' form of partitioning used on a block device.
+ 
++config MTD_ROOTFS_ROOT_DEV
++      bool "Automatically set 'rootfs' partition to be root filesystem"
++      depends on MTD_PARTITIONS
++      default y
++
++config MTD_ROOTFS_SPLIT
++      bool "Automatically split 'rootfs' partition for squashfs"
++      depends on MTD_PARTITIONS
++      default y
++
+ config MTD_REDBOOT_PARTS
+       tristate "RedBoot partition table parsing"
+       depends on MTD_PARTITIONS
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -18,6 +18,8 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/mtd/compatmac.h>
++#include <linux/root_dev.h>
++#include <linux/magic.h>
+ 
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+@@ -35,7 +37,7 @@ struct mtd_part {
+  * the pointer to that structure with this macro.
+  */
+ #define PART(x)  ((struct mtd_part *)(x))
+-
++#define IS_PART(mtd) (mtd->read == part_read)
+ 
+ /*
+  * MTD methods which simply translate the effective address and pass through
+@@ -503,6 +505,150 @@ out_register:
+       return slave;
+ }
+ 
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++#define ROOTFS_SPLIT_NAME "rootfs_data"
++#define ROOTFS_REMOVED_NAME "<removed>"
++
++struct squashfs_super_block {
++      __le32 s_magic;
++      __le32 pad0[9];
++      __le64 bytes_used;
++};
++
++
++static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
++{
++      struct squashfs_super_block sb;
++      int len, ret;
++
++      ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
++      if (ret || (len != sizeof(sb))) {
++              printk(KERN_ALERT "split_squashfs: error occured while reading "
++                      "from \"%s\"\n", master->name);
++              return -EINVAL;
++      }
++
++      if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
++              printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
++                      master->name);
++              *split_offset = 0;
++              return 0;
++      }
++
++      if (le64_to_cpu((sb.bytes_used)) <= 0) {
++              printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
++                      master->name);
++              *split_offset = 0;
++              return 0;
++      }
++
++      len = (u32) le64_to_cpu(sb.bytes_used);
++      len += (offset & 0x000fffff);
++      len +=  (master->erasesize - 1);
++      len &= ~(master->erasesize - 1);
++      len -= (offset & 0x000fffff);
++      *split_offset = offset + len;
++
++      return 0;
++}
++
++static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
++{
++      struct mtd_partition *dpart;
++      struct mtd_part *slave = NULL;
++      int split_offset = 0;
++      int ret;
++
++      ret = split_squashfs(master, part->offset, &split_offset);
++      if (ret)
++              return ret;
++
++      if (split_offset <= 0)
++              return 0;
++
++      dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
++      if (dpart == NULL) {
++              printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
++                      ROOTFS_SPLIT_NAME);
++              return -ENOMEM;
++      }
++
++      memcpy(dpart, part, sizeof(*part));
++      dpart->name = (unsigned char *)&dpart[1];
++      strcpy(dpart->name, ROOTFS_SPLIT_NAME);
++
++      dpart->size -= split_offset - dpart->offset;
++      dpart->offset = split_offset;
++
++      if (dpart == NULL)
++              return 1;
++
++      printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
++              ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
++
++      slave = add_one_partition(master, dpart, 0, split_offset);
++      if (!slave) {
++              kfree(dpart);
++              return -ENOMEM;
++      }
++      rpart->split = &slave->mtd;
++
++      return 0;
++}
++
++static int refresh_rootfs_split(struct mtd_info *mtd)
++{
++      struct mtd_partition tpart;
++      struct mtd_part *part;
++      char *name;
++      //int index = 0;
++      int offset, size;
++      int ret;
++
++      part = PART(mtd);
++
++      /* check for the new squashfs offset first */
++      ret = split_squashfs(part->master, part->offset, &offset);
++      if (ret)
++              return ret;
++
++      if ((offset > 0) && !mtd->split) {
++              printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
++              /* if we don't have a rootfs split partition, create a new one */
++              tpart.name = (char *) mtd->name;
++              tpart.size = mtd->size;
++              tpart.offset = part->offset;
++
++              return split_rootfs_data(part->master, &part->mtd, &tpart);
++      } else if ((offset > 0) && mtd->split) {
++              /* update the offsets of the existing partition */
++              size = mtd->size + part->offset - offset;
++
++              part = PART(mtd->split);
++              part->offset = offset;
++              part->mtd.size = size;
++              printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
++                      __func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
++                      (u32) part->offset, (u32) part->mtd.size);
++              name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
++              strcpy(name, ROOTFS_SPLIT_NAME);
++              part->mtd.name = name;
++      } else if ((offset <= 0) && mtd->split) {
++              printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
++
++              /* mark existing partition as removed */
++              part = PART(mtd->split);
++              name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
++              strcpy(name, ROOTFS_REMOVED_NAME);
++              part->mtd.name = name;
++              part->offset = 0;
++              part->mtd.size = 0;
++      }
++
++      return 0;
++}
++#endif /* CONFIG_MTD_ROOTFS_SPLIT */
++
+ /*
+  * This function, given a master MTD object and a partition table, creates
+  * and registers slave MTD objects which are bound to the master according to
+@@ -518,7 +664,7 @@ int add_mtd_partitions(struct mtd_info *
+ {
+       struct mtd_part *slave;
+       uint64_t cur_offset = 0;
+-      int i;
++      int i, ret;
+ 
+       printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
+ 
+@@ -526,6 +672,21 @@ int add_mtd_partitions(struct mtd_info *
+               slave = add_one_partition(master, parts + i, i, cur_offset);
+               if (!slave)
+                       return -ENOMEM;
++
++              if (!strcmp(parts[i].name, "rootfs")) {
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++                      if (ROOT_DEV == 0) {
++                              printk(KERN_NOTICE "mtd: partition \"rootfs\" "
++                                      "set to be root filesystem\n");
++                              ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
++                      }
++#endif
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++                      ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
++                      /* if (ret == 0)
++                              j++; */
++#endif
++              }
+               cur_offset = slave->offset + slave->mtd.size;
+       }
+ 
+@@ -533,6 +694,32 @@ int add_mtd_partitions(struct mtd_info *
+ }
+ EXPORT_SYMBOL(add_mtd_partitions);
+ 
++int refresh_mtd_partitions(struct mtd_info *mtd)
++{
++      int ret = 0;
++
++      if (IS_PART(mtd)) {
++              struct mtd_part *part;
++              struct mtd_info *master;
++
++              part = PART(mtd);
++              master = part->master;
++              if (master->refresh_device)
++                      ret = master->refresh_device(master);
++      }
++
++      if (!ret && mtd->refresh_device)
++              ret = mtd->refresh_device(mtd);
++
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++      if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
++              refresh_rootfs_split(mtd);
++#endif
++
++      return 0;
++}
++EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
++
+ static DEFINE_SPINLOCK(part_parser_lock);
+ static LIST_HEAD(part_parsers);
+ 
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -30,6 +30,8 @@ struct block2mtd_dev {
+       struct block_device *blkdev;
+       struct mtd_info mtd;
+       struct mutex write_mutex;
++      rwlock_t bdev_mutex;
++      char devname[0];
+ };
+ 
+ 
+@@ -82,6 +84,12 @@ static int block2mtd_erase(struct mtd_in
+       size_t len = instr->len;
+       int err;
+ 
++      read_lock(&dev->bdev_mutex);
++      if (!dev->blkdev) {
++              err = -EINVAL;
++              goto done;
++      }
++
+       instr->state = MTD_ERASING;
+       mutex_lock(&dev->write_mutex);
+       err = _block2mtd_erase(dev, from, len);
+@@ -94,6 +102,10 @@ static int block2mtd_erase(struct mtd_in
+ 
+       instr->state = MTD_ERASE_DONE;
+       mtd_erase_callback(instr);
++
++done:
++      read_unlock(&dev->bdev_mutex);
++
+       return err;
+ }
+ 
+@@ -105,10 +117,14 @@ static int block2mtd_read(struct mtd_inf
+       struct page *page;
+       int index = from >> PAGE_SHIFT;
+       int offset = from & (PAGE_SIZE-1);
+-      int cpylen;
++      int cpylen, err = 0;
++
++      read_lock(&dev->bdev_mutex);
++      if (!dev->blkdev || (from > mtd->size)) {
++              err = -EINVAL;
++              goto done;
++      }
+ 
+-      if (from > mtd->size)
+-              return -EINVAL;
+       if (from + len > mtd->size)
+               len = mtd->size - from;
+ 
+@@ -123,10 +139,14 @@ static int block2mtd_read(struct mtd_inf
+               len = len - cpylen;
+ 
+               page = page_read(dev->blkdev->bd_inode->i_mapping, index);
+-              if (!page)
+-                      return -ENOMEM;
+-              if (IS_ERR(page))
+-                      return PTR_ERR(page);
++              if (!page) {
++                      err = -ENOMEM;
++                      goto done;
++              }
++              if (IS_ERR(page)) {
++                      err = PTR_ERR(page);
++                      goto done;
++              }
+ 
+               memcpy(buf, page_address(page) + offset, cpylen);
+               page_cache_release(page);
+@@ -137,7 +157,10 @@ static int block2mtd_read(struct mtd_inf
+               offset = 0;
+               index++;
+       }
+-      return 0;
++
++done:
++      read_unlock(&dev->bdev_mutex);
++      return err;
+ }
+ 
+ 
+@@ -189,12 +212,22 @@ static int block2mtd_write(struct mtd_in
+               size_t *retlen, const u_char *buf)
+ {
+       struct block2mtd_dev *dev = mtd->priv;
+-      int err;
++      int err = 0;
++
++      read_lock(&dev->bdev_mutex);
++      if (!dev->blkdev) {
++              err = -EINVAL;
++              goto done;
++      }
+ 
+       if (!len)
+-              return 0;
+-      if (to >= mtd->size)
+-              return -ENOSPC;
++              goto done;
++
++      if (to >= mtd->size) {
++              err = -ENOSPC;
++              goto done;
++      }
++
+       if (to + len > mtd->size)
+               len = mtd->size - to;
+ 
+@@ -203,6 +236,9 @@ static int block2mtd_write(struct mtd_in
+       mutex_unlock(&dev->write_mutex);
+       if (err > 0)
+               err = 0;
++
++done:
++      read_unlock(&dev->bdev_mutex);
+       return err;
+ }
+ 
+@@ -211,52 +247,29 @@ static int block2mtd_write(struct mtd_in
+ static void block2mtd_sync(struct mtd_info *mtd)
+ {
+       struct block2mtd_dev *dev = mtd->priv;
+-      sync_blockdev(dev->blkdev);
+-      return;
+-}
+-
+-
+-static void block2mtd_free_device(struct block2mtd_dev *dev)
+-{
+-      if (!dev)
+-              return;
+-
+-      kfree(dev->mtd.name);
+ 
+-      if (dev->blkdev) {
+-              invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
+-                                      0, -1);
+-              close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
+-      }
++      read_lock(&dev->bdev_mutex);
++      if (dev->blkdev)
++              sync_blockdev(dev->blkdev);
++      read_unlock(&dev->bdev_mutex);
+ 
+-      kfree(dev);
++      return;
+ }
+ 
+ 
+-/* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
++static int _open_bdev(struct block2mtd_dev *dev)
+ {
+       struct block_device *bdev;
+-      struct block2mtd_dev *dev;
+-      struct mtd_partition *part;
+-      char *name;
+-
+-      if (!devname)
+-              return NULL;
+-
+-      dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
+-      if (!dev)
+-              return NULL;
+ 
+       /* Get a handle on the device */
+-      bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
++      bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
+ #ifndef MODULE
+       if (IS_ERR(bdev)) {
+ 
+               /* We might not have rootfs mounted at this point. Try
+                  to resolve the device name by other means. */
+ 
+-              dev_t devt = name_to_dev_t(devname);
++              dev_t devt = name_to_dev_t(dev->devname);
+               if (devt) {
+                       bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+               }
+@@ -264,17 +277,98 @@ static struct block2mtd_dev *add_device(
+ #endif
+ 
+       if (IS_ERR(bdev)) {
+-              ERROR("error: cannot open device %s", devname);
+-              goto devinit_err;
++              ERROR("error: cannot open device %s", dev->devname);
++              return 1;
+       }
+       dev->blkdev = bdev;
+ 
+       if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
+               ERROR("attempting to use an MTD device as a block device");
+-              goto devinit_err;
++              return 1;
+       }
+ 
++      return 0;
++}
++
++static void _close_bdev(struct block2mtd_dev *dev)
++{
++      struct block_device *bdev;
++
++      if (!dev->blkdev)
++              return;
++
++      bdev = dev->blkdev;
++      invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
++      close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
++      dev->blkdev = NULL;
++}
++
++static void block2mtd_free_device(struct block2mtd_dev *dev)
++{
++      if (!dev)
++              return;
++
++      kfree(dev->mtd.name);
++      _close_bdev(dev);
++      kfree(dev);
++}
++
++
++static int block2mtd_refresh(struct mtd_info *mtd)
++{
++      struct block2mtd_dev *dev = mtd->priv;
++      struct block_device *bdev;
++      dev_t devt;
++      int err = 0;
++
++      /* no other mtd function can run at this point */
++      write_lock(&dev->bdev_mutex);
++
++      /* get the device number for the whole disk */
++      devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
++
++      /* close the old block device */
++      _close_bdev(dev);
++
++      /* open the whole disk, issue a partition rescan, then */
++      bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
++      if (!bdev || !bdev->bd_disk)
++              err = -EINVAL;
++#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
++      else
++              err = rescan_partitions(bdev->bd_disk, bdev);
++#endif
++      if (bdev)
++              close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
++
++      /* try to open the partition block device again */
++      _open_bdev(dev);
++      write_unlock(&dev->bdev_mutex);
++
++      return err;
++}
++
++/* FIXME: ensure that mtd->size % erase_size == 0 */
++static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
++{
++      struct block2mtd_dev *dev;
++      struct mtd_partition *part;
++      char *name;
++
++      if (!devname)
++              return NULL;
++
++      dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
++      if (!dev)
++              return NULL;
++
++      strcpy(dev->devname, devname);
++
++      if (_open_bdev(dev))
++              goto devinit_err;
++
+       mutex_init(&dev->write_mutex);
++      rwlock_init(&dev->bdev_mutex);
+ 
+       if (!mtdname)
+               mtdname = devname;
+@@ -298,6 +392,7 @@ static struct block2mtd_dev *add_device(
+       dev->mtd.read = block2mtd_read;
+       dev->mtd.priv = dev;
+       dev->mtd.owner = THIS_MODULE;
++      dev->mtd.refresh_device = block2mtd_refresh;
+ 
+       part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
+       part->name = dev->mtd.name;
+--- a/drivers/mtd/mtdchar.c
++++ b/drivers/mtd/mtdchar.c
+@@ -18,6 +18,7 @@
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/compatmac.h>
++#include <linux/mtd/partitions.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
+               file->f_pos = 0;
+               break;
+       }
++#ifdef CONFIG_MTD_PARTITIONS
++      case MTDREFRESH:
++      {
++              ret = refresh_mtd_partitions(mtd);
++              break;
++      }
++#endif
+ 
+       default:
+               ret = -ENOTTY;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -101,6 +101,7 @@ struct mtd_oob_ops {
+       uint8_t         *oobbuf;
+ };
+ 
++struct mtd_info;
+ struct mtd_info {
+       u_char type;
+       uint32_t flags;
+@@ -241,6 +242,9 @@ struct mtd_info {
+       struct device dev;
+       int usecount;
+ 
++      int (*refresh_device)(struct mtd_info *mtd);
++      struct mtd_info *split;
++
+       /* If the driver is something smart, like UBI, it may need to maintain
+        * its own reference counting. The below functions are only for driver.
+        * The driver may register its callbacks. These callbacks are not
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -34,12 +34,14 @@
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
+ 
++struct mtd_partition;
+ struct mtd_partition {
+       char *name;                     /* identifier string */
+       uint64_t size;                  /* partition size */
+       uint64_t offset;                /* offset within the master MTD space */
+       uint32_t mask_flags;            /* master MTD flags to mask out for this partition */
+       struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
++      int (*refresh_partition)(struct mtd_info *);
+ };
+ 
+ #define MTDPART_OFS_NXTBLK    (-2)
+@@ -51,6 +53,7 @@ struct mtd_info;
+ 
+ int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
+ int del_mtd_partitions(struct mtd_info *);
++int refresh_mtd_partitions(struct mtd_info *);
+ 
+ /*
+  * Functions dealing with the various ways of partitioning the space
+--- a/include/mtd/mtd-abi.h
++++ b/include/mtd/mtd-abi.h
+@@ -110,6 +110,7 @@ struct otp_info {
+ #define MEMERASE64            _IOW('M', 20, struct erase_info_user64)
+ #define MEMWRITEOOB64         _IOWR('M', 21, struct mtd_oob_buf64)
+ #define MEMREADOOB64          _IOWR('M', 22, struct mtd_oob_buf64)
++#define MTDREFRESH            _IO('M', 23)
+ 
+ /*
+  * Obsolete legacy interface. Keep it in order not to break userspace

diff --git a/target/linux/generic-2.6/patches-2.6.35/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.35/066-block2mtd_probe.patch
new file mode 100644 (file)
index 0000000..4cc7ef5
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/066-block2mtd_probe.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -269,6 +269,7 @@ static int _open_bdev(struct block2mtd_d
+               /* We might not have rootfs mounted at this point. Try
+                  to resolve the device name by other means. */
+ 
++              wait_for_device_probe();
+               dev_t devt = name_to_dev_t(dev->devname);
+               if (devt) {
+                       bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);

diff --git a/target/linux/generic-2.6/patches-2.6.35/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.35/070-redboot_space.patch
new file mode 100644 (file)
index 0000000..6ace83c
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/070-redboot_space.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
+ #endif
+               names += strlen(names)+1;
+ 
+-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+               if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
+-                      i++;
+-                      parts[i].offset = parts[i-1].size + parts[i-1].offset;
+-                      parts[i].size = fl->next->img->flash_base - parts[i].offset;
+-                      parts[i].name = nullname;
+-              }
++                      if (!strcmp(parts[i].name, "rootfs")) {
++                              parts[i].size = fl->next->img->flash_base;
++                              parts[i].size &= ~(master->erasesize - 1);
++                              parts[i].size -= parts[i].offset;
++#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
++                              nrparts--;
++                      } else {
++                              i++;
++                              parts[i].offset = parts[i-1].size + parts[i-1].offset;
++                              parts[i].size = fl->next->img->flash_base - parts[i].offset;
++                              parts[i].name = nullname;
+ #endif
++                      }
++              }
+               tmp_fl = fl;
+               fl = fl->next;
+               kfree(tmp_fl);

diff --git a/target/linux/generic-2.6/patches-2.6.35/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.35/071-redboot_boardconfig.patch
new file mode 100644 (file)
index 0000000..f9bc4fe
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/071-redboot_boardconfig.patch
@@ -0,0 +1,60 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -11,6 +11,8 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ 
++#define BOARD_CONFIG_PART             "boardconfig"
++
+ struct fis_image_desc {
+     unsigned char name[16];      // Null terminated name
+     uint32_t    flash_base;    // Address within FLASH of image
+@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
+                              struct mtd_partition **pparts,
+                              unsigned long fis_origin)
+ {
++      unsigned long max_offset = 0;
+       int nrparts = 0;
+       struct fis_image_desc *buf;
+       struct mtd_partition *parts;
+@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
+               }
+       }
+ #endif
+-      parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
++      parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
+ 
+       if (!parts) {
+               ret = -ENOMEM;
+               goto out;
+       }
+ 
+-      nullname = (char *)&parts[nrparts];
++      nullname = (char *)&parts[nrparts + 1];
+ #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+       if (nulllen > 0) {
+               strcpy(nullname, nullstring);
+@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
+       }
+ #endif
+       for ( ; i<nrparts; i++) {
++              if(max_offset < buf[i].flash_base + buf[i].size)
++                      max_offset = buf[i].flash_base + buf[i].size;
+               parts[i].size = fl->img->size;
+               parts[i].offset = fl->img->flash_base;
+               parts[i].name = names;
+@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
+               fl = fl->next;
+               kfree(tmp_fl);
+       }
++      if(master->size - max_offset >= master->erasesize)
++      {
++              parts[nrparts].size = master->size - max_offset;
++              parts[nrparts].offset = max_offset;
++              parts[nrparts].name = names;
++              strcpy(names, BOARD_CONFIG_PART);
++              nrparts++;
++      }
+       ret = nrparts;
+       *pparts = parts;
+  out:

diff --git a/target/linux/generic-2.6/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
new file mode 100644 (file)
index 0000000..16ce76c
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
@@ -0,0 +1,32 @@
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -491,6 +491,7 @@ struct platform_nand_chip {
+       int                     chip_delay;
+       unsigned int            options;
+       const char              **part_probe_types;
++      int                     (*chip_fixup)(struct mtd_info *mtd);
+       void                    (*set_parts)(uint64_t size,
+                                       struct platform_nand_chip *chip);
+       void                    *priv;
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
+@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str
+       }
+ 
+       /* Scan to find existance of the device */
+-      if (nand_scan(&data->mtd, 1)) {
++      if (nand_scan_ident(&data->mtd, 1)) {
++              res = -ENXIO;
++              goto out;
++      }
++
++      if (pdata->chip.chip_fixup) {
++              res = pdata->chip.chip_fixup(&data->mtd);
++              if (res)
++                      goto out;
++      }
++
++      if (nand_scan_tail(&data->mtd)) {
+               err = -ENXIO;
+               goto out;
+       }

diff --git a/target/linux/generic-2.6/patches-2.6.35/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.35/081-mtd_myloader_partition_parser.patch
new file mode 100644 (file)
index 0000000..61b822e
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/081-mtd_myloader_partition_parser.patch
@@ -0,0 +1,35 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
+       ---help---
+         TI AR7 partitioning support
+ 
++config MTD_MYLOADER_PARTS
++      tristate "MyLoader partition parsing"
++      depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
++      ---help---
++        MyLoader is a bootloader which allows the user to define partitions
++        in flash devices, by putting a table in the second erase block
++        on the device, similar to a partition table. This table gives the 
++        offsets and lengths of the user defined partitions.
++
++        If you need code which can detect and parse these tables, and
++        register MTD 'partitions' corresponding to each image detected,
++        enable this option.
++
++        You will still need the parsing functions to be called by the driver
++        for your particular device. It won't happen automatically.
++
+ comment "User Modules And Translation Layers"
+ 
+ config MTD_CHAR
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
+ obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
+ obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
+ obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
++obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_CHAR)                += mtdchar.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.35/082-mtd_info_move_forward_decl.patch
new file mode 100644 (file)
index 0000000..13f0a21
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/082-mtd_info_move_forward_decl.patch
@@ -0,0 +1,18 @@
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -33,6 +33,7 @@
+  * Note: writeable partitions require their size and offset be
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
++struct mtd_info;
+ 
+ struct mtd_partition;
+ struct mtd_partition {
+@@ -49,7 +50,6 @@ struct mtd_partition {
+ #define MTDPART_SIZ_FULL      (0)
+ 
+ 
+-struct mtd_info;
+ 
+ int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
+ int del_mtd_partitions(struct mtd_info *);

diff --git a/target/linux/generic-2.6/patches-2.6.35/083-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.35/083-mtd_fix_nand_correct_data_return_code.patch
new file mode 100644 (file)
index 0000000..f630059
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/083-mtd_fix_nand_correct_data_return_code.patch
@@ -0,0 +1,12 @@
+--- a/drivers/mtd/nand/nand_ecc.c
++++ b/drivers/mtd/nand/nand_ecc.c
+@@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b
+       if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
+               return 1;       /* error in ecc data; no action needed */
+ 
+-      printk(KERN_ERR "uncorrectable error : ");
+-      return -1;
++      return -EBADMSG;
+ }
+ EXPORT_SYMBOL(__nand_correct_data);
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch
new file mode 100644 (file)
index 0000000..96a5bd0
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -0,0 +1,13 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
+       { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+       { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
+ 
++      /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
++      { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
++      { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
++
+       /* Spansion -- single (large) sector size only, at least
+        * for the chips listed here (without boot sectors).
+        */

diff --git a/target/linux/generic-2.6/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch
new file mode 100644 (file)
index 0000000..9235e6e
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch
@@ -0,0 +1,13 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
+       { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+       { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
+ 
++      /* EON -- en25pxx */
++      { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
++      { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
++
+       /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
+       { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
+       { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },

diff --git a/target/linux/generic-2.6/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
new file mode 100644 (file)
index 0000000..293ed8b
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -0,0 +1,28 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -650,6 +650,11 @@ static const struct spi_device_id m25p_i
+       { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
+       { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
+ 
++      /* Numonyx -- xxxs33b */
++      { "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) },
++      { "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) },
++      { "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) },
++
+       /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
+       { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
+       { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
+@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct s
+       dev_set_drvdata(&spi->dev, flash);
+ 
+       /*
+-       * Atmel and SST serial flash tend to power
++       * Atmel, SST and Intel/Numonyx serial flash tend to power
+        * up with the software protection bits set
+        */
+ 
+       if (info->jedec_id >> 16 == 0x1f ||
++          info->jedec_id >> 16 == 0x89 ||
+           info->jedec_id >> 16 == 0xbf) {
+               write_enable(flash);
+               write_sr(flash, 0);

diff --git a/target/linux/generic-2.6/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch
new file mode 100644 (file)
index 0000000..34dfdbd
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -707,6 +707,7 @@ static const struct spi_device_id m25p_i
+       { "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
+       { "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
+       { "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
++      { "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
+       { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
+ 
+       /* Catalyst / On Semiconductor -- non-JEDEC */

diff --git a/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch
new file mode 100644 (file)
index 0000000..4160b81
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -418,7 +418,7 @@
+                        */
+                       cfi_fixup_major_minor(cfi, extp);
+ 
+-                      if (extp->MajorVersion != '1' ||
++                      if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
+                           (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+                               if (cfi->mfr == MANUFACTURER_SAMSUNG &&
+                                   (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {

diff --git a/target/linux/generic-2.6/patches-2.6.35/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.35/110-netfilter_match_speedup.patch
new file mode 100644 (file)
index 0000000..b688fda
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/110-netfilter_match_speedup.patch
@@ -0,0 +1,130 @@
+--- a/include/linux/netfilter_ipv4/ip_tables.h
++++ b/include/linux/netfilter_ipv4/ip_tables.h
+@@ -62,6 +62,7 @@ struct ipt_ip {
+ #define IPT_F_FRAG            0x01    /* Set if rule is a fragment rule */
+ #define IPT_F_GOTO            0x02    /* Set if jump is a goto */
+ #define IPT_F_MASK            0x03    /* All possible flag bits mask. */
++#define IPT_F_NO_DEF_MATCH    0x80    /* Internal: no default match rules present */
+ 
+ /* Values for "inv" field in struct ipt_ip. */
+ #define IPT_INV_VIA_IN                0x01    /* Invert the sense of IN IFACE. */
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -90,6 +90,9 @@ ip_packet_match(const struct iphdr *ip,
+ 
+ #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
+ 
++      if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
++              return true;
++
+       if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+                 IPT_INV_SRCIP) ||
+           FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+@@ -140,13 +143,35 @@ ip_packet_match(const struct iphdr *ip,
+               return false;
+       }
+ 
++#undef FWINV
+       return true;
+ }
+ 
+ static bool
+-ip_checkentry(const struct ipt_ip *ip)
++ip_checkentry(struct ipt_ip *ip)
+ {
+-      if (ip->flags & ~IPT_F_MASK) {
++#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
++
++      if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
++              FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
++              goto has_match_rules;
++
++      if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
++              IPT_INV_VIA_IN) ||
++          FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
++              IPT_INV_VIA_OUT))
++              goto has_match_rules;
++
++      if (FWINV(ip->proto, IPT_INV_PROTO))
++              goto has_match_rules;
++
++      if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
++              goto has_match_rules;
++
++      ip->flags |= IPT_F_NO_DEF_MATCH;
++
++has_match_rules:
++      if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
+               duprintf("Unknown flag bits set: %08X\n",
+                        ip->flags & ~IPT_F_MASK);
+               return false;
+@@ -156,6 +181,8 @@ ip_checkentry(const struct ipt_ip *ip)
+                        ip->invflags & ~IPT_INV_MASK);
+               return false;
+       }
++
++#undef FWINV
+       return true;
+ }
+ 
+@@ -182,7 +209,6 @@ static inline bool unconditional(const s
+       static const struct ipt_ip uncond;
+ 
+       return memcmp(ip, &uncond, sizeof(uncond)) == 0;
+-#undef FWINV
+ }
+ 
+ /* for const-correctness */
+@@ -312,8 +338,28 @@ ipt_do_table(struct sk_buff *skb,
+       const struct xt_table_info *private;
+       struct xt_action_param acpar;
+ 
+-      /* Initialization */
+       ip = ip_hdr(skb);
++
++      IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++      xt_info_rdlock_bh();
++      private = table->private;
++      table_base = private->entries[smp_processor_id()];
++      e = get_entry(table_base, private->hook_entry[hook]);
++
++      if (e->target_offset <= sizeof(struct ipt_entry) &&
++              (e->ip.flags & IPT_F_NO_DEF_MATCH)) {
++                      struct ipt_entry_target *t = ipt_get_target(e);
++                      if (!t->u.kernel.target->target) {
++                              int v = ((struct ipt_standard_target *)t)->verdict;
++                              if ((v < 0) && (v != IPT_RETURN)) {
++                                      ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
++                                      xt_info_rdunlock_bh();
++                                      return (unsigned)(-v) - 1;
++                              }
++                      }
++      }
++
++      /* Initialization */
+       indev = in ? in->name : nulldevname;
+       outdev = out ? out->name : nulldevname;
+       /* We handle fragments by dealing with the first fragment as
+@@ -970,6 +1016,7 @@ copy_entries_to_user(unsigned int total_
+               unsigned int i;
+               const struct ipt_entry_match *m;
+               const struct ipt_entry_target *t;
++              u8 flags;
+ 
+               e = (struct ipt_entry *)(loc_cpu_entry + off);
+               if (copy_to_user(userptr + off
+@@ -979,6 +1026,14 @@ copy_entries_to_user(unsigned int total_
+                       ret = -EFAULT;
+                       goto free_counters;
+               }
++
++              flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
++              if (copy_to_user(userptr + off
++                               + offsetof(struct ipt_entry, ip.flags),
++                               &flags, sizeof(flags)) != 0) {
++                      ret = -EFAULT;
++                      goto free_counters;
++              }
+ 
+               for (i = sizeof(struct ipt_entry);
+                    i < e->target_offset;

diff --git a/target/linux/generic-2.6/patches-2.6.35/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.35/180-netfilter_depends.patch
new file mode 100644 (file)
index 0000000..1bda13d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/180-netfilter_depends.patch
@@ -0,0 +1,18 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -173,7 +173,6 @@ config NF_CONNTRACK_FTP
+ 
+ config NF_CONNTRACK_H323
+       tristate "H.323 protocol support"
+-      depends on (IPV6 || IPV6=n)
+       depends on NETFILTER_ADVANCED
+       help
+         H.323 is a VoIP signalling protocol from ITU-T. As one of the most
+@@ -530,7 +529,6 @@ config NETFILTER_XT_TARGET_SECMARK
+ 
+ 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

diff --git a/target/linux/generic-2.6/patches-2.6.35/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.35/190-netfilter_rtsp.patch
new file mode 100644 (file)
index 0000000..6879293
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/190-netfilter_rtsp.patch
@@ -0,0 +1,1366 @@
+--- /dev/null
++++ b/include/linux/netfilter/nf_conntrack_rtsp.h
+@@ -0,0 +1,63 @@
++/*
++ * RTSP extension for IP connection tracking.
++ * (C) 2003 by Tom Marshall <tmarshall at real.com>
++ * based on ip_conntrack_irc.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.
++ */
++#ifndef _IP_CONNTRACK_RTSP_H
++#define _IP_CONNTRACK_RTSP_H
++
++//#define IP_NF_RTSP_DEBUG 1
++#define IP_NF_RTSP_VERSION "0.6.21"
++
++#ifdef __KERNEL__
++/* port block types */
++typedef enum {
++    pb_single,  /* client_port=x */
++    pb_range,   /* client_port=x-y */
++    pb_discon   /* client_port=x/y (rtspbis) */
++} portblock_t;
++
++/* We record seq number and length of rtsp headers here, all in host order. */
++
++/*
++ * This structure is per expected connection.  It is a member of struct
++ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
++ * there and we are expected to only store the length of the data which
++ * needs replaced.  If a packet contains multiple RTSP messages, we create
++ * one expected connection per message.
++ *
++ * We use these variables to mark the entire header block.  This may seem
++ * like overkill, but the nature of RTSP requires it.  A header may appear
++ * multiple times in a message.  We must treat two Transport headers the
++ * same as one Transport header with two entries.
++ */
++struct ip_ct_rtsp_expect
++{
++    u_int32_t   len;        /* length of header block */
++    portblock_t pbtype;     /* Type of port block that was requested */
++    u_int16_t   loport;     /* Port that was requested, low or first */
++    u_int16_t   hiport;     /* Port that was requested, high or second */
++#if 0
++    uint        method;     /* RTSP method */
++    uint        cseq;       /* CSeq from request */
++#endif
++};
++
++extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
++                               enum ip_conntrack_info ctinfo,
++                               unsigned int matchoff, unsigned int matchlen,
++                               struct ip_ct_rtsp_expect *prtspexp,
++                               struct nf_conntrack_expect *exp);
++
++extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
++
++#define RTSP_PORT   554
++
++#endif /* __KERNEL__ */
++
++#endif /* _IP_CONNTRACK_RTSP_H */
+--- /dev/null
++++ b/include/linux/netfilter_helpers.h
+@@ -0,0 +1,133 @@
++/*
++ * Helpers for netfiler modules.  This file provides implementations for basic
++ * functions such as strncasecmp(), etc.
++ *
++ * gcc will warn for defined but unused functions, so we only include the
++ * functions requested.  The following macros are used:
++ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
++ *   NF_NEED_STRTOU16           nf_strtou16()
++ *   NF_NEED_STRTOU32           nf_strtou32()
++ */
++#ifndef _NETFILTER_HELPERS_H
++#define _NETFILTER_HELPERS_H
++
++/* Only include these functions for kernel code. */
++#ifdef __KERNEL__
++
++#include <linux/ctype.h>
++#define iseol(c) ( (c) == '\r' || (c) == '\n' )
++
++/*
++ * The standard strncasecmp()
++ */
++#ifdef NF_NEED_STRNCASECMP
++static int
++nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
++{
++    if (s1 == NULL || s2 == NULL)
++    {
++        if (s1 == NULL && s2 == NULL)
++        {
++            return 0;
++        }
++        return (s1 == NULL) ? -1 : 1;
++    }
++    while (len > 0 && tolower(*s1) == tolower(*s2))
++    {
++        len--;
++        s1++;
++        s2++;
++    }
++    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
++}
++#endif /* NF_NEED_STRNCASECMP */
++
++/*
++ * Parse a string containing a 16-bit unsigned integer.
++ * Returns the number of chars used, or zero if no number is found.
++ */
++#ifdef NF_NEED_STRTOU16
++static int
++nf_strtou16(const char* pbuf, u_int16_t* pval)
++{
++    int n = 0;
++
++    *pval = 0;
++    while (isdigit(pbuf[n]))
++    {
++        *pval = (*pval * 10) + (pbuf[n] - '0');
++        n++;
++    }
++
++    return n;
++}
++#endif /* NF_NEED_STRTOU16 */
++
++/*
++ * Parse a string containing a 32-bit unsigned integer.
++ * Returns the number of chars used, or zero if no number is found.
++ */
++#ifdef NF_NEED_STRTOU32
++static int
++nf_strtou32(const char* pbuf, u_int32_t* pval)
++{
++    int n = 0;
++
++    *pval = 0;
++    while (pbuf[n] >= '0' && pbuf[n] <= '9')
++    {
++        *pval = (*pval * 10) + (pbuf[n] - '0');
++        n++;
++    }
++
++    return n;
++}
++#endif /* NF_NEED_STRTOU32 */
++
++/*
++ * Given a buffer and length, advance to the next line and mark the current
++ * line.
++ */
++#ifdef NF_NEED_NEXTLINE
++static int
++nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
++{
++    uint    off = *poff;
++    uint    physlen = 0;
++
++    if (off >= len)
++    {
++        return 0;
++    }
++
++    while (p[off] != '\n')
++    {
++        if (len-off <= 1)
++        {
++            return 0;
++        }
++
++        physlen++;
++        off++;
++    }
++
++    /* if we saw a crlf, physlen needs adjusted */
++    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
++    {
++        physlen--;
++    }
++
++    /* advance past the newline */
++    off++;
++
++    *plineoff = *poff;
++    *plinelen = physlen;
++    *poff = off;
++
++    return 1;
++}
++#endif /* NF_NEED_NEXTLINE */
++
++#endif /* __KERNEL__ */
++
++#endif /* _NETFILTER_HELPERS_H */
+--- /dev/null
++++ b/include/linux/netfilter_mime.h
+@@ -0,0 +1,89 @@
++/*
++ * MIME functions for netfilter modules.  This file provides implementations
++ * for basic MIME parsing.  MIME headers are used in many protocols, such as
++ * HTTP, RTSP, SIP, etc.
++ *
++ * gcc will warn for defined but unused functions, so we only include the
++ * functions requested.  The following macros are used:
++ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
++ */
++#ifndef _NETFILTER_MIME_H
++#define _NETFILTER_MIME_H
++
++/* Only include these functions for kernel code. */
++#ifdef __KERNEL__
++
++#include <linux/ctype.h>
++
++/*
++ * Given a buffer and length, advance to the next line and mark the current
++ * line.  If the current line is empty, *plinelen will be set to zero.  If
++ * not, it will be set to the actual line length (including CRLF).
++ *
++ * 'line' in this context means logical line (includes LWS continuations).
++ * Returns 1 on success, 0 on failure.
++ */
++#ifdef NF_NEED_MIME_NEXTLINE
++static int
++nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
++{
++    uint    off = *poff;
++    uint    physlen = 0;
++    int     is_first_line = 1;
++
++    if (off >= len)
++    {
++        return 0;
++    }
++
++    do
++    {
++        while (p[off] != '\n')
++        {
++            if (len-off <= 1)
++            {
++                return 0;
++            }
++
++            physlen++;
++            off++;
++        }
++
++        /* if we saw a crlf, physlen needs adjusted */
++        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
++        {
++            physlen--;
++        }
++
++        /* advance past the newline */
++        off++;
++
++        /* check for an empty line */
++        if (physlen == 0)
++        {
++            break;
++        }
++
++        /* check for colon on the first physical line */
++        if (is_first_line)
++        {
++            is_first_line = 0;
++            if (memchr(p+(*poff), ':', physlen) == NULL)
++            {
++                return 0;
++            }
++        }
++    }
++    while (p[off] == ' ' || p[off] == '\t');
++
++    *plineoff = *poff;
++    *plinelen = (physlen == 0) ? 0 : (off - *poff);
++    *poff = off;
++
++    return 1;
++}
++#endif /* NF_NEED_MIME_NEXTLINE */
++
++#endif /* __KERNEL__ */
++
++#endif /* _NETFILTER_MIME_H */
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
+ obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
+ obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
+ obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
++obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
+ obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
+ obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
+ obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -280,6 +280,16 @@ config NF_CONNTRACK_TFTP
+ 
+         To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NF_CONNTRACK_RTSP
++      tristate "RTSP protocol support"
++      depends on NF_CONNTRACK
++      help
++              Support the RTSP protocol.  This allows UDP transports to be setup
++              properly, including RTP and RDT.
++
++              If you want to compile it as a module, say 'M' here and read
++              Documentation/modules.txt.  If unsure, say 'Y'.
++
+ config NF_CT_NETLINK
+       tristate 'Connection tracking netlink interface'
+       select NETFILTER_NETLINK
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
+ obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
+ obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
+ obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
++obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
+ 
+ # transparent proxy support
+ obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
+--- a/net/ipv4/netfilter/Kconfig
++++ b/net/ipv4/netfilter/Kconfig
+@@ -257,6 +257,11 @@ config NF_NAT_IRC
+       depends on NF_CONNTRACK && NF_NAT
+       default NF_NAT && NF_CONNTRACK_IRC
+ 
++config NF_NAT_RTSP
++      tristate
++      depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
++      default NF_NAT && NF_CONNTRACK_RTSP
++
+ config NF_NAT_TFTP
+       tristate
+       depends on NF_CONNTRACK && NF_NAT
+--- /dev/null
++++ b/net/netfilter/nf_conntrack_rtsp.c
+@@ -0,0 +1,517 @@
++/*
++ * RTSP extension for IP connection tracking
++ * (C) 2003 by Tom Marshall <tmarshall at real.com>
++ * based on ip_conntrack_irc.c
++ *
++ *      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.
++ *
++ * Module load syntax:
++ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
++ *                              max_outstanding=n setup_timeout=secs
++ *
++ * If no ports are specified, the default will be port 554.
++ *
++ * With max_outstanding you can define the maximum number of not yet
++ * answered SETUP requests per RTSP session (default 8).
++ * With setup_timeout you can specify how long the system waits for
++ * an expected data channel (default 300 seconds).
++ *
++ * 2005-02-13: Harald Welte <laforge at netfilter.org>
++ *    - port to 2.6
++ *    - update to recent post-2.6.11 api changes
++ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
++ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
++ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
++ *                    - Port to new NF API
++ */
++
++#include <linux/module.h>
++#include <linux/netfilter.h>
++#include <linux/ip.h>
++#include <linux/inet.h>
++#include <net/tcp.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_expect.h>
++#include <net/netfilter/nf_conntrack_helper.h>
++#include <linux/netfilter/nf_conntrack_rtsp.h>
++
++#define NF_NEED_STRNCASECMP
++#define NF_NEED_STRTOU16
++#define NF_NEED_STRTOU32
++#define NF_NEED_NEXTLINE
++#include <linux/netfilter_helpers.h>
++#define NF_NEED_MIME_NEXTLINE
++#include <linux/netfilter_mime.h>
++
++#include <linux/ctype.h>
++#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
++#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
++#if 0
++#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
++#else
++#define DEBUGP(fmt, args...)
++#endif
++
++#define MAX_PORTS 8
++static int ports[MAX_PORTS];
++static int num_ports = 0;
++static int max_outstanding = 8;
++static unsigned int setup_timeout = 300;
++
++MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
++MODULE_DESCRIPTION("RTSP connection tracking module");
++MODULE_LICENSE("GPL");
++module_param_array(ports, int, &num_ports, 0400);
++MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
++module_param(max_outstanding, int, 0400);
++MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
++module_param(setup_timeout, int, 0400);
++MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
++
++static char *rtsp_buffer;
++static DEFINE_SPINLOCK(rtsp_buffer_lock);
++
++unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
++                               enum ip_conntrack_info ctinfo,
++                               unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
++                               struct nf_conntrack_expect *exp);
++void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
++
++EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
++
++/*
++ * Max mappings we will allow for one RTSP connection (for RTP, the number
++ * of allocated ports is twice this value).  Note that SMIL burns a lot of
++ * ports so keep this reasonably high.  If this is too low, you will see a
++ * lot of "no free client map entries" messages.
++ */
++#define MAX_PORT_MAPS 16
++
++/*** default port list was here in the masq code: 554, 3030, 4040 ***/
++
++#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
++
++/*
++ * Parse an RTSP packet.
++ *
++ * Returns zero if parsing failed.
++ *
++ * Parameters:
++ *  IN      ptcp        tcp data pointer
++ *  IN      tcplen      tcp data len
++ *  IN/OUT  ptcpoff     points to current tcp offset
++ *  OUT     phdrsoff    set to offset of rtsp headers
++ *  OUT     phdrslen    set to length of rtsp headers
++ *  OUT     pcseqoff    set to offset of CSeq header
++ *  OUT     pcseqlen    set to length of CSeq header
++ */
++static int
++rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
++                   uint* phdrsoff, uint* phdrslen,
++                   uint* pcseqoff, uint* pcseqlen,
++                   uint* transoff, uint* translen)
++{
++      uint    entitylen = 0;
++      uint    lineoff;
++      uint    linelen;
++
++      if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
++              return 0;
++
++      *phdrsoff = *ptcpoff;
++      while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
++              if (linelen == 0) {
++                      if (entitylen > 0)
++                              *ptcpoff += min(entitylen, tcplen - *ptcpoff);
++                      break;
++              }
++              if (lineoff+linelen > tcplen) {
++                      INFOP("!! overrun !!\n");
++                      break;
++              }
++
++              if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
++                      *pcseqoff = lineoff;
++                      *pcseqlen = linelen;
++              }
++
++              if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
++                      *transoff = lineoff;
++                      *translen = linelen;
++              }
++
++              if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
++                      uint off = lineoff+15;
++                      SKIP_WSPACE(ptcp+lineoff, linelen, off);
++                      nf_strtou32(ptcp+off, &entitylen);
++              }
++      }
++      *phdrslen = (*ptcpoff) - (*phdrsoff);
++
++      return 1;
++}
++
++/*
++ * Find lo/hi client ports (if any) in transport header
++ * In:
++ *   ptcp, tcplen = packet
++ *   tranoff, tranlen = buffer to search
++ *
++ * Out:
++ *   pport_lo, pport_hi = lo/hi ports (host endian)
++ *
++ * Returns nonzero if any client ports found
++ *
++ * Note: it is valid (and expected) for the client to request multiple
++ * transports, so we need to parse the entire line.
++ */
++static int
++rtsp_parse_transport(char* ptran, uint tranlen,
++                     struct ip_ct_rtsp_expect* prtspexp)
++{
++      int     rc = 0;
++      uint    off = 0;
++
++      if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
++          nf_strncasecmp(ptran, "Transport:", 10) != 0) {
++              INFOP("sanity check failed\n");
++              return 0;
++      }
++
++      DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
++      off += 10;
++      SKIP_WSPACE(ptran, tranlen, off);
++
++      /* Transport: tran;field;field=val,tran;field;field=val,... */
++      while (off < tranlen) {
++              const char* pparamend;
++              uint        nextparamoff;
++
++              pparamend = memchr(ptran+off, ',', tranlen-off);
++              pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
++              nextparamoff = pparamend-ptran;
++
++              while (off < nextparamoff) {
++                      const char* pfieldend;
++                      uint        nextfieldoff;
++
++                      pfieldend = memchr(ptran+off, ';', nextparamoff-off);
++                      nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
++
++                      if (strncmp(ptran+off, "client_port=", 12) == 0) {
++                              u_int16_t   port;
++                              uint        numlen;
++
++                              off += 12;
++                              numlen = nf_strtou16(ptran+off, &port);
++                              off += numlen;
++                              if (prtspexp->loport != 0 && prtspexp->loport != port)
++                                      DEBUGP("multiple ports found, port %hu ignored\n", port);
++                              else {
++                                      DEBUGP("lo port found : %hu\n", port);
++                                      prtspexp->loport = prtspexp->hiport = port;
++                                      if (ptran[off] == '-') {
++                                              off++;
++                                              numlen = nf_strtou16(ptran+off, &port);
++                                              off += numlen;
++                                              prtspexp->pbtype = pb_range;
++                                              prtspexp->hiport = port;
++
++                                              // If we have a range, assume rtp:
++                                              // loport must be even, hiport must be loport+1
++                                              if ((prtspexp->loport & 0x0001) != 0 ||
++                                                  prtspexp->hiport != prtspexp->loport+1) {
++                                                      DEBUGP("incorrect range: %hu-%hu, correcting\n",
++                                                             prtspexp->loport, prtspexp->hiport);
++                                                      prtspexp->loport &= 0xfffe;
++                                                      prtspexp->hiport = prtspexp->loport+1;
++                                              }
++                                      } else if (ptran[off] == '/') {
++                                              off++;
++                                              numlen = nf_strtou16(ptran+off, &port);
++                                              off += numlen;
++                                              prtspexp->pbtype = pb_discon;
++                                              prtspexp->hiport = port;
++                                      }
++                                      rc = 1;
++                              }
++                      }
++
++                      /*
++                       * Note we don't look for the destination parameter here.
++                       * If we are using NAT, the NAT module will handle it.  If not,
++                       * and the client is sending packets elsewhere, the expectation
++                       * will quietly time out.
++                       */
++
++                      off = nextfieldoff;
++              }
++
++              off = nextparamoff;
++      }
++
++      return rc;
++}
++
++void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
++{
++    if(nf_nat_rtsp_hook_expectfn) {
++        nf_nat_rtsp_hook_expectfn(ct,exp);
++    }
++}
++
++/*** conntrack functions ***/
++
++/* outbound packet: client->server */
++
++static inline int
++help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
++                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
++{
++      struct ip_ct_rtsp_expect expinfo;
++
++      int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
++      //struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
++      //uint    tcplen = pktlen - iph->ihl * 4;
++      char*   pdata = rb_ptr;
++      //uint    datalen = tcplen - tcph->doff * 4;
++      uint    dataoff = 0;
++      int ret = NF_ACCEPT;
++
++      struct nf_conntrack_expect *exp;
++
++      __be16 be_loport;
++
++      memset(&expinfo, 0, sizeof(expinfo));
++
++      while (dataoff < datalen) {
++              uint    cmdoff = dataoff;
++              uint    hdrsoff = 0;
++              uint    hdrslen = 0;
++              uint    cseqoff = 0;
++              uint    cseqlen = 0;
++              uint    transoff = 0;
++              uint    translen = 0;
++              uint    off;
++
++              if (!rtsp_parse_message(pdata, datalen, &dataoff,
++                                      &hdrsoff, &hdrslen,
++                                      &cseqoff, &cseqlen,
++                                      &transoff, &translen))
++                      break;      /* not a valid message */
++
++              if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
++                      continue;   /* not a SETUP message */
++              DEBUGP("found a setup message\n");
++
++              off = 0;
++              if(translen) {
++                      rtsp_parse_transport(pdata+transoff, translen, &expinfo);
++              }
++
++              if (expinfo.loport == 0) {
++                      DEBUGP("no udp transports found\n");
++                      continue;   /* no udp transports found */
++              }
++
++              DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
++                     (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
++
++              exp = nf_ct_expect_alloc(ct);
++              if (!exp) {
++                      ret = NF_DROP;
++                      goto out;
++              }
++
++              be_loport = htons(expinfo.loport);
++
++              nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
++                      ct->tuplehash[!dir].tuple.src.l3num,
++                      &ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
++                      IPPROTO_UDP, NULL, &be_loport);
++
++              exp->master = ct;
++
++              exp->expectfn = expected;
++              exp->flags = 0;
++
++              if (expinfo.pbtype == pb_range) {
++                      DEBUGP("Changing expectation mask to handle multiple ports\n");
++                      exp->mask.src.u.udp.port  = 0xfffe;
++              }
++
++              DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
++                     NIPQUAD(exp->tuple.src.u3.ip),
++                     ntohs(exp->tuple.src.u.udp.port),
++                     NIPQUAD(exp->tuple.dst.u3.ip),
++                     ntohs(exp->tuple.dst.u.udp.port));
++
++              if (nf_nat_rtsp_hook)
++                      /* pass the request off to the nat helper */
++                      ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
++              else if (nf_ct_expect_related(exp) != 0) {
++                      INFOP("nf_ct_expect_related failed\n");
++                      ret  = NF_DROP;
++              }
++              nf_ct_expect_put(exp);
++              goto out;
++      }
++out:
++
++      return ret;
++}
++
++
++static inline int
++help_in(struct sk_buff *skb, size_t pktlen,
++ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
++{
++ return NF_ACCEPT;
++}
++
++static int help(struct sk_buff *skb, unsigned int protoff,
++              struct nf_conn *ct, enum ip_conntrack_info ctinfo)
++{
++      struct tcphdr _tcph, *th;
++      unsigned int dataoff, datalen;
++      char *rb_ptr;
++      int ret = NF_DROP;
++
++      /* Until there's been traffic both ways, don't look in packets. */
++      if (ctinfo != IP_CT_ESTABLISHED &&
++          ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
++              DEBUGP("conntrackinfo = %u\n", ctinfo);
++              return NF_ACCEPT;
++      }
++
++      /* Not whole TCP header? */
++      th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
++
++      if (!th)
++              return NF_ACCEPT;
++
++      /* No data ? */
++      dataoff = protoff + th->doff*4;
++      datalen = skb->len - dataoff;
++      if (dataoff >= skb->len)
++              return NF_ACCEPT;
++
++      spin_lock_bh(&rtsp_buffer_lock);
++      rb_ptr = skb_header_pointer(skb, dataoff,
++                                  skb->len - dataoff, rtsp_buffer);
++      BUG_ON(rb_ptr == NULL);
++
++#if 0
++      /* Checksum invalid?  Ignore. */
++      /* FIXME: Source route IP option packets --RR */
++      if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
++                       csum_partial((char*)tcph, tcplen, 0)))
++      {
++              DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
++                     tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
++              return NF_ACCEPT;
++      }
++#endif
++
++      switch (CTINFO2DIR(ctinfo)) {
++      case IP_CT_DIR_ORIGINAL:
++              ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
++              break;
++      case IP_CT_DIR_REPLY:
++              DEBUGP("IP_CT_DIR_REPLY\n");
++              /* inbound packet: server->client */
++              ret = NF_ACCEPT;
++              break;
++      }
++
++      spin_unlock_bh(&rtsp_buffer_lock);
++
++      return ret;
++}
++
++static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
++static char rtsp_names[MAX_PORTS][10];
++static struct nf_conntrack_expect_policy rtsp_expect_policy;
++
++/* This function is intentionally _NOT_ defined as __exit */
++static void
++fini(void)
++{
++      int i;
++      for (i = 0; i < num_ports; i++) {
++              DEBUGP("unregistering port %d\n", ports[i]);
++              nf_conntrack_helper_unregister(&rtsp_helpers[i]);
++      }
++      kfree(rtsp_buffer);
++}
++
++static int __init
++init(void)
++{
++      int i, ret;
++      struct nf_conntrack_helper *hlpr;
++      char *tmpname;
++
++      printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
++
++      if (max_outstanding < 1) {
++              printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
++              return -EBUSY;
++      }
++      if (setup_timeout < 0) {
++              printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
++              return -EBUSY;
++      }
++
++      rtsp_expect_policy.max_expected = max_outstanding;
++      rtsp_expect_policy.timeout = setup_timeout;
++
++      rtsp_buffer = kmalloc(65536, GFP_KERNEL);
++      if (!rtsp_buffer)
++              return -ENOMEM;
++
++      /* If no port given, default to standard rtsp port */
++      if (ports[0] == 0) {
++              ports[0] = RTSP_PORT;
++      }
++
++      for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
++              hlpr = &rtsp_helpers[i];
++              memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
++              hlpr->tuple.src.u.tcp.port = htons(ports[i]);
++              hlpr->tuple.dst.protonum = IPPROTO_TCP;
++              hlpr->expect_policy = &rtsp_expect_policy;
++              hlpr->me = THIS_MODULE;
++              hlpr->help = help;
++
++              tmpname = &rtsp_names[i][0];
++              if (ports[i] == RTSP_PORT) {
++                      sprintf(tmpname, "rtsp");
++              } else {
++                      sprintf(tmpname, "rtsp-%d", i);
++              }
++              hlpr->name = tmpname;
++
++              DEBUGP("port #%d: %d\n", i, ports[i]);
++
++              ret = nf_conntrack_helper_register(hlpr);
++
++              if (ret) {
++                      printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
++                      fini();
++                      return -EBUSY;
++              }
++              num_ports++;
++      }
++      return 0;
++}
++
++module_init(init);
++module_exit(fini);
++
++EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
++
+--- /dev/null
++++ b/net/ipv4/netfilter/nf_nat_rtsp.c
+@@ -0,0 +1,496 @@
++/*
++ * RTSP extension for TCP NAT alteration
++ * (C) 2003 by Tom Marshall <tmarshall at real.com>
++ * based on ip_nat_irc.c
++ *
++ *      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.
++ *
++ * Module load syntax:
++ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
++ *                           stunaddr=<address>
++ *                           destaction=[auto|strip|none]
++ *
++ * If no ports are specified, the default will be port 554 only.
++ *
++ * stunaddr specifies the address used to detect that a client is using STUN.
++ * If this address is seen in the destination parameter, it is assumed that
++ * the client has already punched a UDP hole in the firewall, so we don't
++ * mangle the client_port.  If none is specified, it is autodetected.  It
++ * only needs to be set if you have multiple levels of NAT.  It should be
++ * set to the external address that the STUN clients detect.  Note that in
++ * this case, it will not be possible for clients to use UDP with servers
++ * between the NATs.
++ *
++ * If no destaction is specified, auto is used.
++ *   destaction=auto:  strip destination parameter if it is not stunaddr.
++ *   destaction=strip: always strip destination parameter (not recommended).
++ *   destaction=none:  do not touch destination parameter (not recommended).
++ */
++
++#include <linux/module.h>
++#include <net/tcp.h>
++#include <net/netfilter/nf_nat_helper.h>
++#include <net/netfilter/nf_nat_rule.h>
++#include <linux/netfilter/nf_conntrack_rtsp.h>
++#include <net/netfilter/nf_conntrack_expect.h>
++
++#include <linux/inet.h>
++#include <linux/ctype.h>
++#define NF_NEED_STRNCASECMP
++#define NF_NEED_STRTOU16
++#include <linux/netfilter_helpers.h>
++#define NF_NEED_MIME_NEXTLINE
++#include <linux/netfilter_mime.h>
++
++#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
++#if 0
++#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
++#else
++#define DEBUGP(fmt, args...)
++#endif
++
++#define MAX_PORTS       8
++#define DSTACT_AUTO     0
++#define DSTACT_STRIP    1
++#define DSTACT_NONE     2
++
++static char*    stunaddr = NULL;
++static char*    destaction = NULL;
++
++static u_int32_t extip = 0;
++static int       dstact = 0;
++
++MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
++MODULE_DESCRIPTION("RTSP network address translation module");
++MODULE_LICENSE("GPL");
++module_param(stunaddr, charp, 0644);
++MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
++module_param(destaction, charp, 0644);
++MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
++
++#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
++
++/*** helper functions ***/
++
++static void
++get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
++{
++    struct iphdr*   iph  = ip_hdr(skb);
++    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
++
++    *pptcpdata = (char*)tcph +  tcph->doff*4;
++    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
++}
++
++/*** nat functions ***/
++
++/*
++ * Mangle the "Transport:" header:
++ *   - Replace all occurences of "client_port=<spec>"
++ *   - Handle destination parameter
++ *
++ * In:
++ *   ct, ctinfo = conntrack context
++ *   skb        = packet
++ *   tranoff    = Transport header offset from TCP data
++ *   tranlen    = Transport header length (incl. CRLF)
++ *   rport_lo   = replacement low  port (host endian)
++ *   rport_hi   = replacement high port (host endian)
++ *
++ * Returns packet size difference.
++ *
++ * Assumes that a complete transport header is present, ending with CR or LF
++ */
++static int
++rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
++                 struct nf_conntrack_expect* exp,
++                                                               struct ip_ct_rtsp_expect* prtspexp,
++                 struct sk_buff* skb, uint tranoff, uint tranlen)
++{
++    char*       ptcp;
++    uint        tcplen;
++    char*       ptran;
++    char        rbuf1[16];      /* Replacement buffer (one port) */
++    uint        rbuf1len;       /* Replacement len (one port) */
++    char        rbufa[16];      /* Replacement buffer (all ports) */
++    uint        rbufalen;       /* Replacement len (all ports) */
++    u_int32_t   newip;
++    u_int16_t   loport, hiport;
++    uint        off = 0;
++    uint        diff;           /* Number of bytes we removed */
++
++    struct nf_conn *ct = exp->master;
++    struct nf_conntrack_tuple *t;
++
++    char    szextaddr[15+1];
++    uint    extaddrlen;
++    int     is_stun;
++
++    get_skb_tcpdata(skb, &ptcp, &tcplen);
++    ptran = ptcp+tranoff;
++
++    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
++        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
++        nf_strncasecmp(ptran, "Transport:", 10) != 0)
++    {
++        INFOP("sanity check failed\n");
++        return 0;
++    }
++    off += 10;
++    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
++
++    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++    t = &exp->tuple;
++    t->dst.u3.ip = newip;
++
++    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
++                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
++    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
++
++    rbuf1len = rbufalen = 0;
++    switch (prtspexp->pbtype)
++    {
++    case pb_single:
++        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
++        {
++            t->dst.u.udp.port = htons(loport);
++            if (nf_ct_expect_related(exp) == 0)
++            {
++                DEBUGP("using port %hu\n", loport);
++                break;
++            }
++        }
++        if (loport != 0)
++        {
++            rbuf1len = sprintf(rbuf1, "%hu", loport);
++            rbufalen = sprintf(rbufa, "%hu", loport);
++        }
++        break;
++    case pb_range:
++        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
++        {
++            t->dst.u.udp.port = htons(loport);
++            if (nf_ct_expect_related(exp) == 0)
++            {
++                hiport = loport + ~exp->mask.src.u.udp.port;
++                DEBUGP("using ports %hu-%hu\n", loport, hiport);
++                break;
++            }
++        }
++        if (loport != 0)
++        {
++            rbuf1len = sprintf(rbuf1, "%hu", loport);
++            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
++        }
++        break;
++    case pb_discon:
++        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
++        {
++            t->dst.u.udp.port = htons(loport);
++            if (nf_ct_expect_related(exp) == 0)
++            {
++                DEBUGP("using port %hu (1 of 2)\n", loport);
++                break;
++            }
++        }
++        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
++        {
++            t->dst.u.udp.port = htons(hiport);
++            if (nf_ct_expect_related(exp) == 0)
++            {
++                DEBUGP("using port %hu (2 of 2)\n", hiport);
++                break;
++            }
++        }
++        if (loport != 0 && hiport != 0)
++        {
++            rbuf1len = sprintf(rbuf1, "%hu", loport);
++            if (hiport == loport+1)
++            {
++                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
++            }
++            else
++            {
++                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
++            }
++        }
++        break;
++    }
++
++    if (rbuf1len == 0)
++    {
++        return 0;   /* cannot get replacement port(s) */
++    }
++
++    /* Transport: tran;field;field=val,tran;field;field=val,... */
++    while (off < tranlen)
++    {
++        uint        saveoff;
++        const char* pparamend;
++        uint        nextparamoff;
++
++        pparamend = memchr(ptran+off, ',', tranlen-off);
++        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
++        nextparamoff = pparamend-ptcp;
++
++        /*
++         * We pass over each param twice.  On the first pass, we look for a
++         * destination= field.  It is handled by the security policy.  If it
++         * is present, allowed, and equal to our external address, we assume
++         * that STUN is being used and we leave the client_port= field alone.
++         */
++        is_stun = 0;
++        saveoff = off;
++        while (off < nextparamoff)
++        {
++            const char* pfieldend;
++            uint        nextfieldoff;
++
++            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
++            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
++
++            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
++            {
++                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
++                {
++                    is_stun = 1;
++                }
++                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
++                {
++                    diff = nextfieldoff-off;
++                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
++                                                         off, diff, NULL, 0))
++                    {
++                        /* mangle failed, all we can do is bail */
++                      nf_ct_unexpect_related(exp);
++                        return 0;
++                    }
++                    get_skb_tcpdata(skb, &ptcp, &tcplen);
++                    ptran = ptcp+tranoff;
++                    tranlen -= diff;
++                    nextparamoff -= diff;
++                    nextfieldoff -= diff;
++                }
++            }
++
++            off = nextfieldoff;
++        }
++        if (is_stun)
++        {
++            continue;
++        }
++        off = saveoff;
++        while (off < nextparamoff)
++        {
++            const char* pfieldend;
++            uint        nextfieldoff;
++
++            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
++            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
++
++            if (strncmp(ptran+off, "client_port=", 12) == 0)
++            {
++                u_int16_t   port;
++                uint        numlen;
++                uint        origoff;
++                uint        origlen;
++                char*       rbuf    = rbuf1;
++                uint        rbuflen = rbuf1len;
++
++                off += 12;
++                origoff = (ptran-ptcp)+off;
++                origlen = 0;
++                numlen = nf_strtou16(ptran+off, &port);
++                off += numlen;
++                origlen += numlen;
++                if (port != prtspexp->loport)
++                {
++                    DEBUGP("multiple ports found, port %hu ignored\n", port);
++                }
++                else
++                {
++                    if (ptran[off] == '-' || ptran[off] == '/')
++                    {
++                        off++;
++                        origlen++;
++                        numlen = nf_strtou16(ptran+off, &port);
++                        off += numlen;
++                        origlen += numlen;
++                        rbuf = rbufa;
++                        rbuflen = rbufalen;
++                    }
++
++                    /*
++                     * note we cannot just memcpy() if the sizes are the same.
++                     * the mangle function does skb resizing, checks for a
++                     * cloned skb, and updates the checksums.
++                     *
++                     * parameter 4 below is offset from start of tcp data.
++                     */
++                    diff = origlen-rbuflen;
++                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
++                                              origoff, origlen, rbuf, rbuflen))
++                    {
++                        /* mangle failed, all we can do is bail */
++                      nf_ct_unexpect_related(exp);
++                        return 0;
++                    }
++                    get_skb_tcpdata(skb, &ptcp, &tcplen);
++                    ptran = ptcp+tranoff;
++                    tranlen -= diff;
++                    nextparamoff -= diff;
++                    nextfieldoff -= diff;
++                }
++            }
++
++            off = nextfieldoff;
++        }
++
++        off = nextparamoff;
++    }
++
++    return 1;
++}
++
++static uint
++help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
++       unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
++       struct nf_conntrack_expect* exp)
++{
++    char*   ptcp;
++    uint    tcplen;
++    uint    hdrsoff;
++    uint    hdrslen;
++    uint    lineoff;
++    uint    linelen;
++    uint    off;
++
++    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
++    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
++
++    get_skb_tcpdata(skb, &ptcp, &tcplen);
++    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
++    hdrslen = matchlen;
++    off = hdrsoff;
++    DEBUGP("NAT rtsp help_out\n");
++
++    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
++    {
++        if (linelen == 0)
++        {
++            break;
++        }
++        if (off > hdrsoff+hdrslen)
++        {
++            INFOP("!! overrun !!");
++            break;
++        }
++        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
++
++        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
++        {
++            uint oldtcplen = tcplen;
++          DEBUGP("hdr: Transport\n");
++            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
++            {
++              DEBUGP("hdr: Transport mangle failed");
++                break;
++            }
++            get_skb_tcpdata(skb, &ptcp, &tcplen);
++            hdrslen -= (oldtcplen-tcplen);
++            off -= (oldtcplen-tcplen);
++            lineoff -= (oldtcplen-tcplen);
++            linelen -= (oldtcplen-tcplen);
++            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
++        }
++    }
++
++    return NF_ACCEPT;
++}
++
++static unsigned int
++help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
++     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
++     struct nf_conntrack_expect* exp)
++{
++    int dir = CTINFO2DIR(ctinfo);
++    int rc = NF_ACCEPT;
++
++    switch (dir)
++    {
++    case IP_CT_DIR_ORIGINAL:
++        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
++        break;
++    case IP_CT_DIR_REPLY:
++      DEBUGP("unmangle ! %u\n", ctinfo);
++      /* XXX: unmangle */
++      rc = NF_ACCEPT;
++        break;
++    }
++    //UNLOCK_BH(&ip_rtsp_lock);
++
++    return rc;
++}
++
++static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
++{
++    struct nf_nat_multi_range_compat mr;
++    u_int32_t newdstip, newsrcip, newip;
++
++    struct nf_conn *master = ct->master;
++
++    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++    //FIXME (how to port that ?)
++    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
++    newip = newdstip;
++
++    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
++           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
++
++    mr.rangesize = 1;
++    // We don't want to manip the per-protocol, just the IPs.
++    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
++    mr.range[0].min_ip = mr.range[0].max_ip = newip;
++
++    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
++}
++
++
++static void __exit fini(void)
++{
++      nf_nat_rtsp_hook = NULL;
++        nf_nat_rtsp_hook_expectfn = NULL;
++      synchronize_net();
++}
++
++static int __init init(void)
++{
++      printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
++
++      BUG_ON(nf_nat_rtsp_hook);
++      nf_nat_rtsp_hook = help;
++        nf_nat_rtsp_hook_expectfn = &expected;
++
++      if (stunaddr != NULL)
++              extip = in_aton(stunaddr);
++
++      if (destaction != NULL) {
++              if (strcmp(destaction, "auto") == 0)
++                      dstact = DSTACT_AUTO;
++
++              if (strcmp(destaction, "strip") == 0)
++                      dstact = DSTACT_STRIP;
++
++              if (strcmp(destaction, "none") == 0)
++                      dstact = DSTACT_NONE;
++      }
++
++      return 0;
++}
++
++module_init(init);
++module_exit(fini);

diff --git a/target/linux/generic-2.6/patches-2.6.35/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.35/200-sched_esfq.patch
new file mode 100644 (file)
index 0000000..1d51358
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/200-sched_esfq.patch
@@ -0,0 +1,795 @@
+--- a/include/linux/pkt_sched.h
++++ b/include/linux/pkt_sched.h
+@@ -173,8 +173,37 @@ struct tc_sfq_xstats {
+  *
+  *    The only reason for this is efficiency, it is possible
+  *    to change these parameters in compile time.
++ *
++ *    If you need to play with these values, use esfq instead.
+  */
+ 
++/* ESFQ section */
++
++enum
++{
++        /* traditional */
++      TCA_SFQ_HASH_CLASSIC,
++      TCA_SFQ_HASH_DST,
++      TCA_SFQ_HASH_SRC,
++      TCA_SFQ_HASH_FWMARK,
++      /* conntrack */
++      TCA_SFQ_HASH_CTORIGDST,
++      TCA_SFQ_HASH_CTORIGSRC,
++      TCA_SFQ_HASH_CTREPLDST,
++      TCA_SFQ_HASH_CTREPLSRC,
++      TCA_SFQ_HASH_CTNATCHG,
++};
++
++struct tc_esfq_qopt
++{
++      unsigned        quantum;        /* Bytes per round allocated to flow */
++      int             perturb_period; /* Period of hash perturbation */
++      __u32           limit;          /* Maximal packets in queue */
++      unsigned        divisor;        /* Hash divisor  */
++      unsigned        flows;          /* Maximal number of flows  */
++      unsigned        hash_kind;      /* Hash function to use for flow identification */
++};
++
+ /* RED section */
+ 
+ enum {
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -137,6 +137,37 @@ config NET_SCH_SFQ
+         To compile this code as a module, choose M here: the
+         module will be called sch_sfq.
+ 
++config NET_SCH_ESFQ
++      tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
++      ---help---
++        Say Y here if you want to use the Enhanced Stochastic Fairness
++        Queueing (ESFQ) packet scheduling algorithm for some of your network
++        devices or as a leaf discipline for a classful qdisc such as HTB or
++        CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
++        references to the SFQ algorithm).
++
++        This is an enchanced SFQ version which allows you to control some
++        hardcoded values in the SFQ scheduler.
++
++        ESFQ also adds control of the hash function used to identify packet
++        flows. The original SFQ discipline hashes by connection; ESFQ add
++        several other hashing methods, such as by src IP or by dst IP, which
++        can be more fair to users in some networking situations.
++
++        To compile this code as a module, choose M here: the
++        module will be called sch_esfq.
++
++config NET_SCH_ESFQ_NFCT
++      bool "Connection Tracking Hash Types"
++      depends on NET_SCH_ESFQ && NF_CONNTRACK
++      ---help---
++        Say Y here to enable support for hashing based on netfilter connection
++        tracking information. This is useful for a router that is also using
++        NAT to connect privately-addressed hosts to the Internet. If you want
++        to provide fair distribution of upstream bandwidth, ESFQ must use
++        connection tracking information, since all outgoing packets will share
++        the same source address.
++
+ config NET_SCH_TEQL
+       tristate "True Link Equalizer (TEQL)"
+       ---help---
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)   += sch_gred.o
+ obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o 
+ obj-$(CONFIG_NET_SCH_DSMARK)  += sch_dsmark.o
+ obj-$(CONFIG_NET_SCH_SFQ)     += sch_sfq.o
++obj-$(CONFIG_NET_SCH_ESFQ)    += sch_esfq.o
+ obj-$(CONFIG_NET_SCH_TBF)     += sch_tbf.o
+ obj-$(CONFIG_NET_SCH_TEQL)    += sch_teql.o
+ obj-$(CONFIG_NET_SCH_PRIO)    += sch_prio.o
+--- /dev/null
++++ b/net/sched/sch_esfq.c
+@@ -0,0 +1,702 @@
++/*
++ * net/sched/sch_esfq.c       Extended Stochastic Fairness Queueing discipline.
++ *
++ *            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.
++ *
++ * Authors:   Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:   Alexander Atanasov, <alex@ssi.bg>
++ *            Added dynamic depth,limit,divisor,hash_kind options.
++ *            Added dst and src hashes.
++ *
++ *            Alexander Clouter, <alex@digriz.org.uk>
++ *            Ported ESFQ to Linux 2.6.
++ *
++ *            Corey Hickey, <bugfood-c@fatooh.org>
++ *            Maintenance of the Linux 2.6 port.
++ *            Added fwmark hash (thanks to Robert Kurjata).
++ *            Added usage of jhash.
++ *            Added conntrack support.
++ *            Added ctnatchg hash (thanks to Ben Pfountz).
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++#include <asm/system.h>
++#include <linux/bitops.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/jiffies.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/socket.h>
++#include <linux/sockios.h>
++#include <linux/in.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/if_ether.h>
++#include <linux/inet.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/notifier.h>
++#include <linux/init.h>
++#include <net/ip.h>
++#include <net/netlink.h>
++#include <linux/ipv6.h>
++#include <net/route.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/pkt_sched.h>
++#include <linux/jhash.h>
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++#include <net/netfilter/nf_conntrack.h>
++#endif
++
++/*    Stochastic Fairness Queuing algorithm.
++      For more comments look at sch_sfq.c.
++      The difference is that you can change limit, depth,
++      hash table size and choose alternate hash types.
++
++      classic:        same as in sch_sfq.c
++      dst:            destination IP address
++      src:            source IP address
++      fwmark:         netfilter mark value
++      ctorigdst:      original destination IP address
++      ctorigsrc:      original source IP address
++      ctrepldst:      reply destination IP address
++      ctreplsrc:      reply source IP
++
++*/
++
++#define ESFQ_HEAD 0
++#define ESFQ_TAIL 1
++
++/* This type should contain at least SFQ_DEPTH*2 values */
++typedef unsigned int esfq_index;
++
++struct esfq_head
++{
++      esfq_index      next;
++      esfq_index      prev;
++};
++
++struct esfq_sched_data
++{
++/* Parameters */
++      int             perturb_period;
++      unsigned        quantum;        /* Allotment per round: MUST BE >= MTU */
++      int             limit;
++      unsigned        depth;
++      unsigned        hash_divisor;
++      unsigned        hash_kind;
++/* Variables */
++      struct timer_list perturb_timer;
++      int             perturbation;
++      esfq_index      tail;           /* Index of current slot in round */
++      esfq_index      max_depth;      /* Maximal depth */
++
++      esfq_index      *ht;                    /* Hash table */
++      esfq_index      *next;                  /* Active slots link */
++      short           *allot;                 /* Current allotment per slot */
++      unsigned short  *hash;                  /* Hash value indexed by slots */
++      struct sk_buff_head     *qs;            /* Slot queue */
++      struct esfq_head        *dep;           /* Linked list of slots, indexed by depth */
++};
++
++/* This contains the info we will hash. */
++struct esfq_packet_info
++{
++      u32     proto;          /* protocol or port */
++      u32     src;            /* source from packet header */
++      u32     dst;            /* destination from packet header */
++      u32     ctorigsrc;      /* original source from conntrack */
++      u32     ctorigdst;      /* original destination from conntrack */
++      u32     ctreplsrc;      /* reply source from conntrack */
++      u32     ctrepldst;      /* reply destination from conntrack */
++      u32     mark;           /* netfilter mark (fwmark) */
++};
++
++static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
++{
++      return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
++{
++      return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
++{
++      return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
++}
++
++static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
++{
++      struct esfq_packet_info info;
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++      enum ip_conntrack_info ctinfo;
++      struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
++#endif
++
++      switch (skb->protocol) {
++      case __constant_htons(ETH_P_IP):
++      {
++              struct iphdr *iph = ip_hdr(skb);
++              info.dst = iph->daddr;
++              info.src = iph->saddr;
++              if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
++                  (iph->protocol == IPPROTO_TCP ||
++                   iph->protocol == IPPROTO_UDP ||
++                   iph->protocol == IPPROTO_SCTP ||
++                   iph->protocol == IPPROTO_DCCP ||
++                   iph->protocol == IPPROTO_ESP))
++                      info.proto = *(((u32*)iph) + iph->ihl);
++              else
++                      info.proto = iph->protocol;
++              break;
++      }
++      case __constant_htons(ETH_P_IPV6):
++      {
++              struct ipv6hdr *iph = ipv6_hdr(skb);
++              /* Hash ipv6 addresses into a u32. This isn't ideal,
++               * but the code is simple. */
++              info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
++              info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
++              if (iph->nexthdr == IPPROTO_TCP ||
++                  iph->nexthdr == IPPROTO_UDP ||
++                  iph->nexthdr == IPPROTO_SCTP ||
++                  iph->nexthdr == IPPROTO_DCCP ||
++                  iph->nexthdr == IPPROTO_ESP)
++                      info.proto = *(u32*)&iph[1];
++              else
++                      info.proto = iph->nexthdr;
++              break;
++      }
++      default:
++              info.dst   = (u32)(unsigned long)skb_dst(skb);
++              info.src   = (u32)(unsigned long)skb->sk;
++              info.proto = skb->protocol;
++      }
++
++      info.mark = skb->mark;
++
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++      /* defaults if there is no conntrack info */
++      info.ctorigsrc = info.src;
++      info.ctorigdst = info.dst;
++      info.ctreplsrc = info.dst;
++      info.ctrepldst = info.src;
++      /* collect conntrack info */
++      if (ct && ct != &nf_conntrack_untracked) {
++              if (skb->protocol == __constant_htons(ETH_P_IP)) {
++                      info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++                      info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
++                      info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
++                      info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++              }
++              else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
++                      /* Again, hash ipv6 addresses into a single u32. */
++                      info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
++                      info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
++                      info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
++                      info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
++              }
++
++      }
++#endif
++
++      switch(q->hash_kind) {
++      case TCA_SFQ_HASH_CLASSIC:
++              return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++      case TCA_SFQ_HASH_DST:
++              return esfq_jhash_1word(q, info.dst);
++      case TCA_SFQ_HASH_SRC:
++              return esfq_jhash_1word(q, info.src);
++      case TCA_SFQ_HASH_FWMARK:
++              return esfq_jhash_1word(q, info.mark);
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++      case TCA_SFQ_HASH_CTORIGDST:
++              return esfq_jhash_1word(q, info.ctorigdst);
++      case TCA_SFQ_HASH_CTORIGSRC:
++              return esfq_jhash_1word(q, info.ctorigsrc);
++      case TCA_SFQ_HASH_CTREPLDST:
++              return esfq_jhash_1word(q, info.ctrepldst);
++      case TCA_SFQ_HASH_CTREPLSRC:
++              return esfq_jhash_1word(q, info.ctreplsrc);
++      case TCA_SFQ_HASH_CTNATCHG:
++      {
++              if (info.ctorigdst == info.ctreplsrc)
++                      return esfq_jhash_1word(q, info.ctorigsrc);
++              return esfq_jhash_1word(q, info.ctreplsrc);
++      }
++#endif
++      default:
++              if (net_ratelimit())
++                      printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
++      }
++      return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++}
++
++static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
++{
++      esfq_index p, n;
++      int d = q->qs[x].qlen + q->depth;
++
++      p = d;
++      n = q->dep[d].next;
++      q->dep[x].next = n;
++      q->dep[x].prev = p;
++      q->dep[p].next = q->dep[n].prev = x;
++}
++
++static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
++{
++      esfq_index p, n;
++
++      n = q->dep[x].next;
++      p = q->dep[x].prev;
++      q->dep[p].next = n;
++      q->dep[n].prev = p;
++
++      if (n == p && q->max_depth == q->qs[x].qlen + 1)
++              q->max_depth--;
++
++      esfq_link(q, x);
++}
++
++static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
++{
++      esfq_index p, n;
++      int d;
++
++      n = q->dep[x].next;
++      p = q->dep[x].prev;
++      q->dep[p].next = n;
++      q->dep[n].prev = p;
++      d = q->qs[x].qlen;
++      if (q->max_depth < d)
++              q->max_depth = d;
++
++      esfq_link(q, x);
++}
++
++static unsigned int esfq_drop(struct Qdisc *sch)
++{
++      struct esfq_sched_data *q = qdisc_priv(sch);
++      esfq_index d = q->max_depth;
++      struct sk_buff *skb;
++      unsigned int len;
++
++      /* Queue is full! Find the longest slot and
++         drop a packet from it */
++
++      if (d > 1) {
++              esfq_index x = q->dep[d+q->depth].next;
++              skb = q->qs[x].prev;
++              len = skb->len;
++              __skb_unlink(skb, &q->qs[x]);
++              kfree_skb(skb);
++              esfq_dec(q, x);
++              sch->q.qlen--;
++              sch->qstats.drops++;
++              sch->qstats.backlog -= len;
++              return len;
++      }
++
++      if (d == 1) {
++              /* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
++              d = q->next[q->tail];
++              q->next[q->tail] = q->next[d];
++              q->allot[q->next[d]] += q->quantum;
++              skb = q->qs[d].prev;
++              len = skb->len;
++              __skb_unlink(skb, &q->qs[d]);
++              kfree_skb(skb);
++              esfq_dec(q, d);
++              sch->q.qlen--;
++              q->ht[q->hash[d]] = q->depth;
++              sch->qstats.drops++;
++              sch->qstats.backlog -= len;
++              return len;
++      }
++
++      return 0;
++}
++
++static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
++{
++      unsigned hash = esfq_hash(q, skb);
++      unsigned depth = q->depth;
++      esfq_index x;
++
++      x = q->ht[hash];
++      if (x == depth) {
++              q->ht[hash] = x = q->dep[depth].next;
++              q->hash[x] = hash;
++      }
++
++      if (end == ESFQ_TAIL)
++              __skb_queue_tail(&q->qs[x], skb);
++      else
++              __skb_queue_head(&q->qs[x], skb);
++
++      esfq_inc(q, x);
++      if (q->qs[x].qlen == 1) {               /* The flow is new */
++              if (q->tail == depth) { /* It is the first flow */
++                      q->tail = x;
++                      q->next[x] = x;
++                      q->allot[x] = q->quantum;
++              } else {
++                      q->next[x] = q->next[q->tail];
++                      q->next[q->tail] = x;
++                      q->tail = x;
++              }
++      }
++}
++
++static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
++{
++      struct esfq_sched_data *q = qdisc_priv(sch);
++      esfq_q_enqueue(skb, q, ESFQ_TAIL);
++      sch->qstats.backlog += skb->len;
++      if (++sch->q.qlen < q->limit-1) {
++              sch->bstats.bytes += skb->len;
++              sch->bstats.packets++;
++              return 0;
++      }
++
++      sch->qstats.drops++;
++      esfq_drop(sch);
++      return NET_XMIT_CN;
++}
++
++static struct sk_buff *esfq_peek(struct Qdisc* sch)
++{
++      struct esfq_sched_data *q = qdisc_priv(sch);
++      esfq_index a;
++
++      /* No active slots */
++      if (q->tail == q->depth)
++              return NULL;
++
++      a = q->next[q->tail];
++      return skb_peek(&q->qs[a]);
++}
++
++static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
++{
++      struct sk_buff *skb;
++      unsigned depth = q->depth;
++      esfq_index a, old_a;
++
++      /* No active slots */
++      if (q->tail == depth)
++              return NULL;
++
++      a = old_a = q->next[q->tail];
++
++      /* Grab packet */
++      skb = __skb_dequeue(&q->qs[a]);
++      esfq_dec(q, a);
++
++      /* Is the slot empty? */
++      if (q->qs[a].qlen == 0) {
++              q->ht[q->hash[a]] = depth;
++              a = q->next[a];
++              if (a == old_a) {
++                      q->tail = depth;
++                      return skb;
++              }
++              q->next[q->tail] = a;
++              q->allot[a] += q->quantum;
++      } else if ((q->allot[a] -= skb->len) <= 0) {
++              q->tail = a;
++              a = q->next[a];
++              q->allot[a] += q->quantum;
++      }
++
++      return skb;
++}
++
++static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
++{
++      struct esfq_sched_data *q = qdisc_priv(sch);
++      struct sk_buff *skb;
++
++      skb = esfq_q_dequeue(q);
++      if (skb == NULL)
++              return NULL;
++      sch->q.qlen--;
++      sch->qstats.backlog -= skb->len;
++      return skb;
++}
++
++static void esfq_q_destroy(struct esfq_sched_data *q)
++{
++      del_timer(&q->perturb_timer);
++      if(q->ht)
++              kfree(q->ht);
++      if(q->dep)
++              kfree(q->dep);
++      if(q->next)
++              kfree(q->next);
++      if(q->allot)
++              kfree(q->allot);
++      if(q->hash)
++              kfree(q->hash);
++      if(q->qs)
++              kfree(q->qs);
++}
++
++static void esfq_destroy(struct Qdisc *sch)
++{
++      struct esfq_sched_data *q = qdisc_priv(sch);
++      esfq_q_destroy(q);
++}
++
++
++static void esfq_reset(struct Qdisc* sch)
++{
++      struct sk_buff *skb;
++
++      while ((skb = esfq_dequeue(sch)) != NULL)
++              kfree_skb(skb);
++}
++
++static void esfq_perturbation(unsigned long arg)
++{
++      struct Qdisc *sch = (struct Qdisc*)arg;
++      struct esfq_sched_data *q = qdisc_priv(sch);
++
++      q->perturbation = net_random()&0x1F;
++
++      if (q->perturb_period) {
++              q->perturb_timer.expires = jiffies + q->perturb_period;
++              add_timer(&q->perturb_timer);
++      }
++}
++
++static unsigned int esfq_check_hash(unsigned int kind)
++{
++      switch (kind) {
++      case TCA_SFQ_HASH_CTORIGDST:
++      case TCA_SFQ_HASH_CTORIGSRC:
++      case TCA_SFQ_HASH_CTREPLDST:
++      case TCA_SFQ_HASH_CTREPLSRC:
++      case TCA_SFQ_HASH_CTNATCHG:
++#ifndef CONFIG_NET_SCH_ESFQ_NFCT
++      {
++              if (net_ratelimit())
++                      printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
++              return TCA_SFQ_HASH_CLASSIC;
++      }
++#endif
++      case TCA_SFQ_HASH_CLASSIC:
++      case TCA_SFQ_HASH_DST:
++      case TCA_SFQ_HASH_SRC:
++      case TCA_SFQ_HASH_FWMARK:
++              return kind;
++      default:
++      {
++              if (net_ratelimit())
++                      printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
++              return TCA_SFQ_HASH_CLASSIC;
++      }
++      }
++}
++
++static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
++{
++      struct tc_esfq_qopt *ctl = nla_data(opt);
++      esfq_index p = ~0U/2;
++      int i;
++
++      if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
++              return -EINVAL;
++
++      q->perturbation = 0;
++      q->hash_kind = TCA_SFQ_HASH_CLASSIC;
++      q->max_depth = 0;
++      if (opt == NULL) {
++              q->perturb_period = 0;
++              q->hash_divisor = 1024;
++              q->tail = q->limit = q->depth = 128;
++
++      } else {
++              struct tc_esfq_qopt *ctl = nla_data(opt);
++              if (ctl->quantum)
++                      q->quantum = ctl->quantum;
++              q->perturb_period = ctl->perturb_period*HZ;
++              q->hash_divisor = ctl->divisor ? : 1024;
++              q->tail = q->limit = q->depth = ctl->flows ? : 128;
++
++              if ( q->depth > p - 1 )
++                      return -EINVAL;
++
++              if (ctl->limit)
++                      q->limit = min_t(u32, ctl->limit, q->depth);
++
++              if (ctl->hash_kind) {
++                      q->hash_kind = esfq_check_hash(ctl->hash_kind);
++              }
++      }
++
++      q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
++      if (!q->ht)
++              goto err_case;
++      q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
++      if (!q->dep)
++              goto err_case;
++      q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
++      if (!q->next)
++              goto err_case;
++      q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
++      if (!q->allot)
++              goto err_case;
++      q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
++      if (!q->hash)
++              goto err_case;
++      q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
++      if (!q->qs)
++              goto err_case;
++
++      for (i=0; i< q->hash_divisor; i++)
++              q->ht[i] = q->depth;
++      for (i=0; i<q->depth; i++) {
++              skb_queue_head_init(&q->qs[i]);
++              q->dep[i+q->depth].next = i+q->depth;
++              q->dep[i+q->depth].prev = i+q->depth;
++      }
++
++      for (i=0; i<q->depth; i++)
++              esfq_link(q, i);
++      return 0;
++err_case:
++      esfq_q_destroy(q);
++      return -ENOBUFS;
++}
++
++static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
++{
++      struct esfq_sched_data *q = qdisc_priv(sch);
++      int err;
++
++      q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
++      if ((err = esfq_q_init(q, opt)))
++              return err;
++
++      init_timer(&q->perturb_timer);
++      q->perturb_timer.data = (unsigned long)sch;
++      q->perturb_timer.function = esfq_perturbation;
++      if (q->perturb_period) {
++              q->perturb_timer.expires = jiffies + q->perturb_period;
++              add_timer(&q->perturb_timer);
++      }
++
++      return 0;
++}
++
++static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
++{
++      struct esfq_sched_data *q = qdisc_priv(sch);
++      struct esfq_sched_data new;
++      struct sk_buff *skb;
++      int err;
++
++      /* set up new queue */
++      memset(&new, 0, sizeof(struct esfq_sched_data));
++      new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
++      if ((err = esfq_q_init(&new, opt)))
++              return err;
++
++      /* copy all packets from the old queue to the new queue */
++      sch_tree_lock(sch);
++      while ((skb = esfq_q_dequeue(q)) != NULL)
++              esfq_q_enqueue(skb, &new, ESFQ_TAIL);
++
++      /* clean up the old queue */
++      esfq_q_destroy(q);
++
++      /* copy elements of the new queue into the old queue */
++      q->perturb_period = new.perturb_period;
++      q->quantum        = new.quantum;
++      q->limit          = new.limit;
++      q->depth          = new.depth;
++      q->hash_divisor   = new.hash_divisor;
++      q->hash_kind      = new.hash_kind;
++      q->tail           = new.tail;
++      q->max_depth      = new.max_depth;
++      q->ht    = new.ht;
++      q->dep   = new.dep;
++      q->next  = new.next;
++      q->allot = new.allot;
++      q->hash  = new.hash;
++      q->qs    = new.qs;
++
++      /* finish up */
++      if (q->perturb_period) {
++              q->perturb_timer.expires = jiffies + q->perturb_period;
++              add_timer(&q->perturb_timer);
++      } else {
++              q->perturbation = 0;
++      }
++      sch_tree_unlock(sch);
++      return 0;
++}
++
++static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++      struct esfq_sched_data *q = qdisc_priv(sch);
++      unsigned char *b = skb_tail_pointer(skb);
++      struct tc_esfq_qopt opt;
++
++      opt.quantum = q->quantum;
++      opt.perturb_period = q->perturb_period/HZ;
++
++      opt.limit = q->limit;
++      opt.divisor = q->hash_divisor;
++      opt.flows = q->depth;
++      opt.hash_kind = q->hash_kind;
++
++      NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
++
++      return skb->len;
++
++nla_put_failure:
++      nlmsg_trim(skb, b);
++      return -1;
++}
++
++static struct Qdisc_ops esfq_qdisc_ops =
++{
++      .next           =       NULL,
++      .cl_ops         =       NULL,
++      .id             =       "esfq",
++      .priv_size      =       sizeof(struct esfq_sched_data),
++      .enqueue        =       esfq_enqueue,
++      .dequeue        =       esfq_dequeue,
++      .peek           =       esfq_peek,
++      .drop           =       esfq_drop,
++      .init           =       esfq_init,
++      .reset          =       esfq_reset,
++      .destroy        =       esfq_destroy,
++      .change         =       esfq_change,
++      .dump           =       esfq_dump,
++      .owner          =       THIS_MODULE,
++};
++
++static int __init esfq_module_init(void)
++{
++      return register_qdisc(&esfq_qdisc_ops);
++}
++static void __exit esfq_module_exit(void)
++{
++      unregister_qdisc(&esfq_qdisc_ops);
++}
++module_init(esfq_module_init)
++module_exit(esfq_module_exit)
++MODULE_LICENSE("GPL");

diff --git a/target/linux/generic-2.6/patches-2.6.35/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.35/201-jhash3.patch
new file mode 100644 (file)
index 0000000..0218fa1
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/201-jhash3.patch
@@ -0,0 +1,227 @@
+--- a/include/linux/jhash.h
++++ b/include/linux/jhash.h
+@@ -3,80 +3,95 @@
+ 
+ /* jhash.h: Jenkins hash support.
+  *
+- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
++ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
+  *
+  * http://burtleburtle.net/bob/hash/
+  *
+  * These are the credits from Bob's sources:
+  *
+- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
+- * hash(), hash2(), hash3, and mix() are externally useful functions.
+- * Routines to test the hash are included if SELF_TEST is defined.
+- * You can use this free for any purpose.  It has no warranty.
++ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+  *
+- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
++ * These are functions for producing 32-bit hashes for hash table lookup.
++ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
++ * are externally useful functions.  Routines to test the hash are included 
++ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
++ * the public domain.  It has no warranty.
++ *
++ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
+  *
+  * I've modified Bob's hash to be useful in the Linux kernel, and
+- * any bugs present are surely my fault.  -DaveM
++ * any bugs present are my fault.  Jozsef
+  */
+ 
+-/* NOTE: Arguments are modified. */
+-#define __jhash_mix(a, b, c) \
++#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
++
++/* __jhash_mix - mix 3 32-bit values reversibly. */
++#define __jhash_mix(a,b,c) \
++{ \
++  a -= c;  a ^= __rot(c, 4);  c += b; \
++  b -= a;  b ^= __rot(a, 6);  a += c; \
++  c -= b;  c ^= __rot(b, 8);  b += a; \
++  a -= c;  a ^= __rot(c,16);  c += b; \
++  b -= a;  b ^= __rot(a,19);  a += c; \
++  c -= b;  c ^= __rot(b, 4);  b += a; \
++}
++
++/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
++#define __jhash_final(a,b,c) \
+ { \
+-  a -= b; a -= c; a ^= (c>>13); \
+-  b -= c; b -= a; b ^= (a<<8); \
+-  c -= a; c -= b; c ^= (b>>13); \
+-  a -= b; a -= c; a ^= (c>>12);  \
+-  b -= c; b -= a; b ^= (a<<16); \
+-  c -= a; c -= b; c ^= (b>>5); \
+-  a -= b; a -= c; a ^= (c>>3);  \
+-  b -= c; b -= a; b ^= (a<<10); \
+-  c -= a; c -= b; c ^= (b>>15); \
++  c ^= b; c -= __rot(b,14); \
++  a ^= c; a -= __rot(c,11); \
++  b ^= a; b -= __rot(a,25); \
++  c ^= b; c -= __rot(b,16); \
++  a ^= c; a -= __rot(c,4);  \
++  b ^= a; b -= __rot(a,14); \
++  c ^= b; c -= __rot(b,24); \
+ }
+ 
+-/* The golden ration: an arbitrary value */
+-#define JHASH_GOLDEN_RATIO    0x9e3779b9
++/* An arbitrary initial parameter */
++#define JHASH_GOLDEN_RATIO    0xdeadbeef
+ 
+ /* The most generic version, hashes an arbitrary sequence
+  * of bytes.  No alignment or length assumptions are made about
+- * the input key.
++ * the input key. The result depends on endianness.
+  */
+ static inline u32 jhash(const void *key, u32 length, u32 initval)
+ {
+-      u32 a, b, c, len;
++      u32 a,b,c;
+       const u8 *k = key;
+ 
+-      len = length;
+-      a = b = JHASH_GOLDEN_RATIO;
+-      c = initval;
+-
+-      while (len >= 12) {
+-              a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
+-              b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
+-              c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
+-
+-              __jhash_mix(a,b,c);
++      /* Set up the internal state */
++      a = b = c = JHASH_GOLDEN_RATIO + length + initval;
+ 
++      /* all but the last block: affect some 32 bits of (a,b,c) */
++      while (length > 12) {
++              a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
++              b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
++              c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
++              __jhash_mix(a, b, c);
++              length -= 12;
+               k += 12;
+-              len -= 12;
+       }
+ 
+-      c += length;
+-      switch (len) {
+-      case 11: c += ((u32)k[10]<<24);
+-      case 10: c += ((u32)k[9]<<16);
+-      case 9 : c += ((u32)k[8]<<8);
+-      case 8 : b += ((u32)k[7]<<24);
+-      case 7 : b += ((u32)k[6]<<16);
+-      case 6 : b += ((u32)k[5]<<8);
++      /* last block: affect all 32 bits of (c) */
++      /* all the case statements fall through */
++      switch (length) {
++      case 12: c += (u32)k[11]<<24;
++      case 11: c += (u32)k[10]<<16;
++      case 10: c += (u32)k[9]<<8;
++      case 9 : c += k[8];
++      case 8 : b += (u32)k[7]<<24;
++      case 7 : b += (u32)k[6]<<16;
++      case 6 : b += (u32)k[5]<<8;
+       case 5 : b += k[4];
+-      case 4 : a += ((u32)k[3]<<24);
+-      case 3 : a += ((u32)k[2]<<16);
+-      case 2 : a += ((u32)k[1]<<8);
++      case 4 : a += (u32)k[3]<<24;
++      case 3 : a += (u32)k[2]<<16;
++      case 2 : a += (u32)k[1]<<8;
+       case 1 : a += k[0];
+-      };
+-
+-      __jhash_mix(a,b,c);
++              __jhash_final(a, b, c);
++      case 0 :
++              break;
++      }
+ 
+       return c;
+ }
+@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
+  */
+ static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
+ {
+-      u32 a, b, c, len;
++      u32 a, b, c;
+ 
+-      a = b = JHASH_GOLDEN_RATIO;
+-      c = initval;
+-      len = length;
++      /* Set up the internal state */
++      a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
+ 
+-      while (len >= 3) {
++      /* handle most of the key */
++      while (length > 3) {
+               a += k[0];
+               b += k[1];
+               c += k[2];
+               __jhash_mix(a, b, c);
+-              k += 3; len -= 3;
++              length -= 3;
++              k += 3;
+       }
+ 
+-      c += length * 4;
+-
+-      switch (len) {
+-      case 2 : b += k[1];
+-      case 1 : a += k[0];
+-      };
+-
+-      __jhash_mix(a,b,c);
++      /* handle the last 3 u32's */
++      /* all the case statements fall through */ 
++      switch (length) {
++      case 3: c += k[2];
++      case 2: b += k[1];
++      case 1: a += k[0];
++              __jhash_final(a, b, c);
++      case 0:     /* case 0: nothing left to add */
++              break;
++      }
+ 
+       return c;
+ }
+ 
+-
+ /* A special ultra-optimized versions that knows they are hashing exactly
+  * 3, 2 or 1 word(s).
+- *
+- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
+- *       done at the end is not done here.
+  */
+ static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
+ {
+-      a += JHASH_GOLDEN_RATIO;
+-      b += JHASH_GOLDEN_RATIO;
+-      c += initval;
++      a += JHASH_GOLDEN_RATIO + initval;
++      b += JHASH_GOLDEN_RATIO + initval;
++      c += JHASH_GOLDEN_RATIO + initval;
+ 
+-      __jhash_mix(a, b, c);
++      __jhash_final(a, b, c);
+ 
+       return c;
+ }
+ 
+ static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
+ {
+-      return jhash_3words(a, b, 0, initval);
++      return jhash_3words(0, a, b, initval);
+ }
+ 
+ static inline u32 jhash_1word(u32 a, u32 initval)
+ {
+-      return jhash_3words(a, 0, 0, initval);
++      return jhash_3words(0, 0, a, initval);
+ }
+ 
+ #endif /* _LINUX_JHASH_H */

diff --git a/target/linux/generic-2.6/patches-2.6.35/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.35/202-mips_mem_functions_performance.patch
new file mode 100644 (file)
index 0000000..e432471
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/202-mips_mem_functions_performance.patch
@@ -0,0 +1,83 @@
+--- a/arch/mips/include/asm/string.h
++++ b/arch/mips/include/asm/string.h
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+ 
+ #define __HAVE_ARCH_MEMSET
+ extern void *memset(void *__s, int __c, size_t __count);
++#define memset(__s, __c, len)                                 \
++({                                                            \
++      size_t __len = (len);                                   \
++      void *__ret;                                            \
++      if (__builtin_constant_p(len) && __len >= 64)           \
++              __ret = memset((__s), (__c), __len);            \
++      else                                                    \
++              __ret = __builtin_memset((__s), (__c), __len);  \
++      __ret;                                                  \
++})
+ 
+ #define __HAVE_ARCH_MEMCPY
+ extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
++#define memcpy(dst, src, len)                                 \
++({                                                            \
++      size_t __len = (len);                                   \
++      void *__ret;                                            \
++      if (__builtin_constant_p(len) && __len >= 64)           \
++              __ret = memcpy((dst), (src), __len);            \
++      else                                                    \
++              __ret = __builtin_memcpy((dst), (src), __len);  \
++      __ret;                                                  \
++})
+ 
+ #define __HAVE_ARCH_MEMMOVE
+ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
++#define memmove(dst, src, len)                                        \
++({                                                            \
++      size_t __len = (len);                                   \
++      void *__ret;                                            \
++      if (__builtin_constant_p(len) && __len >= 64)           \
++              __ret = memmove((dst), (src), __len);           \
++      else                                                    \
++              __ret = __builtin_memmove((dst), (src), __len); \
++      __ret;                                                  \
++})
++
++#define __HAVE_ARCH_MEMCMP
++#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
+ 
+ #endif /* _ASM_STRING_H */
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
+@@ -3,7 +3,7 @@
+ #
+ 
+ lib-y += csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
+-         strlen_user.o strncpy_user.o strnlen_user.o uncached.o
++         strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
+ 
+ obj-y                 += iomap.o
+ obj-$(CONFIG_PCI)     += iomap-pci.o
+--- /dev/null
++++ b/arch/mips/lib/memcmp.c
+@@ -0,0 +1,22 @@
++/*
++ *  copied from linux/lib/string.c
++ *
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
++
++#include <linux/module.h>
++#include <linux/string.h>
++
++#undef memcmp
++int memcmp(const void *cs, const void *ct, size_t count)
++{
++      const unsigned char *su1, *su2;
++      int res = 0;
++
++      for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
++              if ((res = *su1 - *su2) != 0)
++                      break;
++      return res;
++}
++EXPORT_SYMBOL(memcmp);
++

diff --git a/target/linux/generic-2.6/patches-2.6.35/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.35/203-slab_maxsize.patch
new file mode 100644 (file)
index 0000000..fe8cecf
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/203-slab_maxsize.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
+  * to do various tricks to work around compiler limitations in order to
+  * ensure proper constant folding.
+  */
+-#define KMALLOC_SHIFT_HIGH    ((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
+-                              (MAX_ORDER + PAGE_SHIFT - 1) : 25)
++#define KMALLOC_SHIFT_HIGH    ((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
++                              (MAX_ORDER + PAGE_SHIFT - 1) : 17)
+ 
+ #define KMALLOC_MAX_SIZE      (1UL << KMALLOC_SHIFT_HIGH)
+ #define KMALLOC_MAX_ORDER     (KMALLOC_SHIFT_HIGH - PAGE_SHIFT)

diff --git a/target/linux/generic-2.6/patches-2.6.35/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.35/204-jffs2_eofdetect.patch
new file mode 100644 (file)
index 0000000..16d3e1f
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/204-jffs2_eofdetect.patch
@@ -0,0 +1,132 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
+       dbg_fsbuild("scanned flash completely\n");
+       jffs2_dbg_dump_block_lists_nolock(c);
+ 
++      if (c->flags & (1 << 7)) {
++              printk("%s(): unlocking the mtd device... ", __func__);
++              if (c->mtd->unlock)
++                      c->mtd->unlock(c->mtd, 0, c->mtd->size);
++              printk("done.\n");
++
++              printk("%s(): erasing all blocks after the end marker... ", __func__);
++              jffs2_erase_pending_blocks(c, -1);
++              printk("done.\n");
++      }
++
+       dbg_fsbuild("pass 1 starting\n");
+       c->flags |= JFFS2_SB_FLAG_BUILDING;
+       /* Now scan the directory tree, increasing nlink according to every dirent found. */
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
+               return ret;
+       if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
+               return ret;
+-      /* Turned wasted size into dirty, since we apparently 
++      /* Turned wasted size into dirty, since we apparently
+          think it's recoverable now. */
+       jeb->dirty_size += jeb->wasted_size;
+       c->dirty_size += jeb->wasted_size;
+@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
+               /* reset summary info for next eraseblock scan */
+               jffs2_sum_reset_collected(s);
+ 
+-              ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
+-                                              buf_size, s);
++              if (c->flags & (1 << 7))
++                      ret = BLK_STATE_ALLFF;
++              else
++                      ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
++                                                      buf_size, s);
+ 
+               if (ret < 0)
+                       goto out;
+@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
+       if (!ref)
+               return -ENOMEM;
+ 
+-      /* BEFORE jffs2_build_xattr_subsystem() called, 
++      /* BEFORE jffs2_build_xattr_subsystem() called,
+        * and AFTER xattr_ref is marked as a dead xref,
+        * ref->xid is used to store 32bit xid, xd is not used
+        * ref->ino is used to store 32bit inode-number, ic is not used
+@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
+               struct jffs2_sum_marker *sm;
+               void *sumptr = NULL;
+               uint32_t sumlen;
+-            
++
+               if (!buf_size) {
+                       /* XIP case. Just look, point at the summary if it's there */
+                       sm = (void *)buf + c->sector_size - sizeof(*sm);
+@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
+                               buf_len = sizeof(*sm);
+ 
+                       /* Read as much as we want into the _end_ of the preallocated buffer */
+-                      err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
++                      err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
+                                                 jeb->offset + c->sector_size - buf_len,
+-                                                buf_len);                             
++                                                buf_len);
+                       if (err)
+                               return err;
+ 
+@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
+                               }
+                               if (buf_len < sumlen) {
+                                       /* Need to read more so that the entire summary node is present */
+-                                      err = jffs2_fill_scan_buf(c, sumptr, 
++                                      err = jffs2_fill_scan_buf(c, sumptr,
+                                                                 jeb->offset + c->sector_size - sumlen,
+-                                                                sumlen - buf_len);                            
++                                                                sumlen - buf_len);
+                                       if (err)
+                                               return err;
+                               }
+@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
+ 
+                       if (buf_size && sumlen > buf_size)
+                               kfree(sumptr);
+-                      /* If it returns with a real error, bail. 
++                      /* If it returns with a real error, bail.
+                          If it returns positive, that's a block classification
+                          (i.e. BLK_STATE_xxx) so return that too.
+                          If it returns zero, fall through to full scan. */
+@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
+                       return err;
+       }
+ 
++      if ((buf[0] == 0xde) &&
++              (buf[1] == 0xad) &&
++              (buf[2] == 0xc0) &&
++              (buf[3] == 0xde)) {
++              /* end of filesystem. erase everything after this point */
++              printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
++              c->flags |= (1 << 7);
++
++              return BLK_STATE_ALLFF;
++      }
++
+       /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
+       ofs = 0;
+ 
+@@ -671,7 +685,7 @@ scan_more:
+                               scan_end = buf_len;
+                               goto more_empty;
+                       }
+-                      
++
+                       /* See how much more there is to read in this eraseblock... */
+                       buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
+                       if (!buf_len) {
+@@ -907,7 +921,7 @@ scan_more:
+ 
+       D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
+                 jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
+-      
++
+       /* mark_node_obsolete can add to wasted !! */
+       if (jeb->wasted_size) {
+               jeb->dirty_size += jeb->wasted_size;

diff --git a/target/linux/generic-2.6/patches-2.6.35/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.35/207-powerpc_asm_segment_h.patch
new file mode 100644 (file)
index 0000000..1272e82
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/207-powerpc_asm_segment_h.patch
@@ -0,0 +1,9 @@
+--- /dev/null
++++ b/include/asm-powerpc/segment.h
+@@ -0,0 +1,6 @@
++#ifndef _ASM_SEGMENT_H
++#define _ASM_SEGMENT_H
++
++/* Only here because we have some old header files that expect it.. */
++
++#endif /* _ASM_SEGMENT_H */

diff --git a/target/linux/generic-2.6/patches-2.6.35/208-mips_oprofile_fix.patch b/target/linux/generic-2.6/patches-2.6.35/208-mips_oprofile_fix.patch
new file mode 100644 (file)
index 0000000..0cbf4ed
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/208-mips_oprofile_fix.patch
@@ -0,0 +1,48 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -49,7 +49,9 @@ ifneq ($(SUBARCH),$(ARCH))
+ endif
+ 
+ ifndef CONFIG_FUNCTION_TRACER
+-cflags-y := -ffunction-sections
++  ifndef CONFIG_PROFILING
++    cflags-y := -ffunction-sections
++  endif
+ endif
+ ifdef CONFIG_FUNCTION_GRAPH_TRACER
+   ifndef KBUILD_MCOUNT_RA_ADDRESS
+--- a/arch/mips/oprofile/op_model_mipsxx.c
++++ b/arch/mips/oprofile/op_model_mipsxx.c
+@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
+       }
+ }
+ 
++static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
++{
++      return mipsxx_perfcount_handler();
++}
++
+ static int __init mipsxx_init(void)
+ {
+       int counters;
+@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
+       save_perf_irq = perf_irq;
+       perf_irq = mipsxx_perfcount_handler;
+ 
++      if (cp0_perfcount_irq >= 0)
++              return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
++                      IRQF_SHARED, "Perfcounter", save_perf_irq);
++
+       return 0;
+ }
+ 
+@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
+ {
+       int counters = op_model_mipsxx_ops.num_counters;
+ 
++      if (cp0_perfcount_irq >= 0)
++              free_irq(cp0_perfcount_irq, save_perf_irq);
++
+       counters = counters_per_cpu_to_total(counters);
+       on_each_cpu(reset_counters, (void *)(long)counters, 1);
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.35/209-mini_fo.patch
new file mode 100644 (file)
index 0000000..d7e3220
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/209-mini_fo.patch
@@ -0,0 +1,7782 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -181,6 +181,7 @@ source "fs/logfs/Kconfig"
+ source "fs/cramfs/Kconfig"
+ source "fs/squashfs/Kconfig"
+ source "fs/freevxfs/Kconfig"
++source "fs/mini_fo/Kconfig"
+ source "fs/minix/Kconfig"
+ source "fs/omfs/Kconfig"
+ source "fs/hpfs/Kconfig"
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)               += squashfs/
+ obj-y                         += ramfs/
+ obj-$(CONFIG_HUGETLBFS)               += hugetlbfs/
+ obj-$(CONFIG_CODA_FS)         += coda/
++obj-$(CONFIG_MINI_FO)         += mini_fo/
+ obj-$(CONFIG_MINIX_FS)                += minix/
+ obj-$(CONFIG_FAT_FS)          += fat/
+ obj-$(CONFIG_BFS_FS)          += bfs/
+--- /dev/null
++++ b/fs/mini_fo/aux.c
+@@ -0,0 +1,577 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++/*
++ *  $Id$
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "fist.h"
++#include "mini_fo.h"
++
++/* check if file exists in storage  */
++int exists_in_storage(dentry_t *dentry)
++{
++      check_mini_fo_dentry(dentry);
++      if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
++              return 1;
++      return 0;
++}
++
++/* check if dentry is in an existing state */
++int is_mini_fo_existant(dentry_t *dentry)
++{
++      check_mini_fo_dentry(dentry);
++
++      if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
++              return 0;
++      else
++              return 1;
++}
++
++/*
++ * This function will create a negative storage dentry for
++ * dentry, what is required for many create like options.
++ * It will create the storage structure if necessary.
++ */
++int get_neg_sto_dentry(dentry_t *dentry)
++{
++      int err = 0;
++      unsigned int len;
++      const unsigned char *name;
++
++      if(!dentry ||
++         !dtopd(dentry) ||
++         !(dtost(dentry) == UNMODIFIED ||
++           dtost(dentry) == NON_EXISTANT ||
++           dtost(dentry) == DELETED)) {
++              printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
++              err = -1;
++              goto out;
++      }
++      /* Have we got a neg. dentry already? */
++      if(dtohd2(dentry)) {
++              err = 0;
++              goto out;
++      }
++      if(dtost(dentry->d_parent) == UNMODIFIED) {
++              /* build sto struct */
++              err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
++              if(err ||
++                 dtost(dentry->d_parent) != MODIFIED) {
++                      printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
++                      err = -1;
++                      goto out;
++              }
++      }
++
++      len = dentry->d_name.len;
++      name = dentry->d_name.name;
++
++      dtohd2(dentry) =
++              lookup_one_len(name, dtohd2(dentry->d_parent), len);
++
++ out:
++      return err;
++}
++
++int check_mini_fo_dentry(dentry_t *dentry)
++{
++      ASSERT(dentry != NULL);
++      ASSERT(dtopd(dentry) != NULL);
++      ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
++
++/*    if(dtost(dentry) == MODIFIED) { */
++/*            ASSERT(dentry->d_inode != NULL); */
++/*            ASSERT(dtohd(dentry) != NULL); */
++/*            ASSERT(dtohd(dentry)->d_inode != NULL); */
++/*            ASSERT(dtohd2(dentry) != NULL); */
++/*            ASSERT(dtohd2(dentry)->d_inode != NULL); */
++/*    } */
++/*    else if(dtost(dentry) == UNMODIFIED) { */
++/*            ASSERT(dentry->d_inode != NULL); */
++/*            ASSERT( */
++/*    } */
++      return 0;
++}
++
++int check_mini_fo_file(file_t *file)
++{
++      ASSERT(file != NULL);
++      ASSERT(ftopd(file) != NULL);
++      ASSERT(file->f_dentry != NULL);
++
++      /* violent checking, check depending of state and type
++       *      if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
++       */
++      ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
++      return 0;
++}
++
++int check_mini_fo_inode(inode_t *inode)
++{
++      ASSERT(inode != NULL);
++      ASSERT(itopd(inode) != NULL);
++      ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
++      return 0;
++}
++
++/*
++ * will walk a base path as provided by get_mini_fo_bpath and return
++ * the (hopefully ;-) ) positive dentry of the renamed base dir.
++ *
++ * This does some work of path_init.
++ */
++dentry_t *bpath_walk(super_block_t *sb, char *bpath)
++{
++      int err;
++        struct vfsmount *mnt;
++      struct nameidata nd;
++
++      /* be paranoid */
++      if(!bpath || bpath[0] != '/') {
++              printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
++              return NULL;
++      }
++      if(!sb || !stopd(sb)) {
++              printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
++              return NULL;
++      }
++
++      /* fix this: how do I reach this lock?
++       * read_lock(&current->fs->lock); */
++      mnt = mntget(stopd(sb)->hidden_mnt);
++      /* read_unlock(&current->fs->lock); */
++
++      err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
++
++      /* validate */
++      if (err || !nd.dentry || !nd.dentry->d_inode) {
++              printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
++              return NULL;
++      }
++      return nd.dentry;
++}
++
++
++/* returns the full path of the basefile incl. its name */
++int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
++{
++      char *buf_walker;
++      int len = 0;
++      dentry_t *sky_walker;
++
++      if(!dentry || !dtohd(dentry)) {
++              printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
++              return -1;
++      }
++      sky_walker = dtohd(dentry);
++
++      do {
++              len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
++              sky_walker = sky_walker->d_parent;
++      } while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
++
++      /* 1 to oil the loop */
++      *bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
++      if(!*bpath) {
++              printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
++              return -1;
++      }
++      buf_walker = *bpath+len; /* put it on last char */
++      *buf_walker = '\n';
++      sky_walker = dtohd(dentry);
++
++      do {
++              buf_walker -= sky_walker->d_name.len;
++              strncpy(buf_walker,
++                      sky_walker->d_name.name,
++                      sky_walker->d_name.len);
++              *(--buf_walker) = '/';
++              sky_walker = sky_walker->d_parent;
++      } while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
++
++      /* bpath_len doesn't count newline! */
++      *bpath_len = len;
++      return 0;
++}
++
++int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
++                  dentry_t *src_dentry, struct vfsmount *src_mnt)
++{
++      void *buf;
++      mm_segment_t old_fs;
++      file_t *tgt_file;
++      file_t *src_file;
++      int bytes, len, tmp, err;
++      err = 0;
++
++      if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
++              printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
++              err = -EINVAL;
++              goto out;
++      }
++
++      dget(tgt_dentry);
++      dget(src_dentry);
++      mntget(tgt_mnt);
++      mntget(src_mnt);
++
++      /* open file write only */
++      tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
++      if(!tgt_file || IS_ERR(tgt_file)) {
++              printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
++              err = PTR_ERR(tgt_file);
++              goto out_err;
++      }
++
++      /* open file read only */
++      src_file = dentry_open(src_dentry, src_mnt, 0x0);
++      if(!src_file || IS_ERR(src_file)) {
++              printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
++              err = PTR_ERR(src_file);
++
++              /* close target file */
++              fput(tgt_file);
++              goto out_err;
++      }
++
++      /* check if the filesystem(s) support read respective write */
++      if(!src_file->f_op->read || !tgt_file->f_op->write) {
++              printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
++              err = -EPERM;
++              goto out_close;
++      }
++
++      /* allocate a page for transfering the data */
++      buf = (void *) __get_free_page(GFP_KERNEL);
++      if(!buf) {
++              printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
++              goto out_err;
++      }
++
++      tgt_file->f_pos = 0;
++      src_file->f_pos = 0;
++
++      old_fs = get_fs();
++      set_fs(KERNEL_DS);
++
++      /* Doing this I assume that a read operation will return a full
++       * buffer while there is still data to read, and a less than
++       * full buffer when all data has been read.
++       */
++      bytes = len = PAGE_SIZE;
++      while(bytes == len) {
++              bytes = src_file->f_op->read(src_file, buf, len,
++                                           &src_file->f_pos);
++              tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
++                                          &tgt_file->f_pos);
++              if(tmp != bytes) {
++                      printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
++                      goto out_close_unset;
++              }
++      }
++
++      free_page((unsigned long) buf);
++      set_fs(old_fs);
++      fput(tgt_file);
++      fput(src_file);
++      goto out;
++
++ out_close_unset:
++      free_page((unsigned long) buf);
++      set_fs(old_fs);
++
++ out_close:
++      fput(tgt_file);
++      fput(src_file);
++
++ out_err:
++      dput(tgt_dentry);
++      dput(src_dentry);
++
++      /* mk: not sure if this need to be done */
++      mntput(tgt_mnt);
++      mntput(src_mnt);
++
++ out:
++      return err;
++}
++
++/* mk:
++ * ndl (no-duplicate list) stuff
++ * This is used in mini_fo_readdir, to save the storage directory contents
++ * and later when reading base, match them against the list in order
++ * to avoid duplicates.
++ */
++
++/* add a file specified by name and len to the ndl
++ * Return values: 0 on success, <0 on failure.
++ */
++int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
++{
++      struct ndl_entry *tmp_entry;
++
++      tmp_entry = (struct ndl_entry *)
++              kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
++      if(!tmp_entry) {
++                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
++                return -ENOMEM;
++        }
++        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
++        if(!tmp_entry->name) {
++                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
++                return -ENOMEM;
++        }
++      strncpy(tmp_entry->name, name, len);
++        tmp_entry->len = len;
++
++        list_add(&tmp_entry->list, &rd->ndl_list);
++        rd->ndl_size++;
++        return 0;
++}
++
++/* delete all list entries and free memory */
++void ndl_put_list(struct readdir_data *rd)
++{
++      struct list_head *tmp;
++      struct ndl_entry *tmp_entry;
++
++      if(rd->ndl_size <= 0)
++              return;
++      while(!list_empty(&rd->ndl_list)) {
++              tmp = rd->ndl_list.next;
++                list_del(tmp);
++                tmp_entry = list_entry(tmp, struct ndl_entry, list);
++              kfree(tmp_entry->name);
++                kfree(tmp_entry);
++        }
++      rd->ndl_size = 0;
++}
++
++/* Check if a file specified by name and len is in the ndl
++ * Return value: 0 if not in list, 1 if file is found in ndl.
++ */
++int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
++{
++      struct list_head *tmp;
++      struct ndl_entry *tmp_entry;
++
++      if(rd->ndl_size <= 0)
++              return 0;
++
++      list_for_each(tmp, &rd->ndl_list) {
++                tmp_entry = list_entry(tmp, struct ndl_entry, list);
++                if(tmp_entry->len != len)
++                        continue;
++                if(!strncmp(tmp_entry->name, name, len))
++                        return 1;
++        }
++        return 0;
++}
++
++/* mk:
++ * Recursive function to create corresponding directorys in the storage fs.
++ * The function will build the storage directorys up to dentry.
++ */
++int build_sto_structure(dentry_t *dir, dentry_t *dentry)
++{
++      int err;
++      dentry_t *hidden_sto_dentry;
++      dentry_t *hidden_sto_dir_dentry;
++
++      if(dentry->d_parent != dir) {
++              printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
++              return 1;
++      }
++
++              if(dtost(dir) != MODIFIED) {
++              err = build_sto_structure(dir->d_parent, dentry->d_parent);
++              if(err)
++                      return err;
++      }
++
++      /* ok, coming back again. */
++      check_mini_fo_dentry(dentry);
++      hidden_sto_dentry = dtohd2(dentry);
++
++      if(!hidden_sto_dentry) {
++              /*
++               * This is the case after creating the first
++               * hidden_sto_dentry.
++               * After one negative storage_dentry, all pointers to
++               * hidden_storage dentries are set to NULL. We need to
++               * create the negative dentry before we create the storage
++               * file.
++               */
++              unsigned int len;
++              const unsigned char *name;
++              len = dtohd(dentry)->d_name.len;
++              name = dtohd(dentry)->d_name.name;
++              hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
++              dtohd2(dentry) = hidden_sto_dentry;
++      }
++
++      /* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
++      hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++      /* lets be safe */
++      if(dtohd2(dir) != hidden_sto_dir_dentry) {
++              printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
++              return 1;
++      }
++
++      /* check for errors in lock_parent */
++      err = PTR_ERR(hidden_sto_dir_dentry);
++      if(IS_ERR(hidden_sto_dir_dentry)) {
++              printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
++              return err;
++      }
++
++      err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
++                      hidden_sto_dentry,
++                      dir->d_inode->i_mode);
++
++      if(err) {
++              printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
++              /* was: unlock_dir(dir); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&dir->d_inode->i_mutex);
++#else
++              up(&dir->d_inode->i_sem);
++#endif
++              dput(dir);
++              return err;
++      }
++
++      /* everything ok! */
++      if(!dtohd2(dentry)->d_inode) {
++              printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
++              /* was: unlock_dir(dir); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&dir->d_inode->i_mutex);
++#else
++              up(&dir->d_inode->i_sem);
++#endif
++              dput(dir);
++              return 1;
++      }
++
++      /* interpose the new inode and set new state */
++      itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
++      dtopd(dentry)->state = MODIFIED;
++
++      /* initalize the wol list */
++      itopd(dentry->d_inode)->deleted_list_size = -1;
++      itopd(dentry->d_inode)->renamed_list_size = -1;
++      meta_build_lists(dentry);
++
++      fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
++      fist_copy_attr_timesizes(dir->d_inode,
++                               hidden_sto_dir_dentry->d_inode);
++      dir->d_inode->i_nlink++;
++      /* was: unlock_dir(hidden_sto_dir_dentry); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++      dput(hidden_sto_dir_dentry);
++      return 0;
++}
++
++
++#if 0 /* unused */
++
++/*
++ * Read "len" bytes from "filename" into "buf".
++ * "buf" is in kernel space.
++ */
++int
++mini_fo_read_file(const char *filename, void *buf, int len)
++{
++    file_t *filp;
++    mm_segment_t oldfs;
++    int bytes;
++    /* Chroot? Maybe NULL isn't right here */
++    filp = filp_open(filename, O_RDONLY, 0);
++    if (!filp || IS_ERR(filp)) {
++      printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
++      return -1;  /* or do something else */
++    }
++
++    if (!filp->f_op->read)
++      return -2;  /* file(system) doesn't allow reads */
++
++    /* now read len bytes from offset 0 */
++    filp->f_pos = 0;          /* start offset */
++    oldfs = get_fs();
++    set_fs(KERNEL_DS);
++    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
++    set_fs(oldfs);
++
++    /* close the file */
++    fput(filp);
++
++    return bytes;
++}
++
++
++
++/*
++ * Write "len" bytes from "buf" to "filename"
++ * "buf" is in kernel space.
++ */
++int
++mini_fo_write_file(const char *filename, void *buf, int len)
++{
++    file_t *filp;
++    mm_segment_t oldfs;
++    int bytes;
++                              /* Chroot? Maybe NULL isn't right here */
++    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
++    if (!filp || IS_ERR(filp)) {
++      printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
++      return -1;  /* or do something else */
++    }
++
++    if (!filp->f_op->write)
++      return -2;  /* file(system) doesn't allow writes */
++
++    /* now write len bytes from offset 0 */
++    filp->f_pos = 0;          /* start offset */
++    oldfs = get_fs();
++    set_fs(KERNEL_DS);
++    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
++    set_fs(oldfs);
++
++    /* close the file */
++    fput(filp);
++
++    return bytes;
++}
++
++#endif /* unused */
++
+--- /dev/null
++++ b/fs/mini_fo/ChangeLog
+@@ -0,0 +1,281 @@
++2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
++
++      * Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
++          retain backwards compatibility.
++
++2006-01-24  Ed L. Cashin <ecashin@coraid.com>
++
++      * Support for the new mutex infrastructure
++      (7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
++
++2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
++
++      * Bugfix for a serious memory leak in mini_fo_follow_link.
++
++2005-09-21  Markus Klotzbuecher  <mk@mary>
++
++      * new release 0.6.1
++
++      * fix of a compiler warning due to changes in 2.6.13
++
++2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
++
++      * file.c: readdir: fix for a bug that caused directory entries
++          to show up twice when using storage filesystems such as
++          minixfs or pramfs.
++
++2005-06-30  Eric Lammerts <eric@lammerts.org>
++
++      * fix for an oops when overwriting a binary thats beeing
++          executed.
++
++2005-06-09    <mk@mary>
++
++      * Renamed overlay to mini_fo-overlay.
++
++      * Added mini_fo-merge script to allow merging of storage and base
++      after making modifications.
++
++2005-05-22  root  <mk@mary>
++
++      * Added overlay script that allows to easily mount mini_fo ontop
++      of a given base directory
++
++2005-05-10    <mk@mary>
++
++      * inode.c: xattr functions return -EOPNOSUPP instead of
++          -ENOSUPP, what confuses "ls -l"
++
++      * Changed license from LGPL to GPL.
++
++2005-05-08  root  <mk@mary>
++
++      * Makefile: clean it up and added make install and make
++          uninstall.
++
++2005-05-06    <mk@mary>
++
++      * merged devel branch back to main. [v0-6-0-pre3]
++
++      * removed unused files print.c and fist_ioctl. [devel-0-0-18]
++
++      * ioctl: removed fist_ioctl stuff, that is not needed for
++          now.
++
++2005-05-03    <mk@mary>
++
++      * file.c: simplified mini_fo_open and mini_fo_setattr using
++          new state changing functions. [devel-0-0-17]
++
++      * inode.c: Fixed getattr state bug (see below) in 2.4 function
++          mini_fo_inode revalidate.
++
++      * inode.c: found an other bug in mini_fo_getattr. States are not
++        reliable in this function, as a file can be opened, unlinked and
++        the getattr function called. This results in a deleted dentry
++        with an inode. Fix is to ignore states and simply use the inode
++        available.
++
++2005-04-29    <mk@mary>
++
++      * file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
++
++      * file.c: do not use mini_fo_lock so the generic version is
++          used (I guess).
++
++      * inode.c: getattr, never call getattr on lower files, as this
++          will cause the inum to change.
++
++      * inode.c: rename_reg_file renamed to rename_nondir, as it
++          doesn't matter as long it't not a dir. Removed all
++          rename_dev_file etc.
++
++      * tagged as devel-0-0-15
++
++      * inode.c: added support for chosing support for extended
++          attrs at compile time by XATTR define in mini_fo.h .
++
++      * inode.c: fixed mini_fo_getattr to use mini_fo inode and not
++          lower again, what avoids inode number changes that confused
++          rm again. This is the proper solution.
++
++2005-04-24    <mk@mary>
++
++      * all files: updated Copyright notive to 2005. [devel-0-0-14]
++
++      * inode.c: fixed mini_fo_getattr to not change the inode
++          number, even if lower files change.
++
++      * super.c: fixed a bug that caused deleted base file to show
++          up suddenly after some time, or after creating a special
++          file. The problem was that after some time or after special
++          file creating sync_sb_inodes is called by the vfs, that
++          called our mini_fo_put_inode. There was (wrongly) called
++          __meta_put_lists, that nuked the lists, although the inode
++          was going to continue its life. Moving __meta_put_lists to
++          mini_fo_clear_inode, where an inode is really destroyed,
++          solved the problem.
++
++
++2005-04-23    <mk@mary>
++
++      * state.c, aux.c: more cleaning up and
++          simplifications. [devel-0-0-13]
++
++      * inode.c: implemented mini_fo_getattr, that was required for
++          2.6 because inode_revalidate has been remove there, and the
++        old "du" bug returned.
++
++
++2005-04-20    <mk@mary>
++
++      * aux.c: get_neg_sto_dentry(): allow to be called for dentries
++          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
++
++2005-04-19    <mk@mary>
++
++      * Fixed a bug under 2.6 that caused files deleted via mini_fo
++          not to be deleted properly and therefore the fs filled up
++          untill no memory was left. [devel-0-0-12]
++
++      * Added basic hard link support. This means that creating
++          hardlinks will work, but existing ones will be treated as
++          individual files. [devel-0-0-11]
++
++2005-04-17    <mk@mary>
++
++      * Bugfixes
++
++2005-04-13  root  <mk@mary>
++
++      * Added file state.c for the state transition
++          functions. Doesn't work very well yet, though...
++
++2005-04-12    <mk@mary>
++
++      * Porting to 2.6 started, which is easier than expected, also
++          due to Olivier previous work.
++
++2005-04-08    <mk@mary>
++
++      * Fixed the bug that caused du to return invalid sizes of
++          directory trees. The problem was that
++          mini_fo_inode_revalidate didn't always copy the attributes
++          from the base inode properly.
++
++2005-04-01  Markus Klotzbuecher  <mk@chasey>
++
++      * Merged devel branch back to main trunk and updated the
++          RELEASE notes. This will be 0-6-0-pre1.
++
++2005-03-31  Markus Klotzbuecher  <mk@chasey>
++
++      * Fixed some bugs in rename_reg_file, that only showed up in
++          the kernel compile test. Kernel compiles cleanly ontop of
++          mini_fo, now also make mrproper etc. work. Seems pretty stable.
++
++2005-03-28  Markus Klotzbuecher  <mk@chasey>
++
++      * Many, many directory renaming bugfixes and a lot of other
++          cleanup. Dir renaming seems to work relatively stable.
++
++2005-03-22  Markus Klotzbuecher  <mk@chasey>
++
++      * Finished implementing lightweight directory renaming. Some
++          basic testing indicates it works fine.
++        Next is to implement testcases for the testsuite and confirm
++          everything is really working ok.
++
++2005-03-18  Markus Klotzbuecher  <mk@chasey>
++
++      * Finished implementing meta.c stuff required for directory
++          renaming.
++
++2005-03-17  Markus Klotzbuecher  <mk@chasey>
++
++      * Fixed all compile warnings + an extremly old bug that
++          somehow crept in while reworking the wol stuff to the META
++          system. Turning on -Werror again... :-)
++
++      * Fixed some bugs in the new rename_reg_file function.
++
++      * Rewrote mini_fo rename and split it into several
++          subfunctions, that handle the different types
++          seperately. Rewrote the regular file function aswell, as it
++          was implemented somewhat inefficient.
++
++2005-03-16  Markus Klotzbuecher  <mk@chasey>
++
++      * Implemented new META subsystem, removed old WOL stuff in favor
++        if it.
++
++      * After some basic testing everything seems ok...
++
++2005-03-11  Markus Klotzbuecher  <mk@chasey>
++
++      * Renaming a non regular file caused trouble because I always
++        tried to copy the contents. Now I only do this for regular
++        files. mini_fo_rename still isn't implemented properly, renaming
++        of device files, symlinks etc. results in a empty regular file
++        instead of the proper type.
++
++      * Directory renaming suddenly works! What a surprise! I guess
++          this is because renaming is implemented as making a copy and
++          removing the original. Still this might not work
++          everywhere...
++
++2005-03-09  Markus Klotzbuecher  <mk@chasey>
++
++      * Bugfix, when a mini_fo directory that exists in storage
++        (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
++        possibly existing WOL file contained in it needs to be
++        deleted too.
++
++      * Starting cleanup: defined state names in order to get rid of
++          the state numbers.
++
++2005-03-08  Markus Klotzbuecher  <mk@chasey>
++
++      * Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
++
++      * Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
++          DEL_REWRITTEN the hash was calculated from the base dentry,
++          which was wrong and and caused assertions in
++          __mini_fo_hidden_dentry to fail.
++
++2005-02-21    <mk@mary>
++
++      * Implemented directory deleting (inode.c)
++
++      * main.c: made mini_fo_parse_options a little more robust.
++
++2004-12-22    <mk@mary>
++
++      * Makefile cleanup and uml stuff, removed unneccessary files
++
++      * Created a new and hopefully more informative README
++
++      * CHANGELOG: created a new CHANGELOG and added old entries reversely
++
++
++2004-10-24 Gleb Natapov <gleb@nbase.co.il>
++
++      * Fix: owner and group where not correctly copied from base to
++          storage.
++
++
++2004-10-05 Gleb Natapov <gleb@nbase.co.il>
++
++      * Implementation of fsync, fasync and lock mini_fo functions.
++
++
++2004-09-29 Bob Lee <bob@pantasys.com>
++
++      * Fix of a serious pointer bug
++
++
++2004-09-28 Gleb Natapov <gleb@nbase.co.il>
++
++      * Implementation of mini_fo_mknod and mini_fo_rename, support
++          for device files.
++
+--- /dev/null
++++ b/fs/mini_fo/dentry.c
+@@ -0,0 +1,244 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++/*
++ *  $Id$
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "fist.h"
++#include "mini_fo.h"
++
++/*
++ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
++ */
++STATIC int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
++#else
++mini_fo_d_revalidate(dentry_t *dentry, int flags)
++#endif
++{
++      int err1 = 1; /* valid = 1, invalid = 0 */
++      int err2 = 1;
++      dentry_t *hidden_dentry;
++      dentry_t *hidden_sto_dentry;
++
++
++      check_mini_fo_dentry(dentry);
++
++      hidden_dentry  = dtohd(dentry);
++      hidden_sto_dentry = dtohd2(dentry);
++
++      if(hidden_dentry &&
++         hidden_dentry->d_op &&
++         hidden_dentry->d_op->d_revalidate) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++              err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
++#else
++              err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
++#endif
++      }
++      if(hidden_sto_dentry &&
++         hidden_sto_dentry->d_op &&
++         hidden_sto_dentry->d_op->d_revalidate) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++              err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
++                                                           nd);
++#else
++              err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
++                                                           flags);
++#endif
++      }
++
++      /* mk: if one of the lower level dentries are valid,
++       * the mini_fo dentry is too.
++       */
++      return (err1 || err2);
++}
++
++
++STATIC int
++mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
++{
++      int err = 0;
++      dentry_t *hidden_dentry;
++      dentry_t *hidden_sto_dentry;
++
++      /* hidden_dentry = mini_fo_hidden_dentry(dentry);
++       * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
++
++      /* state 1, 3, 4, 5: build the hash for the storage dentry */
++      if((dtopd(dentry)->state == MODIFIED) ||
++         (dtopd(dentry)->state == CREATED) ||
++         (dtopd(dentry)->state == DEL_REWRITTEN) ||
++         (dtopd(dentry)->state == DELETED)) {
++              hidden_sto_dentry = dtohd2(dentry);
++              if(hidden_sto_dentry &&
++                 hidden_sto_dentry->d_op &&
++                 hidden_sto_dentry->d_op->d_hash) {
++                      err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
++              }
++              goto out;
++      }
++      /* state 2: build the hash for the base dentry */
++      if(dtopd(dentry)->state == UNMODIFIED) {
++              hidden_dentry = dtohd(dentry);
++              if(hidden_dentry &&
++                 hidden_dentry->d_op &&
++                 hidden_dentry->d_op->d_hash) {
++                      err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
++              }
++              goto out;
++      }
++      /* state 6: build hash for the dentry that exists */
++      if(dtopd(dentry)->state == NON_EXISTANT) {
++              hidden_sto_dentry = dtohd2(dentry);
++              if(hidden_sto_dentry &&
++                 hidden_sto_dentry->d_op &&
++                 hidden_sto_dentry->d_op->d_hash) {
++                      err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
++                      goto out;
++              }
++              hidden_dentry = dtohd(dentry);
++              if(hidden_dentry &&
++                 hidden_dentry->d_op &&
++                 hidden_dentry->d_op->d_hash) {
++                      err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
++                      goto out;
++              }
++      }
++
++      printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
++
++ out:
++      return err;
++}
++
++
++STATIC int
++mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
++{
++      int err;
++      dentry_t *hidden_dentry=NULL;
++
++      /* hidden_dentry = mini_fo_hidden_dentry(dentry); */
++      if(dtohd2(dentry))
++              hidden_dentry = dtohd2(dentry);
++      else if(dtohd(dentry))
++              hidden_dentry = dtohd(dentry);
++
++      if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
++              err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
++      } else {
++              err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
++      }
++
++      return err;
++}
++
++
++int
++mini_fo_d_delete(dentry_t *dentry)
++{
++      dentry_t *hidden_dentry;
++      dentry_t *hidden_sto_dentry;
++      int err = 0;
++
++      /* this could be a negative dentry, so check first */
++      if (!dtopd(dentry)) {
++              printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
++              goto out;
++      }
++      hidden_dentry = dtohd(dentry);
++      hidden_sto_dentry = dtohd2(dentry);
++
++      if(hidden_dentry) {
++              if(hidden_dentry->d_op &&
++                 hidden_dentry->d_op->d_delete) {
++                      err = hidden_dentry->d_op->d_delete(hidden_dentry);
++              }
++      }
++      if(hidden_sto_dentry) {
++              if(hidden_sto_dentry->d_op &&
++                 hidden_sto_dentry->d_op->d_delete) {
++                      err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
++              }
++      }
++
++ out:
++      return err;
++}
++
++
++void
++mini_fo_d_release(dentry_t *dentry)
++{
++      dentry_t *hidden_dentry;
++      dentry_t *hidden_sto_dentry;
++
++
++      /* this could be a negative dentry, so check first */
++      if (!dtopd(dentry)) {
++              printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
++              goto out;
++      }
++      hidden_dentry = dtohd(dentry);
++      hidden_sto_dentry = dtohd2(dentry);
++
++      if(hidden_dentry) {
++              /* decrement hidden dentry's counter and free its inode */
++              dput(hidden_dentry);
++      }
++      if(hidden_sto_dentry) {
++                /* decrement hidden dentry's counter and free its inode */
++              dput(hidden_sto_dentry);
++      }
++
++      /* free private data (mini_fo_dentry_info) here */
++      kfree(dtopd(dentry));
++      __dtopd(dentry) = NULL; /* just to be safe */
++ out:
++      return;
++}
++
++
++/*
++ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
++ * mini_fo_d_iput is not defined. We left this implemented for ease of
++ * tracing/debugging.
++ */
++void
++mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
++{
++      iput(inode);
++}
++
++
++struct dentry_operations mini_fo_dops = {
++      d_revalidate:   mini_fo_d_revalidate,
++      d_hash:         mini_fo_d_hash,
++      d_compare:              mini_fo_d_compare,
++      d_release:              mini_fo_d_release,
++      d_delete:               mini_fo_d_delete,
++      d_iput:         mini_fo_d_iput,
++};
+--- /dev/null
++++ b/fs/mini_fo/file.c
+@@ -0,0 +1,713 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++/*
++ *  $Id$
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "fist.h"
++#include "mini_fo.h"
++#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
++
++/*******************
++ * File Operations *
++ *******************/
++
++STATIC loff_t
++mini_fo_llseek(file_t *file, loff_t offset, int origin)
++{
++      loff_t err;
++      file_t *hidden_file = NULL;
++
++      if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
++              /* Check if trying to llseek from a directory */
++              err = -EISDIR;
++              goto out;
++      }
++      if (ftopd(file) != NULL) {
++              if(ftohf2(file)) {
++                      hidden_file = ftohf2(file);
++              } else {
++                      hidden_file = ftohf(file);
++              }
++      }
++
++      /* always set hidden position to this one */
++      hidden_file->f_pos = file->f_pos;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++      memcpy(&(hidden_file->f_ra),
++             &(file->f_ra),
++             sizeof(struct file_ra_state));
++#else
++      if (file->f_reada) { /* update readahead information if needed */
++              hidden_file->f_reada = file->f_reada;
++              hidden_file->f_ramax = file->f_ramax;
++              hidden_file->f_raend = file->f_raend;
++              hidden_file->f_ralen = file->f_ralen;
++              hidden_file->f_rawin = file->f_rawin;
++      }
++#endif
++      if (hidden_file->f_op && hidden_file->f_op->llseek)
++              err = hidden_file->f_op->llseek(hidden_file, offset, origin);
++      else
++              err = generic_file_llseek(hidden_file, offset, origin);
++
++      if (err < 0)
++              goto out;
++
++      if (err != file->f_pos) {
++              file->f_pos = err;
++              // ION maybe this?
++              //      file->f_pos = hidden_file->f_pos;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++              file->f_reada = 0;
++#endif
++              file->f_version++;
++      }
++
++ out:
++      return err;
++}
++
++
++/* mk: fanout capable */
++STATIC ssize_t
++mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
++{
++      int err = -EINVAL;
++      file_t *hidden_file = NULL;
++      loff_t pos = *ppos;
++
++      if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
++              /* Check if trying to read from a directory */
++              /* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
++              err = -EISDIR;
++              goto out;
++      }
++
++      if (ftopd(file) != NULL) {
++              if(ftohf2(file)) {
++                      hidden_file = ftohf2(file);
++              } else {
++                      hidden_file = ftohf(file);
++              }
++      }
++
++      if (!hidden_file->f_op || !hidden_file->f_op->read)
++              goto out;
++
++      err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
++      *ppos = pos;
++
++      if (err >= 0) {
++              /* atime should also be updated for reads of size zero or more */
++              fist_copy_attr_atime(file->f_dentry->d_inode,
++                                   hidden_file->f_dentry->d_inode);
++      }
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++      /*
++       * MAJOR HACK
++       * because pread() does not have any way to tell us that it is
++       * our caller, then we don't know for sure if we have to update
++       * the file positions.  This hack relies on read() having passed us
++       * the "real" pointer of its struct file's f_pos field.
++       */
++      if (ppos == &file->f_pos)
++              hidden_file->f_pos = *ppos = pos;
++      if (hidden_file->f_reada) { /* update readahead information if needed */
++              file->f_reada = hidden_file->f_reada;
++              file->f_ramax = hidden_file->f_ramax;
++              file->f_raend = hidden_file->f_raend;
++              file->f_ralen = hidden_file->f_ralen;
++              file->f_rawin = hidden_file->f_rawin;
++      }
++#else
++      memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
++#endif
++
++ out:
++      return err;
++}
++
++
++/* this mini_fo_write() does not modify data pages! */
++STATIC ssize_t
++mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
++{
++      int err = -EINVAL;
++      file_t *hidden_file = NULL;
++      inode_t *inode;
++      inode_t *hidden_inode;
++      loff_t pos = *ppos;
++
++      /* mk: fan out: */
++      if (ftopd(file) != NULL) {
++              if(ftohf2(file)) {
++                      hidden_file = ftohf2(file);
++              } else {
++                      /* This is bad! We have no storage file to write to. This
++                       * should never happen because if a file is opened for
++                       * writing, a copy should have been made earlier.
++                       */
++                      printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
++                      err = -EINVAL;
++                      goto out;
++              }
++      }
++
++      inode = file->f_dentry->d_inode;
++      hidden_inode = itohi2(inode);
++      if(!hidden_inode) {
++              printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
++              goto out;
++      }
++
++      if (!hidden_file->f_op || !hidden_file->f_op->write)
++              goto out;
++
++      /* adjust for append -- seek to the end of the file */
++      if (file->f_flags & O_APPEND)
++              pos = inode->i_size;
++
++      err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
++
++      /*
++       * copy ctime and mtime from lower layer attributes
++       * atime is unchanged for both layers
++       */
++      if (err >= 0)
++              fist_copy_attr_times(inode, hidden_inode);
++
++      *ppos = pos;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++      /*
++       * XXX: MAJOR HACK
++       *
++       * because pwrite() does not have any way to tell us that it is
++       * our caller, then we don't know for sure if we have to update
++       * the file positions.  This hack relies on write() having passed us
++       * the "real" pointer of its struct file's f_pos field.
++       */
++      if (ppos == &file->f_pos)
++              hidden_file->f_pos = *ppos = pos;
++#endif
++      /* update this inode's size */
++      if (pos > inode->i_size)
++              inode->i_size = pos;
++
++ out:
++      return err;
++}
++
++/* Global variable to hold a file_t pointer.
++ * This serves to allow mini_fo_filldir function to know which file is
++ * beeing read, which is required for two reasons:
++ *
++ *   - be able to call wol functions in order to avoid listing deleted
++ *     base files.
++ *   - if we're reading a directory which is in state 1, we need to
++ *     maintain a list (in mini_fo_filldir) of which files allready
++ *     have been copied to userspace,to detect files existing in base
++ *     and storage and not list them twice.
++ */
++filldir_t mini_fo_filldir_orig;
++file_t *mini_fo_filldir_file;
++
++/* mainly copied from fs/readdir.c */
++STATIC int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
++                u64 ino, unsigned int d_type)
++#else
++mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
++                ino_t ino, unsigned int d_type)
++#endif
++{
++      struct getdents_callback * buf = (struct getdents_callback *) __buf;
++      file_t* file = mini_fo_filldir_file;
++
++      /* In theses states we filter meta files in storage (WOL) */
++      if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
++                  dtopd(file->f_dentry)->state == CREATED ||
++                  dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
++
++              int tmp = strlen(META_FILENAME);
++              if(tmp  == namlen) {
++                      if(!strncmp(name, META_FILENAME, namlen))
++                              return 0;
++              }
++      }
++
++      /* check if we are merging the contents of storage and base */
++      if(file && dtopd(file->f_dentry)->state == MODIFIED) {
++              /* check if we are still reading storage contents, if
++               * yes, we just save the name of the file for duplicate
++               * checking later. */
++
++              if(!ftopd(file)->rd.sto_done) {
++                      /* put file into ndl list */
++                      if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
++                              printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
++              } else {
++                      /* check if file has been deleted */
++                      if(meta_check_d_entry(file->f_dentry, name, namlen))
++                              return 0;
++
++                      /* do duplicate checking */
++                      if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
++                              return 0;
++              }
++      }
++
++      return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
++}
++
++
++STATIC int
++mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
++{
++      int err = 0;/* mk: ??? -ENOTDIR; */
++      file_t *hidden_file = NULL;
++      file_t *hidden_sto_file = NULL;
++      inode_t *inode;
++      struct getdents_callback *buf;
++      int oldcount;
++
++#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
++      struct mini_fo_getdents_callback buf;
++#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
++
++      buf = (struct getdents_callback *) dirent;
++      oldcount = buf->count;
++      inode = file->f_dentry->d_inode;
++      mini_fo_filldir_file = file;
++      mini_fo_filldir_orig = filldir;
++
++      ftopd(file)->rd.sto_done = 0;
++      do {
++              if (ftopd(file) != NULL) {
++                      if(ftohf2(file)) {
++                              hidden_sto_file = ftohf2(file);
++                              err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
++                              file->f_pos = hidden_sto_file->f_pos;
++                              if (err > 0)
++                                      fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
++                              /* not finshed yet, we'll be called again */
++                              if (buf->count != oldcount)
++                                      break;
++                      }
++
++                      ftopd(file)->rd.sto_done = 1;
++
++                      if(ftohf(file)) {
++                              hidden_file = ftohf(file);
++                              err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
++                              file->f_pos = hidden_file->f_pos;
++                              if (err > 0)
++                                      fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
++                      }
++
++              }
++      } while (0);
++
++      /* mk:
++       * we need to check if all the directory data has been copied to userspace,
++       * or if we will be called again by userspace to complete the operation.
++       */
++      if(buf->count == oldcount) {
++              ndl_put_list(&ftopd(file)->rd);
++      }
++
++      /* unset this, safe */
++      mini_fo_filldir_file = NULL;
++      return err;
++}
++
++
++STATIC unsigned int
++mini_fo_poll(file_t *file, poll_table *wait)
++{
++      unsigned int mask = DEFAULT_POLLMASK;
++      file_t *hidden_file = NULL;
++
++      if (ftopd(file) != NULL) {
++              if(ftohf2(file)) {
++                      hidden_file = ftohf2(file);
++              } else {
++                      hidden_file = ftohf(file);
++              }
++      }
++
++      if (!hidden_file->f_op || !hidden_file->f_op->poll)
++              goto out;
++
++      mask = hidden_file->f_op->poll(hidden_file, wait);
++
++ out:
++      return mask;
++}
++
++/* FIST-LITE special version of mmap */
++STATIC int
++mini_fo_mmap(file_t *file, vm_area_t *vma)
++{
++      int err = 0;
++      file_t *hidden_file = NULL;
++
++      /* fanout capability */
++      if (ftopd(file) != NULL) {
++              if(ftohf2(file)) {
++                      hidden_file = ftohf2(file);
++              } else {
++                      hidden_file = ftohf(file);
++              }
++      }
++
++      ASSERT(hidden_file != NULL);
++      ASSERT(hidden_file->f_op != NULL);
++      ASSERT(hidden_file->f_op->mmap != NULL);
++
++      vma->vm_file = hidden_file;
++      err = hidden_file->f_op->mmap(hidden_file, vma);
++      get_file(hidden_file); /* make sure it doesn't get freed on us */
++      fput(file);            /* no need to keep extra ref on ours */
++
++      return err;
++}
++
++
++
++STATIC int
++mini_fo_open(inode_t *inode, file_t *file)
++{
++      int err = 0;
++      int hidden_flags;
++      file_t *hidden_file = NULL;
++      dentry_t *hidden_dentry = NULL;
++
++      /* fanout stuff */
++      file_t *hidden_sto_file = NULL;
++      dentry_t *hidden_sto_dentry = NULL;
++
++      __ftopd(file) =
++              kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
++      if (!ftopd(file)) {
++              err = -ENOMEM;
++              goto out;
++      }
++
++      /* init the readdir_helper structure */
++      INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
++      ftopd(file)->rd.ndl_size = 0;
++
++      /* In certain paths this could stay uninitalized and cause trouble */
++      ftohf(file) = NULL;
++      ftohf2(file) = NULL;
++      hidden_flags = file->f_flags;
++
++      /* create storage files? */
++      if(dtost(file->f_dentry) == UNMODIFIED) {
++              if(!IS_WRITE_FLAG(file->f_flags)) {
++                      hidden_dentry = dtohd(file->f_dentry);
++                      dget(hidden_dentry);
++                      /* dentry_open will decrement mnt refcnt if err.
++                       * otherwise fput() will do an mntput() for us upon file close. */
++                      mntget(stopd(inode->i_sb)->hidden_mnt);
++                      hidden_file = dentry_open(hidden_dentry,
++                                                stopd(inode->i_sb)->hidden_mnt,
++                                                hidden_flags);
++                      if (IS_ERR(hidden_file)) {
++                              err = PTR_ERR(hidden_file);
++                              dput(hidden_dentry);
++                              goto out;
++                      }
++                      ftohf(file) = hidden_file;      /* link two files */
++                      goto out;
++              }
++              else {
++                      if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
++                              err = dir_unmod_to_mod(file->f_dentry);
++                      } else
++                              err = nondir_unmod_to_mod(file->f_dentry, 1);
++
++                      if (err) {
++                              printk("mini_fo_open: ERROR creating storage file.\n");
++                              goto out;
++                      }
++              }
++      }
++      hidden_sto_dentry = dtohd2(file->f_dentry);
++      dget(hidden_sto_dentry);
++
++      if(dtopd(file->f_dentry)->state == MODIFIED) {
++              /* Directorys are special, interpose on both lower level files */
++              if(S_ISDIR(itohi(inode)->i_mode)) {
++                      /* check for invalid file types of lower level files */
++                      if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
++                              printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
++                              dput(hidden_sto_dentry);
++                              err = -EINVAL;
++                              goto out;
++                      }
++
++                      /* lower level directorys are ok, open the base file */
++                      hidden_dentry = dtohd(file->f_dentry);
++                      dget(hidden_dentry);
++
++                      mntget(stopd(inode->i_sb)->hidden_mnt);
++                      hidden_file = dentry_open(hidden_dentry,
++                                                stopd(inode->i_sb)->hidden_mnt,
++                                                hidden_flags);
++                      if (IS_ERR(hidden_file)) {
++                              err = PTR_ERR(hidden_file);
++                              dput(hidden_dentry);
++                              dput(hidden_sto_dentry);
++                              goto out;
++                      }
++                      ftohf(file) = hidden_file; /* link the two files */
++              }
++      }
++
++      if(!exists_in_storage(file->f_dentry)) {
++              printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
++              err = -EINVAL;
++              dput(hidden_sto_dentry);
++
++              /* If the base file has been opened, we need to close it here */
++              if(ftohf(file)) {
++                      if (hidden_file->f_op && hidden_file->f_op->flush)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++                              hidden_file->f_op->flush(hidden_file, NULL);
++#else
++                              hidden_file->f_op->flush(hidden_file);
++#endif
++                      dput(hidden_dentry);
++              }
++              goto out;
++      }
++
++      /* ok, now we can safely open the storage file */
++      mntget(stopd(inode->i_sb)->hidden_mnt2);
++      hidden_sto_file = dentry_open(hidden_sto_dentry,
++                                    stopd(inode->i_sb)->hidden_mnt2,
++                                    hidden_flags);
++
++      /* dentry_open dputs the dentry if it fails */
++      if (IS_ERR(hidden_sto_file)) {
++              err = PTR_ERR(hidden_sto_file);
++              /* close base file if open */
++              if(ftohf(file)) {
++                      if (hidden_file->f_op && hidden_file->f_op->flush)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++                              hidden_file->f_op->flush(hidden_file, NULL);
++#else
++                              hidden_file->f_op->flush(hidden_file);
++#endif
++                      dput(hidden_dentry);
++              }
++              goto out;
++      }
++      ftohf2(file) = hidden_sto_file; /* link storage file */
++
++ out:
++      if (err < 0 && ftopd(file)) {
++              kfree(ftopd(file));
++      }
++      return err;
++}
++
++STATIC int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++mini_fo_flush(file_t *file, fl_owner_t id)
++#else
++mini_fo_flush(file_t *file)
++#endif
++{
++      int err1 = 0;           /* assume ok (see open.c:close_fp) */
++      int err2 = 0;
++      file_t *hidden_file = NULL;
++
++      check_mini_fo_file(file);
++
++      /* mk: we don't do any state checking here, as its not worth the time.
++       * Just flush the lower level files if they exist.
++       */
++      if(ftopd(file) != NULL) {
++              if(ftohf(file) != NULL) {
++                      hidden_file = ftohf(file);
++                      if (hidden_file->f_op && hidden_file->f_op->flush)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++                              err1 = hidden_file->f_op->flush(hidden_file, id);
++#else
++                              err1 = hidden_file->f_op->flush(hidden_file);
++#endif
++              }
++              if(ftohf2(file) != NULL) {
++                      hidden_file = ftohf2(file);
++                      if (hidden_file->f_op && hidden_file->f_op->flush)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++                              err2 = hidden_file->f_op->flush(hidden_file, id);
++#else
++                              err2 = hidden_file->f_op->flush(hidden_file);
++#endif
++              }
++      }
++      return (err1 | err2);
++}
++
++
++STATIC int
++mini_fo_release(inode_t *inode, file_t *file)
++{
++      int err = 0;
++      file_t *hidden_file = NULL;
++
++      if (ftopd(file) != NULL) {
++              if(ftohf(file)) {
++                      hidden_file = ftohf(file);
++                      fput(hidden_file);
++              }
++              if(ftohf2(file)) {
++                      hidden_file = ftohf2(file);
++                      fput(hidden_file);
++              }
++              kfree(ftopd(file));
++      }
++      return err;
++}
++
++STATIC int
++mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
++{
++      int err1 = 0;
++      int err2 = 0;
++      file_t *hidden_file = NULL;
++      dentry_t *hidden_dentry;
++
++      check_mini_fo_file(file);
++
++      if ((hidden_file = ftohf(file)) != NULL) {
++              hidden_dentry = dtohd(dentry);
++              if (hidden_file->f_op && hidden_file->f_op->fsync) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++                      mutex_lock(&hidden_dentry->d_inode->i_mutex);
++#else
++                      down(&hidden_dentry->d_inode->i_sem);
++#endif
++                      err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++                      mutex_unlock(&hidden_dentry->d_inode->i_mutex);
++#else
++                      up(&hidden_dentry->d_inode->i_sem);
++#endif
++              }
++      }
++
++      if ((hidden_file = ftohf2(file)) != NULL) {
++              hidden_dentry = dtohd2(dentry);
++              if (hidden_file->f_op && hidden_file->f_op->fsync) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++                      mutex_lock(&hidden_dentry->d_inode->i_mutex);
++#else
++                      down(&hidden_dentry->d_inode->i_sem);
++#endif
++                      err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++                      mutex_unlock(&hidden_dentry->d_inode->i_mutex);
++#else
++                      up(&hidden_dentry->d_inode->i_sem);
++#endif
++              }
++      }
++      else
++              goto err;
++
++err:
++      return (err1 || err2);
++}
++
++
++STATIC int
++mini_fo_fasync(int fd, file_t *file, int flag)
++{
++      int err1 = 0;
++      int err2 = 0;
++
++      file_t *hidden_file = NULL;
++
++      check_mini_fo_file(file);
++
++      if((hidden_file = ftohf(file)) != NULL) {
++              err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
++      }
++      if((hidden_file = ftohf2(file)) != NULL) {
++              err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
++      }
++
++      return (err1 || err2);
++}
++
++
++
++struct file_operations mini_fo_dir_fops =
++      {
++              read:   generic_read_dir,
++              write:  mini_fo_write,
++              readdir: mini_fo_readdir,
++              poll:   mini_fo_poll,
++              /* ioctl:       mini_fo_ioctl, */
++              mmap:   mini_fo_mmap,
++              open:   mini_fo_open,
++              flush:  mini_fo_flush,
++              release: mini_fo_release,
++              fsync:  mini_fo_fsync,
++              fasync: mini_fo_fasync,
++              /* not needed lock:     mini_fo_lock, */
++              /* not needed: readv */
++              /* not needed: writev */
++              /* not implemented: sendpage */
++              /* not implemented: get_unmapped_area */
++      };
++
++struct file_operations mini_fo_main_fops =
++      {
++              llseek: mini_fo_llseek,
++              read:   mini_fo_read,
++              write:  mini_fo_write,
++              readdir: mini_fo_readdir,
++              poll:   mini_fo_poll,
++              /* ioctl:       mini_fo_ioctl, */
++              mmap:   mini_fo_mmap,
++              open:   mini_fo_open,
++              flush:  mini_fo_flush,
++              release: mini_fo_release,
++              fsync:  mini_fo_fsync,
++              fasync: mini_fo_fasync,
++              /* not needed: lock:    mini_fo_lock, */
++              /* not needed: readv */
++              /* not needed: writev */
++              /* not implemented: sendpage */
++              /* not implemented: get_unmapped_area */
++      };
+--- /dev/null
++++ b/fs/mini_fo/fist.h
+@@ -0,0 +1,254 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++
++/*
++ *  $Id$
++ */
++
++#ifndef __FIST_H_
++#define __FIST_H_
++
++/*
++ * KERNEL ONLY CODE:
++ */
++#ifdef __KERNEL__
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
++#include <linux/autoconf.h>
++#else
++#include <linux/config.h>
++#endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++#ifdef CONFIG_MODVERSIONS
++# define MODVERSIONS
++# include <linux/modversions.h>
++#endif /* CONFIG_MODVERSIONS */
++#endif /* KERNEL_VERSION < 2.6.0 */
++#include <linux/sched.h>
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/string.h>
++#include <linux/stat.h>
++#include <linux/errno.h>
++#include <linux/wait.h>
++#include <linux/limits.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++#include <linux/locks.h>
++#else
++#include <linux/buffer_head.h>
++#include <linux/pagemap.h>
++#include <linux/namei.h>
++#include <linux/module.h>
++#include <linux/mount.h>
++#include <linux/page-flags.h>
++#include <linux/writeback.h>
++#include <linux/statfs.h>
++#endif
++#include <linux/smp.h>
++#include <linux/smp_lock.h>
++#include <linux/file.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/poll.h>
++#include <linux/list.h>
++#include <linux/init.h>
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
++#include <linux/xattr.h>
++#endif
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#include <linux/security.h>
++#endif
++
++#include <linux/swap.h>
++
++#include <asm/system.h>
++/* #include <asm/segment.h> */
++#include <asm/mman.h>
++#include <linux/seq_file.h>
++
++/*
++ * MACROS:
++ */
++
++/* those mapped to ATTR_* were copied from linux/fs.h */
++#define FA_MODE               ATTR_MODE
++#define FA_UID                ATTR_UID
++#define FA_GID                ATTR_GID
++#define FA_SIZE               ATTR_SIZE
++#define FA_ATIME      ATTR_ATIME
++#define FA_MTIME      ATTR_MTIME
++#define FA_CTIME      ATTR_CTIME
++#define FA_ATIME_SET  ATTR_ATIME_SET
++#define FA_MTIME_SET  ATTR_MTIME_SET
++#define FA_FORCE      ATTR_FORCE
++#define FA_ATTR_FLAGS ATTR_ATTR_FLAG
++
++/* must be greater than all other ATTR_* flags! */
++#define FA_NLINK      2048
++#define FA_BLKSIZE    4096
++#define FA_BLOCKS     8192
++#define FA_TIMES      (FA_ATIME|FA_MTIME|FA_CTIME)
++#define FA_ALL                0
++
++/* macros to manage changes between kernels */
++#define INODE_DATA(i) (&(i)->i_data)
++
++#define MIN(x,y) ((x < y) ? (x) : (y))
++#define MAX(x,y) ((x > y) ? (x) : (y))
++#define MAXPATHLEN PATH_MAX
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
++# define lookup_one_len(a,b,c) lookup_one(a,b)
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
++# define generic_file_llseek default_llseek
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
++
++#ifndef SEEK_SET
++# define SEEK_SET 0
++#endif /* not SEEK_SET */
++
++#ifndef SEEK_CUR
++# define SEEK_CUR 1
++#endif /* not SEEK_CUR */
++
++#ifndef SEEK_END
++# define SEEK_END 2
++#endif /* not SEEK_END */
++
++#ifndef DEFAULT_POLLMASK
++# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
++#endif /* not DEFAULT_POLLMASK */
++
++/* XXX: fix this so fistgen generates kfree() code directly */
++#define kfree_s(a,b) kfree(a)
++
++/*
++ * TYPEDEFS:
++ */
++typedef struct dentry dentry_t;
++typedef struct file file_t;
++typedef struct inode inode_t;
++typedef inode_t vnode_t;
++typedef struct page page_t;
++typedef struct qstr qstr_t;
++typedef struct super_block super_block_t;
++typedef super_block_t vfs_t;
++typedef struct vm_area_struct vm_area_t;
++
++
++/*
++ * EXTERNALS:
++ */
++
++#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
++              str, \
++              (int) page, \
++              (int) page->index, \
++              (PageLocked(page) ? 1 : 0), \
++              (PageError(page) ? 1 : 0), \
++              (PageReferenced(page) ? 1 : 0), \
++              (Page_Uptodate(page) ? 1 : 0), \
++              (PageDecrAfter(page) ? 1 : 0), \
++              (PageSlab(page) ? 1 : 0), \
++              (PageSwapCache(page) ? 1 : 0), \
++              (PageReserved(page) ? 1 : 0) \
++              )
++#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
++#if 0
++# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
++#else
++# define EZKDBG1
++#endif
++
++extern int fist_get_debug_value(void);
++extern int fist_set_debug_value(int val);
++#if 0 /* mini_fo doesn't need these */
++extern void fist_dprint_internal(int level, char *str,...);
++extern void fist_print_dentry(char *str, const dentry_t *dentry);
++extern void fist_print_inode(char *str, const inode_t *inode);
++extern void fist_print_file(char *str, const file_t *file);
++extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
++extern void fist_print_page_flags(char *str, page_t *page);
++extern void fist_print_page_bytes(char *str, page_t *page);
++extern void fist_print_pte_flags(char *str, const page_t *page);
++extern void fist_checkinode(inode_t *inode, char *msg);
++extern void fist_print_sb(char *str, const super_block_t *sb);
++
++/* §$% by mk: special debug functions */
++extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
++extern void fist_mk_print_inode(char *str, const inode_t *inode);
++
++extern char *add_indent(void);
++extern char *del_indent(void);
++#endif/* mini_fo doesn't need these */
++
++
++#define STATIC
++#define ASSERT(EX)    \
++do {  \
++    if (!(EX)) {      \
++      printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,   \
++             __FILE__, __LINE__, __FUNCTION__);       \
++      (*((char *)0))=0;       \
++    } \
++} while (0)
++/* same ASSERT, but tell me who was the caller of the function */
++#define ASSERT2(EX)   \
++do {  \
++    if (!(EX)) {      \
++      printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,  \
++             file, line, func);       \
++      (*((char *)0))=0;       \
++    } \
++} while (0)
++
++#if 0 /* mini_fo doesn't need these */
++#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
++#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
++#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
++#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
++#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
++#define print_exit_pointer(status) \
++do { \
++  if (IS_ERR(status)) \
++    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
++  else \
++    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
++} while (0)
++#endif/* mini_fo doesn't need these */
++
++#endif /* __KERNEL__ */
++
++
++/*
++ * DEFINITIONS FOR USER AND KERNEL CODE:
++ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
++ *  are auto-generated automatically based on the user's .fist file.)
++ */
++# define FIST_IOCTL_GET_DEBUG_VALUE   _IOR(0x15, 1, int)
++# define FIST_IOCTL_SET_DEBUG_VALUE   _IOW(0x15, 2, int)
++
++#endif /* not __FIST_H_ */
+--- /dev/null
++++ b/fs/mini_fo/inode.c
+@@ -0,0 +1,1564 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++/*
++ *  $Id$
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "fist.h"
++#include "mini_fo.h"
++
++STATIC int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
++#else
++mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
++#endif
++{
++      int err = 0;
++
++      check_mini_fo_dentry(dentry);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++      err = create_sto_reg_file(dentry, mode, nd);
++#else
++      err = create_sto_reg_file(dentry, mode);
++#endif
++      check_mini_fo_dentry(dentry);
++      return err;
++}
++
++
++STATIC dentry_t *
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
++#else
++mini_fo_lookup(inode_t *dir, dentry_t *dentry)
++#endif
++{
++      int err = 0;
++      dentry_t *hidden_dir_dentry;
++      dentry_t *hidden_dentry = NULL;
++
++      dentry_t *hidden_sto_dir_dentry;
++      dentry_t *hidden_sto_dentry = NULL;
++
++      /* whiteout flag */
++      int del_flag = 0;
++      char *bpath = NULL;
++
++      const char *name;
++      unsigned int namelen;
++
++      /* Don't allow lookups of META-files */
++      namelen = strlen(META_FILENAME);
++      if(namelen == dentry->d_name.len) {
++              if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
++                      err = -ENOENT;
++                      goto out;
++              }
++      }
++
++      hidden_dir_dentry = dtohd(dentry->d_parent);
++      hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
++
++      name = dentry->d_name.name;
++      namelen = dentry->d_name.len;
++
++      /* must initialize dentry operations */
++      dentry->d_op = &mini_fo_dops;
++
++      /* setup the del_flag */
++      del_flag = __meta_check_d_entry(dir, name, namelen);
++      bpath = __meta_check_r_entry(dir, name, namelen);
++
++      /* perform the lookups of base and storage files:
++       *
++       * This caused some serious trouble, as a lookup_one_len passing
++       * a negative dentry oopses. Solution is to only do the lookup
++       * if the dentry is positive, else we set it to NULL
++       * More trouble, who said a *_dir_dentry can't be NULL?
++       */
++      if(bpath) {
++              /* Cross-Interposing (C), yeah! */
++              hidden_dentry = bpath_walk(dir->i_sb, bpath);
++              if(!hidden_dentry || !hidden_dentry->d_inode) {
++                      printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
++                      err= -EINVAL;
++                      goto out;
++              }
++
++              /* this can be set up safely without fear of spaghetti
++               * interposing as it is only used for copying times */
++              hidden_dir_dentry = hidden_dentry->d_parent;
++              kfree(bpath);
++      }
++      else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
++              hidden_dentry =
++                      lookup_one_len(name, hidden_dir_dentry, namelen);
++      else
++              hidden_dentry = NULL;
++
++      if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
++              hidden_sto_dentry =
++                      lookup_one_len(name, hidden_sto_dir_dentry, namelen);
++      else
++              hidden_sto_dentry =  NULL;
++
++      /* catch error in lookup */
++      if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
++              /* mk: we need to call dput on the dentry, whose
++               * lookup_one_len operation failed, in order to avoid
++               * unmount trouble.
++               */
++              if(IS_ERR(hidden_dentry)) {
++                      printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
++                      err = PTR_ERR(hidden_dentry);
++              } else {
++                      dput(hidden_dentry);
++              }
++              if(IS_ERR(hidden_sto_dentry)) {
++                      printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
++                      err = PTR_ERR(hidden_sto_dentry);
++              } else {
++                      dput(hidden_sto_dentry);
++              }
++              goto out;
++      }
++
++      /* allocate dentry private data */
++      __dtopd(dentry) = (struct mini_fo_dentry_info *)
++              kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
++
++      if (!dtopd(dentry)) {
++              err = -ENOMEM;
++              goto out_dput;
++      }
++
++      /* check for different states of the mini_fo file to be looked up. */
++
++      /* state 1, file has been modified */
++      if(hidden_dentry && hidden_sto_dentry &&
++         hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
++
++              /* update parent directory's atime */
++              fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
++
++              dtopd(dentry)->state = MODIFIED;
++              dtohd(dentry) = hidden_dentry;
++              dtohd2(dentry) = hidden_sto_dentry;
++
++              err = mini_fo_tri_interpose(hidden_dentry,
++                                          hidden_sto_dentry,
++                                          dentry, dir->i_sb, 1);
++              if (err) {
++                      printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
++                      goto out_free;
++              }
++              goto out;
++      }
++      /* state 2, file is unmodified */
++      if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
++
++              fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
++
++              dtopd(dentry)->state = UNMODIFIED;
++              dtohd(dentry) = hidden_dentry;
++              dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
++
++              err = mini_fo_tri_interpose(hidden_dentry,
++                                          hidden_sto_dentry,
++                                          dentry, dir->i_sb, 1);
++              if (err) {
++                      printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
++                      goto out_free;
++              }
++              goto out;
++      }
++      /* state 3, file has been newly created */
++      if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
++
++              fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
++              dtopd(dentry)->state = CREATED;
++              dtohd(dentry) = hidden_dentry; /* could be negative */
++              dtohd2(dentry) = hidden_sto_dentry;
++
++              err = mini_fo_tri_interpose(hidden_dentry,
++                                          hidden_sto_dentry,
++                                          dentry, dir->i_sb, 1);
++              if (err) {
++                      printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
++                      goto out_free;
++              }
++              goto out;
++      }
++
++      /* state 4, file has deleted and created again. */
++      if(hidden_dentry && hidden_sto_dentry &&
++         hidden_dentry->d_inode &&
++         hidden_sto_dentry->d_inode && del_flag) {
++
++              fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
++              dtopd(dentry)->state = DEL_REWRITTEN;
++              dtohd(dentry) = NULL;
++              dtohd2(dentry) = hidden_sto_dentry;
++
++              err = mini_fo_tri_interpose(NULL,
++                                          hidden_sto_dentry,
++                                          dentry, dir->i_sb, 1);
++              if (err) {
++                      printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
++                      goto out_free;
++              }
++              /* We will never need this dentry again, as the file has been
++               * deleted from base */
++              dput(hidden_dentry);
++              goto out;
++      }
++      /* state 5, file has been deleted in base */
++      if(hidden_dentry && hidden_sto_dentry &&
++         hidden_dentry->d_inode &&
++         !hidden_sto_dentry->d_inode && del_flag) {
++
++              /* check which parents atime we need for updating */
++              if(hidden_sto_dir_dentry->d_inode)
++                      fist_copy_attr_atime(dir,
++                                           hidden_sto_dir_dentry->d_inode);
++              else
++                      fist_copy_attr_atime(dir,
++                                           hidden_dir_dentry->d_inode);
++
++              dtopd(dentry)->state = DELETED;
++              dtohd(dentry) = NULL;
++              dtohd2(dentry) = hidden_sto_dentry;
++
++              /* add negative dentry to dcache to speed up lookups */
++              d_add(dentry, NULL);
++              dput(hidden_dentry);
++              goto out;
++      }
++      /* state 6, file does not exist */
++      if(((hidden_dentry && !hidden_dentry->d_inode) ||
++          (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
++              {
++                      /* check which parents atime we need for updating */
++                      if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
++                              fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
++                      else
++                              fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
++
++                      dtopd(dentry)->state = NON_EXISTANT;
++                      dtohd(dentry) = hidden_dentry;
++                      dtohd2(dentry) = hidden_sto_dentry;
++                      d_add(dentry, NULL);
++                      goto out;
++              }
++
++      /* if we get to here, were in an invalid state. bad. */
++      printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
++
++      /* end state checking */
++ out_free:
++      d_drop(dentry);         /* so that our bad dentry will get destroyed */
++      kfree(dtopd(dentry));
++      __dtopd(dentry) = NULL; /* be safe */
++
++ out_dput:
++      if(hidden_dentry)
++              dput(hidden_dentry);
++      if(hidden_sto_dentry)
++              dput(hidden_sto_dentry); /* drops usage count and marks for release */
++
++ out:
++      /* initalize wol if file exists and is directory */
++      if(dentry->d_inode) {
++              if(S_ISDIR(dentry->d_inode->i_mode)) {
++                      itopd(dentry->d_inode)->deleted_list_size = -1;
++                      itopd(dentry->d_inode)->renamed_list_size = -1;
++                      meta_build_lists(dentry);
++              }
++      }
++      return ERR_PTR(err);
++}
++
++
++STATIC int
++mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
++{
++      int err;
++      dentry_t *hidden_old_dentry;
++      dentry_t *hidden_new_dentry;
++      dentry_t *hidden_dir_dentry;
++
++
++      check_mini_fo_dentry(old_dentry);
++      check_mini_fo_dentry(new_dentry);
++      check_mini_fo_inode(dir);
++
++      /* no links to directorys and existing targets target allowed */
++      if(S_ISDIR(old_dentry->d_inode->i_mode) ||
++         is_mini_fo_existant(new_dentry)) {
++              err = -EPERM;
++              goto out;
++      }
++
++      /* bring it directly from unmod to del_rew */
++      if(dtost(old_dentry) == UNMODIFIED) {
++              err = nondir_unmod_to_mod(old_dentry, 1);
++              if(err) {
++                      err = -EINVAL;
++                      goto out;
++              }
++              err = meta_add_d_entry(old_dentry->d_parent,
++                                     old_dentry->d_name.name,
++                                     old_dentry->d_name.len);
++              if(err) {
++                      err = -EINVAL;
++                      goto out;
++              }
++              dput(dtohd(old_dentry));
++              dtohd(old_dentry) = NULL;
++              dtost(old_dentry) = DEL_REWRITTEN;
++      }
++
++      err = get_neg_sto_dentry(new_dentry);
++      if(err) {
++              err = -EINVAL;
++              goto out;
++      }
++
++      hidden_old_dentry = dtohd2(old_dentry);
++      hidden_new_dentry = dtohd2(new_dentry);
++
++      dget(hidden_old_dentry);
++      dget(hidden_new_dentry);
++
++      /* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
++      hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
++#else
++      down(&hidden_dir_dentry->d_inode->i_sem);
++#endif
++
++      err = vfs_link(hidden_old_dentry,
++                     hidden_dir_dentry->d_inode,
++                     hidden_new_dentry);
++      if (err || !hidden_new_dentry->d_inode)
++              goto out_lock;
++
++      dtost(new_dentry) = CREATED;
++      err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
++      if (err)
++              goto out_lock;
++
++      fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
++      /* propagate number of hard-links */
++      old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
++
++ out_lock:
++      /* was: unlock_dir(hidden_dir_dentry); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_dir_dentry->d_inode->i_sem);
++#endif
++      dput(hidden_dir_dentry);
++
++      dput(hidden_new_dentry);
++      dput(hidden_old_dentry);
++      if (!new_dentry->d_inode)
++              d_drop(new_dentry);
++
++ out:
++      return err;
++}
++
++
++STATIC int
++mini_fo_unlink(inode_t *dir, dentry_t *dentry)
++{
++      int err = 0;
++
++      dget(dentry);
++      if(dtopd(dentry)->state == MODIFIED) {
++              err = nondir_mod_to_del(dentry);
++              goto out;
++      }
++      else if(dtopd(dentry)->state == UNMODIFIED) {
++              err = nondir_unmod_to_del(dentry);
++              goto out;
++      }
++      else if(dtopd(dentry)->state == CREATED) {
++              err = nondir_creat_to_del(dentry);
++              goto out;
++      }
++      else if(dtopd(dentry)->state == DEL_REWRITTEN) {
++              err = nondir_del_rew_to_del(dentry);
++              goto out;
++      }
++
++      printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
++
++ out:
++      fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
++
++      if(!err) {
++              /* is this causing my pain? d_delete(dentry); */
++              d_drop(dentry);
++      }
++
++      dput(dentry);
++      return err;
++}
++
++
++STATIC int
++mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
++{
++      int err=0;
++      dentry_t *hidden_sto_dentry;
++      dentry_t *hidden_sto_dir_dentry;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++        umode_t mode;
++#endif
++
++      /* Fail if the symlink file exists */
++      if(!(dtost(dentry) == DELETED ||
++           dtost(dentry) == NON_EXISTANT)) {
++              err = -EEXIST;
++              goto out;
++      }
++
++      err = get_neg_sto_dentry(dentry);
++      if(err) {
++              err = -EINVAL;
++              goto out;
++      }
++      hidden_sto_dentry = dtohd2(dentry);
++
++      dget(hidden_sto_dentry);
++      /* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
++      hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++      mode = S_IALLUGO;
++      err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
++                        hidden_sto_dentry, symname, mode);
++#else
++      err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
++                        hidden_sto_dentry,
++                        symname);
++#endif
++      if (err || !hidden_sto_dentry->d_inode)
++                goto out_lock;
++
++        if(dtost(dentry) == DELETED) {
++                dtost(dentry) = DEL_REWRITTEN;
++                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
++                if(err)
++                        goto out_lock;
++        } else if(dtost(dentry) == NON_EXISTANT) {
++                dtost(dentry) = CREATED;
++                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
++                if(err)
++                        goto out_lock;
++        }
++      fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
++
++ out_lock:
++        /* was: unlock_dir(hidden_sto_dir_dentry); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++      dput(hidden_sto_dir_dentry);
++
++        dput(hidden_sto_dentry);
++        if (!dentry->d_inode)
++                d_drop(dentry);
++ out:
++        return err;
++}
++
++STATIC int
++mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
++{
++      int err;
++
++      err = create_sto_dir(dentry, mode);
++
++      check_mini_fo_dentry(dentry);
++
++      return err;
++}
++
++
++STATIC int
++mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
++{
++      int err = 0;
++
++      dentry_t *hidden_sto_dentry;
++      dentry_t *hidden_sto_dir_dentry;
++      dentry_t *meta_dentry;
++      inode_t *hidden_sto_dir = NULL;
++
++      check_mini_fo_dentry(dentry);
++      check_mini_fo_inode(dir);
++
++      dget(dentry);
++      if(dtopd(dentry)->state == MODIFIED) {
++              /* XXX: disabled, because it does not bother to check files on
++               * the original filesystem - just a hack, but better than simply
++               * removing it without testing */
++              err = -EINVAL;
++              goto out;
++
++              hidden_sto_dir = itohi2(dir);
++              hidden_sto_dentry = dtohd2(dentry);
++
++              /* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
++              hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++              down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++              /* Delete an old WOL file contained in the storage dir */
++              meta_dentry = lookup_one_len(META_FILENAME,
++                                           hidden_sto_dentry,
++                                           strlen(META_FILENAME));
++              if(meta_dentry->d_inode) {
++                      err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
++                      dput(meta_dentry);
++                      if(!err)
++                              d_delete(meta_dentry);
++              }
++
++              err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
++              dput(hidden_sto_dentry);
++              if(!err)
++                      d_delete(hidden_sto_dentry);
++
++              /* propagate number of hard-links */
++              dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
++
++              dput(dtohd(dentry));
++
++              dtohd(dentry) = NULL;
++              dtopd(dentry)->state = DELETED;
++
++              /* carefull with R files */
++              if( __meta_is_r_entry(dir,
++                                    dentry->d_name.name,
++                                    dentry->d_name.len) == 1) {
++                      err = meta_remove_r_entry(dentry->d_parent,
++                                                dentry->d_name.name,
++                                                dentry->d_name.len);
++                      if(err) {
++                              printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
++                              goto out;
++                      }
++              }
++              else {
++                      /* ok, add deleted file to META */
++                      meta_add_d_entry(dentry->d_parent,
++                                       dentry->d_name.name,
++                                       dentry->d_name.len);
++              }
++              /* was: unlock_dir(hidden_sto_dir_dentry); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++              up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++              dput(hidden_sto_dir_dentry);
++              goto out;
++      }
++      else if(dtopd(dentry)->state == UNMODIFIED) {
++              /* XXX: simply adding it to the delete list here is fscking dangerous!
++               * as a temporary hack, i will disable rmdir on unmodified directories
++               * for now.
++               */
++              err = -EINVAL;
++              goto out;
++
++              err = get_neg_sto_dentry(dentry);
++              if(err) {
++                      err = -EINVAL;
++                      goto out;
++              }
++
++              /* dput base dentry, this will relase the inode and free the
++               * dentry, as we will never need it again. */
++              dput(dtohd(dentry));
++              dtohd(dentry) = NULL;
++              dtopd(dentry)->state = DELETED;
++
++              /* add deleted file to META-file */
++              meta_add_d_entry(dentry->d_parent,
++                               dentry->d_name.name,
++                               dentry->d_name.len);
++              goto out;
++      }
++      else if(dtopd(dentry)->state == CREATED) {
++              hidden_sto_dir = itohi2(dir);
++              hidden_sto_dentry = dtohd2(dentry);
++
++              /* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
++              hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++              down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++              /* Delete an old WOL file contained in the storage dir */
++              meta_dentry = lookup_one_len(META_FILENAME,
++                                           hidden_sto_dentry,
++                                           strlen(META_FILENAME));
++              if(meta_dentry->d_inode) {
++                      /* is this necessary? dget(meta_dentry); */
++                      err = vfs_unlink(hidden_sto_dentry->d_inode,
++                                       meta_dentry);
++                      dput(meta_dentry);
++                      if(!err)
++                              d_delete(meta_dentry);
++              }
++
++              err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
++              dput(hidden_sto_dentry);
++              if(!err)
++                      d_delete(hidden_sto_dentry);
++
++              /* propagate number of hard-links */
++              dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
++              dtopd(dentry)->state = NON_EXISTANT;
++
++              /* was: unlock_dir(hidden_sto_dir_dentry); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++              up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++              dput(hidden_sto_dir_dentry);
++
++              goto out;
++      }
++      else if(dtopd(dentry)->state == DEL_REWRITTEN) {
++              hidden_sto_dir = itohi2(dir);
++              hidden_sto_dentry = dtohd2(dentry);
++
++              /* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
++              hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++              down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++              /* Delete an old WOL file contained in the storage dir */
++              meta_dentry = lookup_one_len(META_FILENAME,
++                                           hidden_sto_dentry,
++                                           strlen(META_FILENAME));
++              if(meta_dentry->d_inode) {
++                      /* is this necessary? dget(meta_dentry); */
++                      err = vfs_unlink(hidden_sto_dentry->d_inode,
++                                       meta_dentry);
++                      dput(meta_dentry);
++                      if(!err)
++                              d_delete(meta_dentry);
++              }
++
++              err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
++              dput(hidden_sto_dentry);
++              if(!err)
++                      d_delete(hidden_sto_dentry);
++
++              /* propagate number of hard-links */
++              dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
++              dtopd(dentry)->state = DELETED;
++              /* was: unlock_dir(hidden_sto_dir_dentry); */
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++              up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++              dput(hidden_sto_dir_dentry);
++              goto out;
++      }
++
++      printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
++
++ out:
++      if(!err) {
++              d_drop(dentry);
++      }
++
++      fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
++      dput(dentry);
++
++      return err;
++}
++
++
++STATIC int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
++#else
++mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
++#endif
++{
++      int err = 0;
++
++      check_mini_fo_dentry(dentry);
++
++      err = create_sto_nod(dentry, mode, dev);
++      if(err) {
++              printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
++              err = -EINVAL;
++      }
++
++      check_mini_fo_dentry(dentry);
++      return err;
++}
++
++
++STATIC int
++mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
++             inode_t *new_dir, dentry_t *new_dentry)
++{
++      /* dispatch */
++      if(S_ISDIR(old_dentry->d_inode->i_mode))
++              return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
++      return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
++
++}
++
++int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
++                   inode_t *new_dir, dentry_t *new_dentry)
++{
++      int err, bpath_len;
++      char *bpath;
++
++      dentry_t *hidden_old_dentry;
++      dentry_t *hidden_new_dentry;
++      dentry_t *hidden_old_dir_dentry;
++      dentry_t *hidden_new_dir_dentry;
++
++      err = 0;
++      bpath = NULL;
++      bpath_len = 0;
++
++      /* this is a test, chuck out if it works */
++      if(!(dtopd(new_dentry)->state == DELETED ||
++           dtopd(new_dentry)->state == NON_EXISTANT)) {
++              printk(KERN_CRIT "mini_fo: rename_directory: \
++                                  uh, ah, new_dentry not negative.\n");
++              /* return -1; */
++      }
++
++      /* state = UNMODIFIED */
++      if(dtopd(old_dentry)->state == UNMODIFIED) {
++              err = dir_unmod_to_mod(old_dentry);
++              if (err)
++                      goto out;
++      }
++
++      /* state = MODIFIED */
++      if(dtopd(old_dentry)->state == MODIFIED) {
++              bpath = meta_check_r_entry(old_dentry->d_parent,
++                                         old_dentry->d_name.name,
++                                         old_dentry->d_name.len);
++              if(bpath) {
++                      err = meta_remove_r_entry(old_dentry->d_parent,
++                                                old_dentry->d_name.name,
++                                                old_dentry->d_name.len);
++                      if(err) {
++                              printk(KERN_CRIT "mini_fo: rename_directory:\
++                                                   meta_remove_r_entry \
++                                                  failed.\n");
++                              goto out;
++                      }
++                      err = meta_add_r_entry(new_dentry->d_parent,
++                                             bpath,
++                                             strlen(bpath),
++                                             new_dentry->d_name.name,
++                                             new_dentry->d_name.len);
++                      kfree(bpath);
++              }
++              else {/* wol it */
++                      err = meta_add_d_entry(old_dentry->d_parent,
++                                             old_dentry->d_name.name,
++                                             old_dentry->d_name.len);
++                      if (err)
++                              goto out;
++                      /* put it on rename list */
++                      err = get_mini_fo_bpath(old_dentry,
++                                              &bpath,
++                                              &bpath_len);
++                      if (err)
++                              goto out;
++                      err = meta_add_r_entry(new_dentry->d_parent,
++                                             bpath, bpath_len,
++                                             new_dentry->d_name.name,
++                                             new_dentry->d_name.len);
++                      if (err)
++                              goto out;
++              }
++              /* no state change, MODIFIED stays MODIFIED */
++      }
++      /* state = CREATED */
++      if(dtopd(old_dentry)->state == CREATED ||
++         dtopd(old_dentry)->state == DEL_REWRITTEN) {
++              if(dtohd(old_dentry))
++                      dput(dtohd(old_dentry));
++
++              if(dtopd(new_dentry)->state == DELETED) {
++                      dtopd(old_dentry)->state = DEL_REWRITTEN;
++                      dtohd(old_dentry) = NULL;
++              }
++              else if(dtopd(new_dentry)->state == NON_EXISTANT) {
++                      dtopd(old_dentry)->state = CREATED;
++                      /* steal new dentry's neg. base dentry */
++                      dtohd(old_dentry) = dtohd(new_dentry);
++                      dtohd(new_dentry) = NULL;
++              }
++      }
++      if(dtopd(new_dentry)->state == UNMODIFIED ||
++         dtopd(new_dentry)->state == NON_EXISTANT) {
++              err = get_neg_sto_dentry(new_dentry);
++              if(err)
++                      goto out;
++      }
++
++      /* now move sto file */
++      hidden_old_dentry = dtohd2(old_dentry);
++      hidden_new_dentry = dtohd2(new_dentry);
++
++      dget(hidden_old_dentry);
++      dget(hidden_new_dentry);
++
++      hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
++      hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
++      double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
++
++      err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
++                       hidden_new_dir_dentry->d_inode, hidden_new_dentry);
++      if(err)
++              goto out_lock;
++
++      fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
++      if (new_dir != old_dir)
++              fist_copy_attr_all(old_dir,
++                                 hidden_old_dir_dentry->d_inode);
++
++ out_lock:
++      /* double_unlock will dput the new/old parent dentries
++       * whose refcnts were incremented via get_parent above. */
++      double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
++      dput(hidden_new_dentry);
++      dput(hidden_old_dentry);
++
++ out:
++      return err;
++}
++
++int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
++                inode_t *new_dir, dentry_t *new_dentry)
++{
++      int err=0;
++
++      check_mini_fo_dentry(old_dentry);
++      check_mini_fo_dentry(new_dentry);
++      check_mini_fo_inode(old_dir);
++      check_mini_fo_inode(new_dir);
++
++      /* state: UNMODIFIED */
++      if(dtost(old_dentry) == UNMODIFIED) {
++              err = nondir_unmod_to_mod(old_dentry, 1);
++              if(err) {
++                      err = -EINVAL;
++                      goto out;
++              }
++      }
++
++      /* the easy states */
++      if(exists_in_storage(old_dentry)) {
++
++              dentry_t *hidden_old_dentry;
++              dentry_t *hidden_new_dentry;
++              dentry_t *hidden_old_dir_dentry;
++              dentry_t *hidden_new_dir_dentry;
++
++              /* if old file is MODIFIED, add it to the deleted_list */
++              if(dtopd(old_dentry)->state == MODIFIED) {
++                      meta_add_d_entry(old_dentry->d_parent,
++                                       old_dentry->d_name.name,
++                                       old_dentry->d_name.len);
++
++                      dput(dtohd(old_dentry));
++              }
++              /* if old file is CREATED, we only release the base dentry */
++              if(dtopd(old_dentry)->state == CREATED) {
++                      if(dtohd(old_dentry))
++                              dput(dtohd(old_dentry));
++              }
++
++              /* now setup the new states (depends on new_dentry state) */
++              /* new dentry state =  MODIFIED */
++              if(dtopd(new_dentry)->state == MODIFIED) {
++                      meta_add_d_entry(new_dentry->d_parent,
++                                       new_dentry->d_name.name,
++                                       new_dentry->d_name.len);
++
++                      /* new dentry will be d_put'ed later by the vfs
++                       * so don't do it here
++                       * dput(dtohd(new_dentry));
++                       */
++                      dtohd(old_dentry) = NULL;
++                      dtopd(old_dentry)->state = DEL_REWRITTEN;
++              }
++              /* new dentry state =  UNMODIFIED */
++              else if(dtopd(new_dentry)->state == UNMODIFIED) {
++                      if(get_neg_sto_dentry(new_dentry))
++                              return -EINVAL;
++
++                      meta_add_d_entry(new_dentry->d_parent,
++                                       new_dentry->d_name.name,
++                                       new_dentry->d_name.len);
++
++                      /* is this right??? */
++                      /*dput(dtohd(new_dentry));*/
++                      dtohd(old_dentry) = NULL;
++                      dtopd(old_dentry)->state = DEL_REWRITTEN;
++              }
++              /* new dentry state =  CREATED */
++              else if(dtopd(new_dentry)->state == CREATED) {
++                      /* we keep the neg. base dentry (if exists) */
++                      dtohd(old_dentry) = dtohd(new_dentry);
++                      /* ...and set it to Null, or we'll get
++                       * dcache.c:345 if it gets dput twice... */
++                      dtohd(new_dentry) = NULL;
++                      dtopd(old_dentry)->state = CREATED;
++              }
++              /* new dentry state =  NON_EXISTANT */
++              else if(dtopd(new_dentry)->state == NON_EXISTANT) {
++                      if(get_neg_sto_dentry(new_dentry))
++                              return -EINVAL;
++
++                      /* we keep the neg. base dentry (if exists) */
++                      dtohd(old_dentry) = dtohd(new_dentry);
++                      /* ...and set it to Null, or we'll get
++                       * Dr. dcache.c:345 if it gets dput twice... */
++                      dtohd(new_dentry) = NULL;
++                      dtopd(old_dentry)->state = CREATED;
++              }
++              /* new dentry state =  DEL_REWRITTEN or DELETED */
++              else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
++                      dtopd(new_dentry)->state == DELETED) {
++                      dtohd(old_dentry) = NULL;
++                      dtopd(old_dentry)->state = DEL_REWRITTEN;
++              }
++              else { /* not possible, uhh, ahh */
++                      printk(KERN_CRIT
++                             "mini_fo: rename_reg_file: invalid state detected [1].\n");
++                      return -1;
++              }
++
++              /* now we definitely have a sto file */
++              hidden_old_dentry = dtohd2(old_dentry);
++              hidden_new_dentry = dtohd2(new_dentry);
++
++              dget(hidden_old_dentry);
++              dget(hidden_new_dentry);
++
++              hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
++              hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
++              double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
++
++              err = vfs_rename(hidden_old_dir_dentry->d_inode,
++                               hidden_old_dentry,
++                               hidden_new_dir_dentry->d_inode,
++                               hidden_new_dentry);
++              if(err)
++                      goto out_lock;
++
++              fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
++              if (new_dir != old_dir)
++                      fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
++
++      out_lock:
++              /* double_unlock will dput the new/old parent dentries
++               * whose refcnts were incremented via get_parent above.
++               */
++              double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
++              dput(hidden_new_dentry);
++              dput(hidden_old_dentry);
++      out:
++              return err;
++      }
++      else { /* invalid state */
++              printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
++              return -1;
++      }
++}
++
++
++STATIC int
++mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
++{
++      int err=0;
++      dentry_t *hidden_dentry = NULL;
++
++      if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
++              hidden_dentry = dtohd2(dentry);
++      } else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
++              hidden_dentry = dtohd(dentry);
++      } else {
++              goto out;
++      }
++
++      if (!hidden_dentry->d_inode->i_op ||
++          !hidden_dentry->d_inode->i_op->readlink) {
++              err = -EINVAL;          goto out;
++      }
++
++      err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
++                                                   buf,
++                                                   bufsiz);
++      if (err > 0)
++              fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
++
++ out:
++      return err;
++}
++
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
++static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
++#else
++static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
++#endif
++{
++      char *buf;
++      int len = PAGE_SIZE, err;
++      mm_segment_t old_fs;
++
++      /* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
++      buf = kmalloc(len, GFP_KERNEL);
++      if (!buf) {
++              err = -ENOMEM;
++              goto out;
++      }
++
++      /* read the symlink, and then we will follow it */
++      old_fs = get_fs();
++      set_fs(KERNEL_DS);
++      err = dentry->d_inode->i_op->readlink(dentry, buf, len);
++      set_fs(old_fs);
++      if (err < 0) {
++              kfree(buf);
++              buf = NULL;
++              goto out;
++      }
++      buf[err] = 0;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++        nd_set_link(nd, buf);
++        err = 0;
++#else
++      err = vfs_follow_link(nd, buf);
++#endif
++
++ out:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++      kfree(buf);
++#endif
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
++        return err;
++#else
++        return ERR_PTR(err);
++#endif
++}
++
++STATIC
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
++void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
++#else
++void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
++#endif
++{
++        char *link;
++        link = nd_get_link(nd);
++        kfree(link);
++}
++#endif
++
++STATIC int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
++#else
++mini_fo_permission(inode_t *inode, int mask)
++#endif
++{
++      inode_t *hidden_inode;
++      int mode;
++      int err;
++
++      if(itohi2(inode)) {
++              hidden_inode = itohi2(inode);
++      } else {
++              hidden_inode = itohi(inode);
++      }
++      mode = inode->i_mode;
++
++      /* not really needed, as permission handles everything:
++       *      err = vfs_permission(inode, mask);
++       *      if (err)
++       *              goto out;
++       */
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++      err = permission(hidden_inode, mask, nd);
++#else
++      err = permission(hidden_inode, mask);
++#endif
++
++      /*  out: */
++      return err;
++}
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++STATIC int
++mini_fo_inode_revalidate(dentry_t *dentry)
++{
++      int err = 0;
++      dentry_t *hidden_dentry;
++      inode_t *hidden_inode;
++
++      ASSERT(dentry->d_inode);
++      ASSERT(itopd(dentry->d_inode));
++
++      if(itohi2(dentry->d_inode)) {
++                hidden_dentry = dtohd2(dentry);
++              hidden_inode = hidden_dentry->d_inode;
++      } else if(itohi(dentry->d_inode)) {
++                hidden_dentry = dtohd(dentry);
++              hidden_inode = hidden_dentry->d_inode;
++      } else {
++                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
++                err = -ENOENT;
++                goto out;
++        }
++      if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
++              err = hidden_inode->i_op->revalidate(hidden_dentry);
++              if (err)
++                      goto out;
++      }
++      fist_copy_attr_all(dentry->d_inode, hidden_inode);
++ out:
++      return err;
++}
++#endif
++
++STATIC int
++mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
++{
++      int err = 0;
++
++      check_mini_fo_dentry(dentry);
++
++      if(!is_mini_fo_existant(dentry)) {
++              printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
++              goto out;
++      }
++
++      if(dtost(dentry) == UNMODIFIED) {
++              if(!IS_COPY_FLAG(ia->ia_valid))
++                      goto out; /* we ignore these changes to base */
++
++              if(S_ISDIR(dentry->d_inode->i_mode)) {
++                      err = dir_unmod_to_mod(dentry);
++              } else {
++                      /* we copy contents if file is not beeing truncated */
++                      if(S_ISREG(dentry->d_inode->i_mode) &&
++                         !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
++                              err = nondir_unmod_to_mod(dentry, 1);
++                      } else
++                              err = nondir_unmod_to_mod(dentry, 0);
++              }
++              if(err) {
++                      err = -EINVAL;
++                      printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
++                      goto out;
++              }
++      }
++      if(!exists_in_storage(dentry)) {
++              printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
++              err = -EINVAL;
++              goto out;
++      }
++      ASSERT(dentry->d_inode);
++      ASSERT(dtohd2(dentry));
++      ASSERT(itopd(dentry->d_inode));
++      ASSERT(itohi2(dentry->d_inode));
++
++      err = notify_change(dtohd2(dentry), ia);
++      fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
++ out:
++      return err;
++}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++STATIC int
++mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++{
++      int err = 0;
++        dentry_t *hidden_dentry;
++
++      ASSERT(dentry->d_inode);
++      ASSERT(itopd(dentry->d_inode));
++
++      if(itohi2(dentry->d_inode)) {
++                hidden_dentry = dtohd2(dentry);
++      } else if(itohi(dentry->d_inode)) {
++                hidden_dentry = dtohd(dentry);
++      } else {
++                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
++                err = -ENOENT;
++                goto out;
++        }
++      fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
++
++      ASSERT(hidden_dentry);
++      ASSERT(hidden_dentry->d_inode);
++      ASSERT(hidden_dentry->d_inode->i_op);
++
++      generic_fillattr(dentry->d_inode, stat);
++      if (!stat->blksize) {
++              struct super_block *s = hidden_dentry->d_inode->i_sb;
++              unsigned blocks;
++              blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
++              stat->blocks = (s->s_blocksize / 512) * blocks;
++              stat->blksize = s->s_blocksize;
++      }
++ out:
++        return err;
++}
++#endif
++
++#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
++#if 0 /* no xattr_alloc() and xattr_free() */
++/* This is lifted from fs/xattr.c */
++static void *
++xattr_alloc(size_t size, size_t limit)
++{
++      void *ptr;
++
++      if (size > limit)
++              return ERR_PTR(-E2BIG);
++
++      if (!size)      /* size request, no buffer is needed */
++              return NULL;
++      else if (size <= PAGE_SIZE)
++              ptr = kmalloc((unsigned long) size, GFP_KERNEL);
++      else
++              ptr = vmalloc((unsigned long) size);
++      if (!ptr)
++              return ERR_PTR(-ENOMEM);
++      return ptr;
++}
++
++static void
++xattr_free(void *ptr, size_t size)
++{
++      if (!size)      /* size request, no buffer was needed */
++              return;
++      else if (size <= PAGE_SIZE)
++              kfree(ptr);
++      else
++              vfree(ptr);
++}
++#endif /* no xattr_alloc() and xattr_free() */
++
++/* BKL held by caller.
++ * dentry->d_inode->i_sem down
++ */
++STATIC int
++mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
++      struct dentry *hidden_dentry = NULL;
++      int err = -EOPNOTSUPP;
++      /* Define these anyway so we don't need as much ifdef'ed code. */
++      char *encoded_name = NULL;
++      char *encoded_value = NULL;
++
++      check_mini_fo_dentry(dentry);
++
++      if(exists_in_storage(dentry))
++              hidden_dentry = dtohd2(dentry);
++      else
++              hidden_dentry = dtohd(dentry);
++
++      ASSERT(hidden_dentry);
++      ASSERT(hidden_dentry->d_inode);
++      ASSERT(hidden_dentry->d_inode->i_op);
++
++      if (hidden_dentry->d_inode->i_op->getxattr) {
++              encoded_name = (char *)name;
++              encoded_value = (char *)value;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&hidden_dentry->d_inode->i_mutex);
++#else
++              down(&hidden_dentry->d_inode->i_sem);
++#endif
++              /* lock_kernel() already done by caller. */
++              err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
++              /* unlock_kernel() will be done by caller. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&hidden_dentry->d_inode->i_mutex);
++#else
++              up(&hidden_dentry->d_inode->i_sem);
++#endif
++      }
++      return err;
++}
++
++/* BKL held by caller.
++ * dentry->d_inode->i_sem down
++ */
++STATIC int
++#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
++     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
++     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
++mini_fo_setxattr(struct dentry *dentry, const char *name,
++               const void *value, size_t size, int flags)
++#else
++mini_fo_setxattr(struct dentry *dentry, const char *name,
++               void *value, size_t size, int flags)
++#endif
++
++{
++      struct dentry *hidden_dentry = NULL;
++      int err = -EOPNOTSUPP;
++
++      /* Define these anyway, so we don't have as much ifdef'ed code. */
++      char *encoded_value = NULL;
++      char *encoded_name = NULL;
++
++      check_mini_fo_dentry(dentry);
++
++      if(exists_in_storage(dentry))
++              hidden_dentry = dtohd2(dentry);
++      else
++              hidden_dentry = dtohd(dentry);
++
++      ASSERT(hidden_dentry);
++      ASSERT(hidden_dentry->d_inode);
++      ASSERT(hidden_dentry->d_inode->i_op);
++
++      if (hidden_dentry->d_inode->i_op->setxattr) {
++              encoded_name = (char *)name;
++              encoded_value = (char *)value;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&hidden_dentry->d_inode->i_mutex);
++#else
++              down(&hidden_dentry->d_inode->i_sem);
++#endif
++              /* lock_kernel() already done by caller. */
++              err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
++              /* unlock_kernel() will be done by caller. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&hidden_dentry->d_inode->i_mutex);
++#else
++              up(&hidden_dentry->d_inode->i_sem);
++#endif
++      }
++      return err;
++}
++
++/* BKL held by caller.
++ * dentry->d_inode->i_sem down
++ */
++STATIC int
++mini_fo_removexattr(struct dentry *dentry, const char *name) {
++      struct dentry *hidden_dentry = NULL;
++      int err = -EOPNOTSUPP;
++      char *encoded_name;
++
++      check_mini_fo_dentry(dentry);
++
++      if(exists_in_storage(dentry))
++              hidden_dentry = dtohd2(dentry);
++      else
++              hidden_dentry = dtohd(dentry);
++
++      ASSERT(hidden_dentry);
++      ASSERT(hidden_dentry->d_inode);
++      ASSERT(hidden_dentry->d_inode->i_op);
++
++      if (hidden_dentry->d_inode->i_op->removexattr) {
++              encoded_name = (char *)name;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&hidden_dentry->d_inode->i_mutex);
++#else
++              down(&hidden_dentry->d_inode->i_sem);
++#endif
++              /* lock_kernel() already done by caller. */
++              err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
++              /* unlock_kernel() will be done by caller. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&hidden_dentry->d_inode->i_mutex);
++#else
++              up(&hidden_dentry->d_inode->i_sem);
++#endif
++      }
++      return err;
++}
++
++/* BKL held by caller.
++ * dentry->d_inode->i_sem down
++ */
++STATIC int
++mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
++      struct dentry *hidden_dentry = NULL;
++      int err = -EOPNOTSUPP;
++      char *encoded_list = NULL;
++
++      check_mini_fo_dentry(dentry);
++
++      if(exists_in_storage(dentry))
++              hidden_dentry = dtohd2(dentry);
++      else
++              hidden_dentry = dtohd(dentry);
++
++      ASSERT(hidden_dentry);
++      ASSERT(hidden_dentry->d_inode);
++      ASSERT(hidden_dentry->d_inode->i_op);
++
++      if (hidden_dentry->d_inode->i_op->listxattr) {
++              encoded_list = list;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&hidden_dentry->d_inode->i_mutex);
++#else
++              down(&hidden_dentry->d_inode->i_sem);
++#endif
++              /* lock_kernel() already done by caller. */
++              err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
++              /* unlock_kernel() will be done by caller. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&hidden_dentry->d_inode->i_mutex);
++#else
++              up(&hidden_dentry->d_inode->i_sem);
++#endif
++      }
++      return err;
++}
++# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
++
++struct inode_operations mini_fo_symlink_iops =
++      {
++              readlink:       mini_fo_readlink,
++              follow_link: mini_fo_follow_link,
++              /* mk: permission:      mini_fo_permission, */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++              revalidate:     mini_fo_inode_revalidate,
++#endif
++              setattr:        mini_fo_setattr,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++              getattr:        mini_fo_getattr,
++              put_link:       mini_fo_put_link,
++#endif
++
++#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
++              setxattr:       mini_fo_setxattr,
++              getxattr:       mini_fo_getxattr,
++              listxattr:      mini_fo_listxattr,
++              removexattr: mini_fo_removexattr
++# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
++      };
++
++struct inode_operations mini_fo_dir_iops =
++      {
++              create: mini_fo_create,
++              lookup: mini_fo_lookup,
++              link:   mini_fo_link,
++              unlink: mini_fo_unlink,
++              symlink:        mini_fo_symlink,
++              mkdir:  mini_fo_mkdir,
++              rmdir:  mini_fo_rmdir,
++              mknod:  mini_fo_mknod,
++              rename: mini_fo_rename,
++              /* no readlink/follow_link for non-symlinks */
++              // off because we have setattr
++              //    truncate: mini_fo_truncate,
++              /* mk:permission:       mini_fo_permission, */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++              revalidate:     mini_fo_inode_revalidate,
++#endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++              getattr:        mini_fo_getattr,
++#endif
++              setattr:        mini_fo_setattr,
++#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
++              setxattr:       mini_fo_setxattr,
++              getxattr:       mini_fo_getxattr,
++              listxattr:      mini_fo_listxattr,
++              removexattr: mini_fo_removexattr
++# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
++      };
++
++struct inode_operations mini_fo_main_iops =
++      {
++              /* permission:  mini_fo_permission, */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++              revalidate:     mini_fo_inode_revalidate,
++#endif
++              setattr:        mini_fo_setattr,
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++              getattr:        mini_fo_getattr,
++#endif
++#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
++              setxattr:       mini_fo_setxattr,
++              getxattr:       mini_fo_getxattr,
++              listxattr:      mini_fo_listxattr,
++              removexattr:    mini_fo_removexattr
++# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
++      };
+--- /dev/null
++++ b/fs/mini_fo/main.c
+@@ -0,0 +1,423 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++/*
++ *  $Id$
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "fist.h"
++#include "mini_fo.h"
++#include <linux/module.h>
++
++/* This definition must only appear after we include <linux/module.h> */
++#ifndef MODULE_LICENSE
++# define MODULE_LICENSE(bison)
++#endif /* not MODULE_LICENSE */
++
++/*
++ * This is the mini_fo tri interpose function, which extends the
++ * functionality of the regular interpose by interposing a higher
++ * level inode on top of two lower level ones: the base filesystem
++ * inode and the storage filesystem inode.
++ *
++ *  sb we pass is mini_fo's super_block
++ */
++int
++mini_fo_tri_interpose(dentry_t *hidden_dentry,
++                    dentry_t *hidden_sto_dentry,
++                    dentry_t *dentry, super_block_t *sb, int flag)
++{
++      inode_t *hidden_inode = NULL;
++      inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
++      int err = 0;
++      inode_t *inode;
++
++      /* Pointer to hidden_sto_inode if exists, else to hidden_inode.
++       * This is used to copy the attributes of the correct inode. */
++      inode_t *master_inode;
++
++      if(hidden_dentry)
++              hidden_inode = hidden_dentry->d_inode;
++      if(hidden_sto_dentry)
++              hidden_sto_inode = hidden_sto_dentry->d_inode;
++
++      ASSERT(dentry->d_inode == NULL);
++
++      /* mk: One of the inodes associated with the dentrys is likely to
++       * be NULL, so carefull:
++       */
++      ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
++
++      if(hidden_sto_inode)
++              master_inode = hidden_sto_inode;
++      else
++              master_inode = hidden_inode;
++
++      /*
++       * We allocate our new inode below, by calling iget.
++       * iget will call our read_inode which will initialize some
++       * of the new inode's fields
++       */
++
++      /*
++       * original: inode = iget(sb, hidden_inode->i_ino);
++       */
++      inode = iget(sb, iunique(sb, 25));
++      if (!inode) {
++              err = -EACCES;          /* should be impossible??? */
++              goto out;
++      }
++
++      /*
++       * interpose the inode if not already interposed
++       *   this is possible if the inode is being reused
++       * XXX: what happens if we get_empty_inode() but there's another already?
++       * for now, ASSERT() that this can't happen; fix later.
++       */
++      if (itohi(inode) != NULL) {
++              printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
++      }
++      if (itohi2(inode) != NULL) {
++              printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
++      }
++
++      /* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
++       * we need to check here:
++       */
++      if(hidden_inode)
++              itohi(inode) = igrab(hidden_inode);
++      else
++              itohi(inode) = NULL;
++
++      if(hidden_sto_inode)
++              itohi2(inode) = igrab(hidden_sto_inode);
++      else
++              itohi2(inode) = NULL;
++
++
++      /* Use different set of inode ops for symlinks & directories*/
++      if (S_ISLNK(master_inode->i_mode))
++              inode->i_op = &mini_fo_symlink_iops;
++      else if (S_ISDIR(master_inode->i_mode))
++              inode->i_op = &mini_fo_dir_iops;
++
++      /* Use different set of file ops for directories */
++      if (S_ISDIR(master_inode->i_mode))
++              inode->i_fop = &mini_fo_dir_fops;
++
++      /* properly initialize special inodes */
++      if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
++          S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
++              init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
++      }
++
++      /* Fix our inode's address operations to that of the lower inode */
++      if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
++              inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
++      }
++
++      /* only (our) lookup wants to do a d_add */
++      if (flag)
++              d_add(dentry, inode);
++      else
++              d_instantiate(dentry, inode);
++
++      ASSERT(dtopd(dentry) != NULL);
++
++      /* all well, copy inode attributes */
++      fist_copy_attr_all(inode, master_inode);
++
++ out:
++      return err;
++}
++
++/* parse mount options "base=" and "sto=" */
++dentry_t *
++mini_fo_parse_options(super_block_t *sb, char *options)
++{
++      dentry_t *hidden_root = ERR_PTR(-EINVAL);
++      dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
++      struct nameidata nd, nd2;
++      char *name, *tmp, *end;
++      int err = 0;
++
++      /* We don't want to go off the end of our arguments later on. */
++      for (end = options; *end; end++);
++
++      while (options < end) {
++              tmp = options;
++              while (*tmp && *tmp != ',')
++                      tmp++;
++              *tmp = '\0';
++              if (!strncmp("base=", options, 5)) {
++                      name = options + 5;
++                      printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++                      if (path_init(name, LOOKUP_FOLLOW, &nd))
++                              err = path_walk(name, &nd);
++#else
++                      err = path_lookup(name, LOOKUP_FOLLOW, &nd);
++#endif
++                      if (err) {
++                              printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
++                              hidden_root = ERR_PTR(err);
++                              goto out;
++                      }
++                      hidden_root = nd.dentry;
++                      stopd(sb)->base_dir_dentry = nd.dentry;
++                      stopd(sb)->hidden_mnt = nd.mnt;
++
++              } else if(!strncmp("sto=", options, 4)) {
++                      /* parse the storage dir */
++                      name = options + 4;
++                      printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++                      if(path_init(name, LOOKUP_FOLLOW, &nd2))
++                              err = path_walk(name, &nd2);
++#else
++                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
++#endif
++                      if(err) {
++                              printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
++
++                              hidden_root2 = ERR_PTR(err);
++                              goto out;
++                      }
++                      hidden_root2 = nd2.dentry;
++                      stopd(sb)->storage_dir_dentry = nd2.dentry;
++                      stopd(sb)->hidden_mnt2 = nd2.mnt;
++                      stohs2(sb) = hidden_root2->d_sb;
++
++                      /* validate storage dir, this is done in
++                       * mini_fo_read_super for the base directory.
++                       */
++                      if (IS_ERR(hidden_root2)) {
++                              printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
++                              goto out;
++                      }
++                      if (!hidden_root2->d_inode) {
++                              printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
++                              goto out;
++                      }
++                      stohs2(sb) = hidden_root2->d_sb;
++              } else {
++                      printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
++                      hidden_root = ERR_PTR(-EINVAL);
++                      goto out;
++              }
++              options = tmp + 1;
++      }
++
++ out:
++      if(IS_ERR(hidden_root2))
++              return hidden_root2;
++      return hidden_root;
++}
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++static int
++#else
++super_block_t *
++#endif
++mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
++{
++      dentry_t *hidden_root;
++      int err = 0;
++
++      if (!raw_data) {
++              printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
++              err = -EINVAL;
++              goto out;
++      }
++      /*
++       * Allocate superblock private data
++       */
++      __stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
++      if (!stopd(sb)) {
++              printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
++              err = -ENOMEM;
++              goto out;
++      }
++      stohs(sb) = NULL;
++
++      hidden_root = mini_fo_parse_options(sb, raw_data);
++      if (IS_ERR(hidden_root)) {
++              printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
++              err = PTR_ERR(hidden_root);
++              goto out_free;
++      }
++      if (!hidden_root->d_inode) {
++              printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
++              goto out_free;
++      }
++      stohs(sb) = hidden_root->d_sb;
++
++      /*
++       * Linux 2.4.2-ac3 and beyond has code in
++       * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
++       * to be populated.  If not set, all write()s under that sb will
++       * return 0.
++       *
++       * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
++       * the filesystem should override it only if it supports LFS.
++       */
++      /* non-SCA code is good to go with LFS */
++      sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
++
++      sb->s_op = &mini_fo_sops;
++      /*
++       * we can't use d_alloc_root if we want to use
++       * our own interpose function unchanged,
++       * so we simply replicate *most* of the code in d_alloc_root here
++       */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++      sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
++#else
++      sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
++#endif
++      if (IS_ERR(sb->s_root)) {
++              printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
++              err = -ENOMEM;
++              goto out_dput;
++      }
++
++      sb->s_root->d_op = &mini_fo_dops;
++      sb->s_root->d_sb = sb;
++      sb->s_root->d_parent = sb->s_root;
++
++      /* link the upper and lower dentries */
++      __dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
++              kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
++      if (!dtopd(sb->s_root)) {
++              err = -ENOMEM;
++              goto out_dput2;
++      }
++      dtopd(sb->s_root)->state = MODIFIED;
++      dtohd(sb->s_root) = hidden_root;
++
++      /* fanout relevant, interpose on storage root dentry too */
++      dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
++
++      /* ...and call tri-interpose to interpose root dir inodes
++       * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
++       */
++      if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
++              goto out_dput2;
++
++      /* initalize the wol list */
++      itopd(sb->s_root->d_inode)->deleted_list_size = -1;
++      itopd(sb->s_root->d_inode)->renamed_list_size = -1;
++      meta_build_lists(sb->s_root);
++
++      goto out;
++
++ out_dput2:
++      dput(sb->s_root);
++ out_dput:
++      dput(hidden_root);
++      dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
++ out_free:
++      kfree(stopd(sb));
++      __stopd(sb) = NULL;
++ out:
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++        return err;
++#else
++        if (err) {
++              return ERR_PTR(err);
++        } else {
++              return sb;
++        }
++#endif
++}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++static int mini_fo_get_sb(struct file_system_type *fs_type,
++                                        int flags, const char *dev_name,
++                                        void *raw_data, struct vfsmount *mnt)
++{
++      return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
++}
++#else
++static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
++                                        int flags, const char *dev_name,
++                                        void *raw_data)
++{
++      return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
++}
++#endif
++
++void mini_fo_kill_block_super(struct super_block *sb)
++{
++      generic_shutdown_super(sb);
++      /*
++       *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
++       *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
++       *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
++       *      locked by fs/fs-writeback.c/402
++       *
++       *      Apparently, someone's not releasing a lock on sb_lock...
++       */
++}
++
++static struct file_system_type mini_fo_fs_type = {
++      .owner          = THIS_MODULE,
++      .name           = "mini_fo",
++      .get_sb         = mini_fo_get_sb,
++      .kill_sb        = mini_fo_kill_block_super,
++      .fs_flags       = 0,
++};
++
++
++#else
++static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
++#endif
++
++static int __init init_mini_fo_fs(void)
++{
++      printk("Registering mini_fo version $Id$\n");
++      return register_filesystem(&mini_fo_fs_type);
++}
++static void __exit exit_mini_fo_fs(void)
++{
++      printk("Unregistering mini_fo version $Id$\n");
++      unregister_filesystem(&mini_fo_fs_type);
++}
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++EXPORT_NO_SYMBOLS;
++#endif
++
++MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
++MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
++MODULE_LICENSE("GPL");
++
++/* MODULE_PARM(fist_debug_var, "i"); */
++/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
++
++module_init(init_mini_fo_fs)
++module_exit(exit_mini_fo_fs)
+--- /dev/null
++++ b/fs/mini_fo/Makefile
+@@ -0,0 +1,17 @@
++#
++# Makefile for mini_fo 2.4 and 2.6 Linux kernels
++#
++# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++#
++# 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.
++#
++
++obj-$(CONFIG_MINI_FO) := mini_fo.o
++mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
++
++# dependencies
++${mini_fo-objs}: mini_fo.h fist.h
++
+--- /dev/null
++++ b/fs/mini_fo/meta.c
+@@ -0,0 +1,1000 @@
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif /* HAVE_CONFIG_H */
++#include "fist.h"
++#include "mini_fo.h"
++
++int meta_build_lists(dentry_t *dentry)
++{
++      struct mini_fo_inode_info *inode_info;
++
++      dentry_t *meta_dentry = 0;
++      file_t *meta_file = 0;
++      mm_segment_t old_fs;
++      void *buf;
++
++      int bytes, len;
++      struct vfsmount *meta_mnt;
++      char *entry;
++
++      inode_info = itopd(dentry->d_inode);
++      if(!(inode_info->deleted_list_size == -1 &&
++           inode_info->renamed_list_size == -1)) {
++              printk(KERN_CRIT "mini_fo: meta_build_lists: \
++                                  Error, list(s) not virgin.\n");
++              return -1;
++      }
++
++      /* init our meta lists */
++      INIT_LIST_HEAD(&inode_info->deleted_list);
++      inode_info->deleted_list_size = 0;
++
++      INIT_LIST_HEAD(&inode_info->renamed_list);
++      inode_info->renamed_list_size = 0;
++
++      /* might there be a META-file? */
++      if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
++              meta_dentry = lookup_one_len(META_FILENAME,
++                                           dtohd2(dentry),
++                                           strlen(META_FILENAME));
++              if(!meta_dentry->d_inode) {
++                      dput(meta_dentry);
++                      goto out_ok;
++              }
++              /* $%& err, is this correct? */
++              meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
++              mntget(meta_mnt);
++
++
++              /* open META-file for reading */
++              meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
++              if(!meta_file || IS_ERR(meta_file)) {
++                      printk(KERN_CRIT "mini_fo: meta_build_lists: \
++                                          ERROR opening META file.\n");
++                      goto out_err;
++              }
++
++              /* check if fs supports reading */
++              if(!meta_file->f_op->read) {
++                      printk(KERN_CRIT "mini_fo: meta_build_lists: \
++                                          ERROR, fs does not support reading.\n");
++                      goto out_err_close;
++              }
++
++              /* allocate a page for transfering the data */
++              buf = (void *) __get_free_page(GFP_KERNEL);
++              if(!buf) {
++                      printk(KERN_CRIT "mini_fo: meta_build_lists: \
++                                          ERROR, out of mem.\n");
++                      goto out_err_close;
++              }
++              meta_file->f_pos = 0;
++              old_fs = get_fs();
++              set_fs(KERNEL_DS);
++              do {
++                      char *c;
++                      bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
++                      if(bytes == PAGE_SIZE) {
++                              /* trim a cut off filename and adjust f_pos to get it next time */
++                              for(c = (char*) buf+PAGE_SIZE;
++                                  *c != '\n';
++                                  c--, bytes--, meta_file->f_pos--);
++                      }
++                      entry = (char *) buf;
++                      while(entry < (char *) buf+bytes) {
++
++                              char *old_path;
++                              char *dir_name;
++                              int old_len, new_len;
++
++                              /* len without '\n'*/
++                              len = (int) (strchr(entry, '\n') - entry);
++                              switch (*entry) {
++                              case 'D':
++                                      /* format: "D filename" */
++                                      meta_list_add_d_entry(dentry,
++                                                            entry+2,
++                                                            len-2);
++                                      break;
++                              case 'R':
++                                      /* format: "R path/xy/dir newDir" */
++                                      old_path = entry+2;
++                                      dir_name = strchr(old_path, ' ') + 1;
++                                      old_len =  dir_name - old_path - 1;
++                                      new_len = ((int) entry) + len - ((int ) dir_name);
++                                      meta_list_add_r_entry(dentry,
++                                                            old_path,
++                                                            old_len,
++                                                            dir_name,
++                                                            new_len);
++                                      break;
++                              default:
++                                      /* unknown entry type detected */
++                                      break;
++                              }
++                              entry += len+1;
++                      }
++
++              } while(meta_file->f_pos < meta_dentry->d_inode->i_size);
++
++              free_page((unsigned long) buf);
++              set_fs(old_fs);
++              fput(meta_file);
++      }
++      goto out_ok;
++
++ out_err_close:
++      fput(meta_file);
++ out_err:
++      mntput(meta_mnt);
++      dput(meta_dentry);
++      return -1;
++ out_ok:
++      return 1; /* check this!!! inode_info->wol_size; */
++}
++
++/* cleanups up all lists and free's the mem by dentry */
++int meta_put_lists(dentry_t *dentry)
++{
++      if(!dentry || !dentry->d_inode) {
++              printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
++              return -1;
++      }
++      return __meta_put_lists(dentry->d_inode);
++}
++
++/* cleanups up all lists and free's the mem by inode */
++int __meta_put_lists(inode_t *inode)
++{
++      int err = 0;
++      if(!inode || !itopd(inode)) {
++              printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
++              return -1;
++      }
++      err = __meta_put_d_list(inode);
++      err |= __meta_put_r_list(inode);
++      return err;
++}
++
++int meta_sync_lists(dentry_t *dentry)
++{
++      int err = 0;
++      if(!dentry || !dentry->d_inode) {
++              printk("mini_fo: meta_sync_lists: \
++                        invalid dentry passed.\n");
++              return -1;
++      }
++      err = meta_sync_d_list(dentry, 0);
++      err |= meta_sync_r_list(dentry, 1);
++      return err;
++}
++
++
++/* remove all D entries from the renamed list and free the mem */
++int __meta_put_d_list(inode_t *inode)
++{
++      struct list_head *tmp;
++        struct deleted_entry *del_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      if(!inode || !itopd(inode)) {
++              printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
++                                  invalid inode passed.\n");
++              return -1;
++      }
++      inode_info = itopd(inode);
++
++        /* nuke the DELETED-list */
++        if(inode_info->deleted_list_size <= 0)
++              return 0;
++
++      while(!list_empty(&inode_info->deleted_list)) {
++              tmp = inode_info->deleted_list.next;
++              list_del(tmp);
++              del_entry = list_entry(tmp, struct deleted_entry, list);
++              kfree(del_entry->name);
++              kfree(del_entry);
++      }
++      inode_info->deleted_list_size = 0;
++
++      return 0;
++}
++
++/* remove all R entries from the renamed list and free the mem */
++int __meta_put_r_list(inode_t *inode)
++{
++      struct list_head *tmp;
++      struct renamed_entry *ren_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      if(!inode || !itopd(inode)) {
++              printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
++              return -1;
++      }
++      inode_info = itopd(inode);
++
++        /* nuke the RENAMED-list */
++        if(inode_info->renamed_list_size <= 0)
++              return 0;
++
++      while(!list_empty(&inode_info->renamed_list)) {
++              tmp = inode_info->renamed_list.next;
++              list_del(tmp);
++              ren_entry = list_entry(tmp, struct renamed_entry, list);
++              kfree(ren_entry->new_name);
++              kfree(ren_entry->old_name);
++              kfree(ren_entry);
++      }
++      inode_info->renamed_list_size = 0;
++
++      return 0;
++}
++
++int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
++{
++      int err = 0;
++      err = meta_list_add_d_entry(dentry, name, len);
++      err |= meta_write_d_entry(dentry,name,len);
++      return err;
++}
++
++/* add a D entry to the deleted list */
++int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
++{
++        struct deleted_entry *del_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      if(!dentry || !dentry->d_inode) {
++              printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
++                                  invalid dentry passed.\n");
++              return -1;
++      }
++      inode_info = itopd(dentry->d_inode);
++
++        if(inode_info->deleted_list_size < 0)
++                return -1;
++
++        del_entry = (struct deleted_entry *)
++              kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
++        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
++        if(!del_entry || !del_entry->name) {
++                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
++                                  out of mem.\n");
++              kfree(del_entry->name);
++              kfree(del_entry);
++                return -ENOMEM;
++        }
++
++        strncpy(del_entry->name, name, len);
++        del_entry->len = len;
++
++        list_add(&del_entry->list, &inode_info->deleted_list);
++        inode_info->deleted_list_size++;
++        return 0;
++}
++
++int meta_add_r_entry(dentry_t *dentry,
++                        const char *old_name, int old_len,
++                        const char *new_name, int new_len)
++{
++      int err = 0;
++      err = meta_list_add_r_entry(dentry,
++                                  old_name, old_len,
++                                  new_name, new_len);
++      err |= meta_write_r_entry(dentry,
++                                old_name, old_len,
++                                new_name, new_len);
++      return err;
++}
++
++/* add a R entry to the renamed list */
++int meta_list_add_r_entry(dentry_t *dentry,
++                        const char *old_name, int old_len,
++                        const char *new_name, int new_len)
++{
++        struct renamed_entry *ren_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      if(!dentry || !dentry->d_inode) {
++              printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
++                                  invalid dentry passed.\n");
++              return -1;
++      }
++      inode_info = itopd(dentry->d_inode);
++
++        if(inode_info->renamed_list_size < 0)
++                return -1;
++
++        ren_entry = (struct renamed_entry *)
++              kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
++        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
++        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
++
++        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
++                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
++                                  out of mem.\n");
++              kfree(ren_entry->new_name);
++              kfree(ren_entry->old_name);
++              kfree(ren_entry);
++                return -ENOMEM;
++        }
++
++        strncpy(ren_entry->old_name, old_name, old_len);
++        ren_entry->old_len = old_len;
++        strncpy(ren_entry->new_name, new_name, new_len);
++        ren_entry->new_len = new_len;
++
++        list_add(&ren_entry->list, &inode_info->renamed_list);
++        inode_info->renamed_list_size++;
++        return 0;
++}
++
++
++int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
++{
++      int err = 0;
++      if(!dentry || !dentry->d_inode) {
++              printk(KERN_CRIT
++                     "mini_fo: meta_remove_r_entry: \
++                        invalid dentry passed.\n");
++              return -1;
++      }
++
++      err = meta_list_remove_r_entry(dentry, name, len);
++      err |= meta_sync_lists(dentry);
++      return err;
++}
++
++int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
++{
++      if(!dentry || !dentry->d_inode) {
++              printk(KERN_CRIT
++                     "mini_fo: meta_list_remove_r_entry: \
++                        invalid dentry passed.\n");
++              return -1;
++      }
++      return __meta_list_remove_r_entry(dentry->d_inode, name, len);
++}
++
++int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
++{
++      struct list_head *tmp;
++        struct renamed_entry *ren_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      if(!inode || !itopd(inode))
++              printk(KERN_CRIT
++                     "mini_fo: __meta_list_remove_r_entry: \
++                        invalid inode passed.\n");
++      inode_info = itopd(inode);
++
++        if(inode_info->renamed_list_size < 0)
++                return -1;
++        if(inode_info->renamed_list_size == 0)
++                return 1;
++
++      list_for_each(tmp, &inode_info->renamed_list) {
++              ren_entry = list_entry(tmp, struct renamed_entry, list);
++              if(ren_entry->new_len != len)
++                      continue;
++
++              if(!strncmp(ren_entry->new_name, name, len)) {
++                      list_del(tmp);
++                      kfree(ren_entry->new_name);
++                      kfree(ren_entry->old_name);
++                      kfree(ren_entry);
++                      inode_info->renamed_list_size--;
++                      return 0;
++              }
++      }
++      return 1;
++}
++
++
++/* append a single D entry to the meta file */
++int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
++{
++      dentry_t *meta_dentry = 0;
++        file_t *meta_file = 0;
++        mm_segment_t old_fs;
++
++        int bytes, err;
++        struct vfsmount *meta_mnt = 0;
++        char *buf;
++
++      err = 0;
++
++      if(itopd(dentry->d_inode)->deleted_list_size < 0) {
++              err = -1;
++              goto out;
++      }
++
++      if(dtopd(dentry)->state == UNMODIFIED) {
++                err = build_sto_structure(dentry->d_parent, dentry);
++                if(err) {
++                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
++                                          build_sto_structure failed.\n");
++                      goto out;
++                }
++        }
++      meta_dentry = lookup_one_len(META_FILENAME,
++                                   dtohd2(dentry), strlen (META_FILENAME));
++
++      /* We need to create a META-file */
++        if(!meta_dentry->d_inode) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++              vfs_create(dtohd2(dentry)->d_inode,
++                         meta_dentry,
++                         S_IRUSR | S_IWUSR,
++                         NULL);
++#else
++                vfs_create(dtohd2(dentry)->d_inode,
++                         meta_dentry,
++                         S_IRUSR | S_IWUSR);
++#endif
++      }
++        /* open META-file for writing */
++        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
++        if(!meta_file || IS_ERR(meta_file)) {
++                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
++                                  ERROR opening meta file.\n");
++                mntput(meta_mnt); /* $%& is this necessary? */
++                dput(meta_dentry);
++              err = -1;
++                goto out;
++        }
++
++        /* check if fs supports writing */
++        if(!meta_file->f_op->write) {
++                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
++                                  ERROR, fs does not support writing.\n");
++                goto out_err_close;
++        }
++
++      meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
++        old_fs = get_fs();
++        set_fs(KERNEL_DS);
++
++      /* size: len for name, 1 for \n and 2 for "D " */
++      buf = (char *) kmalloc(len+3, GFP_KERNEL);
++      if (!buf) {
++              printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
++                                  out of mem.\n");
++              return -ENOMEM;
++      }
++
++      buf[0] = 'D';
++      buf[1] = ' ';
++      strncpy(buf+2, name, len);
++      buf[len+2] = '\n';
++      bytes = meta_file->f_op->write(meta_file, buf, len+3,
++                                     &meta_file->f_pos);
++      if(bytes != len+3) {
++              printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
++                                  ERROR writing.\n");
++              err = -1;
++      }
++      kfree(buf);
++      set_fs(old_fs);
++
++ out_err_close:
++      fput(meta_file);
++ out:
++      return err;
++}
++
++/* append a single R entry to the meta file */
++int meta_write_r_entry(dentry_t *dentry,
++                     const char *old_name, int old_len,
++                     const char *new_name, int new_len)
++{
++      dentry_t *meta_dentry = 0;
++        file_t *meta_file = 0;
++        mm_segment_t old_fs;
++
++        int bytes, err, buf_len;
++      struct vfsmount *meta_mnt = 0;
++        char *buf;
++
++
++      err = 0;
++
++      if(itopd(dentry->d_inode)->renamed_list_size < 0) {
++              err = -1;
++              goto out;
++      }
++
++      /* build the storage structure? */
++      if(dtopd(dentry)->state == UNMODIFIED) {
++                err = build_sto_structure(dentry->d_parent, dentry);
++                if(err) {
++                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
++                                          build_sto_structure failed.\n");
++                      goto out;
++                }
++        }
++      meta_dentry = lookup_one_len(META_FILENAME,
++                                   dtohd2(dentry),
++                                   strlen (META_FILENAME));
++        if(!meta_dentry->d_inode) {
++                /* We need to create a META-file */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++                vfs_create(dtohd2(dentry)->d_inode,
++                         meta_dentry, S_IRUSR | S_IWUSR, NULL);
++#else
++                vfs_create(dtohd2(dentry)->d_inode,
++                         meta_dentry, S_IRUSR | S_IWUSR);
++#endif
++      }
++        /* open META-file for writing */
++        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
++        if(!meta_file || IS_ERR(meta_file)) {
++                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
++                                  ERROR opening meta file.\n");
++                mntput(meta_mnt);
++                dput(meta_dentry);
++              err = -1;
++                goto out;
++        }
++
++        /* check if fs supports writing */
++        if(!meta_file->f_op->write) {
++                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
++                                  ERROR, fs does not support writing.\n");
++                goto out_err_close;
++        }
++
++      meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
++        old_fs = get_fs();
++        set_fs(KERNEL_DS);
++
++      /* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
++      buf_len = old_len + new_len + 4;
++      buf = (char *) kmalloc(buf_len, GFP_KERNEL);
++      if (!buf) {
++              printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
++              return -ENOMEM;
++      }
++
++      buf[0] = 'R';
++      buf[1] = ' ';
++      strncpy(buf + 2, old_name, old_len);
++      buf[old_len + 2] = ' ';
++      strncpy(buf + old_len + 3, new_name, new_len);
++      buf[buf_len -1] = '\n';
++      bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
++      if(bytes != buf_len) {
++              printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
++              err = -1;
++      }
++
++      kfree(buf);
++      set_fs(old_fs);
++
++ out_err_close:
++      fput(meta_file);
++ out:
++      return err;
++}
++
++/* sync D list to disk, append data if app_flag is 1 */
++/* check the meta_mnt, which seems not to be used (properly)  */
++
++int meta_sync_d_list(dentry_t *dentry, int app_flag)
++{
++      dentry_t *meta_dentry;
++        file_t *meta_file;
++        mm_segment_t old_fs;
++
++        int bytes, err;
++        struct vfsmount *meta_mnt;
++        char *buf;
++
++      struct list_head *tmp;
++        struct deleted_entry *del_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      err = 0;
++      meta_file=0;
++      meta_mnt=0;
++
++      if(!dentry || !dentry->d_inode) {
++              printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
++                                  invalid inode passed.\n");
++              err = -1;
++              goto out;
++      }
++      inode_info = itopd(dentry->d_inode);
++
++        if(inode_info->deleted_list_size < 0) {
++              err = -1;
++              goto out;
++      }
++
++      /* ok, there is something to sync */
++
++      /* build the storage structure? */
++        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
++                err = build_sto_structure(dentry->d_parent, dentry);
++                if(err) {
++                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
++                                          build_sto_structure failed.\n");
++                      goto out;
++                }
++        }
++      meta_dentry = lookup_one_len(META_FILENAME,
++                                   dtohd2(dentry),
++                                   strlen(META_FILENAME));
++        if(!meta_dentry->d_inode) {
++                /* We need to create a META-file */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++                vfs_create(dtohd2(dentry)->d_inode,
++                         meta_dentry, S_IRUSR | S_IWUSR, NULL);
++#else
++                vfs_create(dtohd2(dentry)->d_inode,
++                         meta_dentry, S_IRUSR | S_IWUSR);
++#endif
++              app_flag = 0;
++      }
++      /* need we truncate the meta file? */
++      if(!app_flag) {
++              struct iattr newattrs;
++                newattrs.ia_size = 0;
++                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&meta_dentry->d_inode->i_mutex);
++#else
++                down(&meta_dentry->d_inode->i_sem);
++#endif
++                err = notify_change(meta_dentry, &newattrs);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&meta_dentry->d_inode->i_mutex);
++#else
++                up(&meta_dentry->d_inode->i_sem);
++#endif
++
++                if(err || meta_dentry->d_inode->i_size != 0) {
++                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
++                                          ERROR truncating meta file.\n");
++                        goto out_err_close;
++              }
++      }
++
++        /* open META-file for writing */
++        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
++        if(!meta_file || IS_ERR(meta_file)) {
++                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
++                                  ERROR opening meta file.\n");
++              /* we don't mntget so we dont't mntput (for now)
++               * mntput(meta_mnt);
++               */
++              dput(meta_dentry);
++              err = -1;
++                goto out;
++        }
++
++        /* check if fs supports writing */
++        if(!meta_file->f_op->write) {
++                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
++                                  ERROR, fs does not support writing.\n");
++                goto out_err_close;
++        }
++
++      meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
++        old_fs = get_fs();
++        set_fs(KERNEL_DS);
++
++      /* here we go... */
++        list_for_each(tmp, &inode_info->deleted_list) {
++              del_entry = list_entry(tmp, struct deleted_entry, list);
++
++              /* size: len for name, 1 for \n and 2 for "D " */
++              buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
++              if (!buf) {
++                      printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
++                                          out of mem.\n");
++                      return -ENOMEM;
++              }
++
++              buf[0] = 'D';
++              buf[1] = ' ';
++              strncpy(buf+2, del_entry->name, del_entry->len);
++              buf[del_entry->len+2] = '\n';
++              bytes = meta_file->f_op->write(meta_file, buf,
++                                             del_entry->len+3,
++                                             &meta_file->f_pos);
++              if(bytes != del_entry->len+3) {
++                      printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
++                                          ERROR writing.\n");
++                      err |= -1;
++              }
++              kfree(buf);
++      }
++      set_fs(old_fs);
++
++ out_err_close:
++      fput(meta_file);
++ out:
++      return err;
++
++}
++
++int meta_sync_r_list(dentry_t *dentry, int app_flag)
++{
++      dentry_t *meta_dentry;
++        file_t *meta_file;
++        mm_segment_t old_fs;
++
++        int bytes, err, buf_len;
++        struct vfsmount *meta_mnt;
++        char *buf;
++
++      struct list_head *tmp;
++        struct renamed_entry *ren_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      err = 0;
++      meta_file=0;
++      meta_mnt=0;
++
++      if(!dentry || !dentry->d_inode) {
++              printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
++                                  invalid dentry passed.\n");
++              err = -1;
++              goto out;
++      }
++      inode_info = itopd(dentry->d_inode);
++
++        if(inode_info->deleted_list_size < 0) {
++              err = -1;
++              goto out;
++      }
++
++      /* ok, there is something to sync */
++
++      /* build the storage structure? */
++        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
++                err = build_sto_structure(dentry->d_parent, dentry);
++                if(err) {
++                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
++                                          build_sto_structure failed.\n");
++                      goto out;
++                }
++        }
++      meta_dentry = lookup_one_len(META_FILENAME,
++                                   dtohd2(dentry),
++                                   strlen(META_FILENAME));
++        if(!meta_dentry->d_inode) {
++                /* We need to create a META-file */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++                vfs_create(dtohd2(dentry)->d_inode,
++                         meta_dentry, S_IRUSR | S_IWUSR, NULL);
++#else
++                vfs_create(dtohd2(dentry)->d_inode,
++                         meta_dentry, S_IRUSR | S_IWUSR);
++#endif
++              app_flag = 0;
++      }
++      /* need we truncate the meta file? */
++      if(!app_flag) {
++              struct iattr newattrs;
++                newattrs.ia_size = 0;
++                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_lock(&meta_dentry->d_inode->i_mutex);
++#else
++                down(&meta_dentry->d_inode->i_sem);
++#endif
++                err = notify_change(meta_dentry, &newattrs);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&meta_dentry->d_inode->i_mutex);
++#else
++                up(&meta_dentry->d_inode->i_sem);
++#endif
++                if(err || meta_dentry->d_inode->i_size != 0) {
++                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
++                                          ERROR truncating meta file.\n");
++                        goto out_err_close;
++              }
++      }
++
++        /* open META-file for writing */
++        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
++        if(!meta_file || IS_ERR(meta_file)) {
++                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
++                                  ERROR opening meta file.\n");
++              /* we don't mntget so we dont't mntput (for now)
++               * mntput(meta_mnt);
++               */
++              dput(meta_dentry);
++              err = -1;
++                goto out;
++        }
++
++        /* check if fs supports writing */
++        if(!meta_file->f_op->write) {
++                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
++                                  ERROR, fs does not support writing.\n");
++                goto out_err_close;
++        }
++
++      meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
++        old_fs = get_fs();
++        set_fs(KERNEL_DS);
++
++      /* here we go... */
++        list_for_each(tmp, &inode_info->renamed_list) {
++              ren_entry = list_entry(tmp, struct renamed_entry, list);
++              /* size:
++               * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
++              buf_len = ren_entry->old_len + ren_entry->new_len + 4;
++              buf = (char *) kmalloc(buf_len, GFP_KERNEL);
++              if (!buf) {
++                      printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
++                                          out of mem.\n");
++                      return -ENOMEM;
++              }
++              buf[0] = 'R';
++              buf[1] = ' ';
++              strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
++              buf[ren_entry->old_len + 2] = ' ';
++              strncpy(buf + ren_entry->old_len + 3,
++                      ren_entry->new_name, ren_entry->new_len);
++              buf[buf_len - 1] = '\n';
++              bytes = meta_file->f_op->write(meta_file, buf,
++                                             buf_len, &meta_file->f_pos);
++              if(bytes != buf_len) {
++                      printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
++                                          ERROR writing.\n");
++                      err |= -1;
++              }
++              kfree(buf);
++      }
++      set_fs(old_fs);
++
++ out_err_close:
++      fput(meta_file);
++ out:
++      return err;
++}
++
++int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
++{
++      if(!dentry || !dentry->d_inode)
++              printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
++                                  invalid dentry passed.\n");
++      return __meta_check_d_entry(dentry->d_inode, name, len);
++}
++
++int __meta_check_d_entry(inode_t *inode, const char *name, int len)
++{
++      struct list_head *tmp;
++        struct deleted_entry *del_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      if(!inode || !itopd(inode))
++              printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
++                                  invalid inode passed.\n");
++
++        inode_info = itopd(inode);
++
++        if(inode_info->deleted_list_size <= 0)
++                return 0;
++
++        list_for_each(tmp, &inode_info->deleted_list) {
++              del_entry = list_entry(tmp, struct deleted_entry, list);
++              if(del_entry->len != len)
++                      continue;
++
++              if(!strncmp(del_entry->name, name, len))
++                      return 1;
++      }
++      return 0;
++}
++
++/*
++ * check if file has been renamed and return path to orig. base dir.
++ * Implements no error return values so far, what of course sucks.
++ * String is null terminated.'
++ */
++char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
++{
++      if(!dentry || !dentry->d_inode) {
++              printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
++                                  invalid dentry passed.\n");
++              return NULL;
++      }
++      return __meta_check_r_entry(dentry->d_inode, name, len);
++}
++
++char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
++{
++      struct list_head *tmp;
++        struct renamed_entry *ren_entry;
++        struct mini_fo_inode_info *inode_info;
++      char *old_path;
++
++      if(!inode || !itopd(inode)) {
++              printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
++                                  invalid inode passed.\n");
++              return NULL;
++      }
++      inode_info = itopd(inode);
++
++        if(inode_info->renamed_list_size <= 0)
++                return NULL;
++
++        list_for_each(tmp, &inode_info->renamed_list) {
++              ren_entry = list_entry(tmp, struct renamed_entry, list);
++              if(ren_entry->new_len != len)
++                      continue;
++
++              if(!strncmp(ren_entry->new_name, name, len)) {
++                      old_path = (char *)
++                              kmalloc(ren_entry->old_len+1, GFP_KERNEL);
++                      strncpy(old_path,
++                              ren_entry->old_name,
++                              ren_entry->old_len);
++                      old_path[ren_entry->old_len]='\0';
++                      return old_path;
++              }
++      }
++      return NULL;
++}
++
++/*
++ * This version only checks if entry exists and return:
++ *     1 if exists,
++ *     0 if not,
++ *    -1 if error.
++ */
++int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
++{
++      if(!dentry || !dentry->d_inode) {
++              printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
++                                  invalid dentry passed.\n");
++              return -1;
++      }
++      return __meta_is_r_entry(dentry->d_inode, name, len);
++}
++
++int __meta_is_r_entry(inode_t *inode, const char *name, int len)
++{
++      struct list_head *tmp;
++        struct renamed_entry *ren_entry;
++        struct mini_fo_inode_info *inode_info;
++
++      if(!inode || !itopd(inode)) {
++              printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
++                                  invalid inode passed.\n");
++              return -1;
++      }
++      inode_info = itopd(inode);
++
++        if(inode_info->renamed_list_size <= 0)
++                return -1;
++
++        list_for_each(tmp, &inode_info->renamed_list) {
++              ren_entry = list_entry(tmp, struct renamed_entry, list);
++              if(ren_entry->new_len != len)
++                      continue;
++
++              if(!strncmp(ren_entry->new_name, name, len))
++                      return 1;
++      }
++      return 0;
++}
++
+--- /dev/null
++++ b/fs/mini_fo/mini_fo.h
+@@ -0,0 +1,510 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++/*
++ *  $Id$
++ */
++
++#ifndef __MINI_FO_H_
++#define __MINI_FO_H_
++
++#ifdef __KERNEL__
++
++/* META stuff */
++#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
++
++/* use xattrs? */
++#define XATTR
++
++/* File attributes that when changed, result in a file beeing copied to storage */
++#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
++
++/*
++ * mini_fo filestates
++ */
++#define MODIFIED       1
++#define UNMODIFIED     2
++#define CREATED        3
++#define DEL_REWRITTEN  4
++#define DELETED        5
++#define NON_EXISTANT   6
++
++/* fist file systems superblock magic */
++# define MINI_FO_SUPER_MAGIC 0xf15f
++
++/*
++ * STRUCTURES:
++ */
++
++/* mini_fo inode data in memory */
++struct mini_fo_inode_info {
++      inode_t *wii_inode;
++      inode_t *wii_inode2; /* pointer to storage inode */
++
++      /* META-data lists */
++      /* deleted list, ex wol */
++      struct list_head deleted_list;
++      int deleted_list_size;
++
++      /* renamed list */
++      struct list_head renamed_list;
++      int renamed_list_size;
++
++      /* add other lists here ... */
++};
++
++/* mini_fo dentry data in memory */
++struct mini_fo_dentry_info {
++      dentry_t *wdi_dentry;
++      dentry_t *wdi_dentry2; /* pointer to  storage dentry */
++      unsigned int state;  /* state of the mini_fo dentry */
++};
++
++
++/* mini_fo super-block data in memory */
++struct mini_fo_sb_info {
++      super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
++      struct vfsmount *hidden_mnt, *hidden_mnt2;
++      dentry_t *base_dir_dentry;
++      dentry_t *storage_dir_dentry;
++      ;
++};
++
++/* readdir_data, readdir helper struct */
++struct readdir_data {
++      struct list_head ndl_list; /* linked list head ptr */
++      int ndl_size; /* list size */
++      int sto_done; /* flag to show that the storage dir entries have
++                     * all been read an now follow base entries */
++};
++
++/* file private data. */
++struct mini_fo_file_info {
++      struct file *wfi_file;
++      struct file *wfi_file2; /* pointer to storage file */
++      struct readdir_data rd;
++};
++
++/* struct ndl_entry */
++struct ndl_entry {
++      struct list_head list;
++      char *name;
++      int len;
++};
++
++/********************************
++ *  META-data structures
++ ********************************/
++
++/* deleted entry */
++struct deleted_entry {
++      struct list_head list;
++      char *name;
++      int len;
++};
++
++/* renamed entry */
++struct renamed_entry {
++      struct list_head list;
++      char *old_name;     /* old directory with full path */
++      int old_len;        /* length of above string */
++      char *new_name;     /* new directory name */
++      int new_len;        /* length of above string */
++};
++
++/* attr_change entry */
++struct attr_change_entry {
++      struct list_head list;
++      char *name;
++      int len;
++};
++
++/* link entry */
++struct link_entry {
++      struct list_head list;
++      int links_moved;
++      int inum_base;
++      int inum_sto;
++      char *weird_name;
++      int weird_name_len;
++};
++
++
++/* Some other stuff required for mini_fo_filldir64, copied from
++ * fs/readdir.c
++ */
++
++#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
++#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
++
++
++struct linux_dirent64 {
++        u64             d_ino;
++        s64             d_off;
++        unsigned short  d_reclen;
++        unsigned char   d_type;
++        char            d_name[0];
++};
++
++
++struct getdents_callback64 {
++        struct linux_dirent64 * current_dir;
++        struct linux_dirent64 * previous;
++        int count;
++        int error;
++};
++
++struct linux_dirent {
++      unsigned long   d_ino;
++      unsigned long   d_off;
++      unsigned short  d_reclen;
++      char            d_name[1];
++};
++
++struct getdents_callback {
++      struct linux_dirent * current_dir;
++      struct linux_dirent * previous;
++      int count;
++      int error;
++};
++
++
++/*
++ * MACROS:
++ */
++
++/* file TO private_data */
++# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
++# define __ftopd(file) ((file)->private_data)
++/* file TO hidden_file */
++# define ftohf(file) ((ftopd(file))->wfi_file)
++# define ftohf2(file) ((ftopd(file))->wfi_file2)
++
++/* inode TO private_data */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
++# define __itopd(ino) ((ino)->i_private)
++#else
++# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
++# define __itopd(ino) ((ino)->u.generic_ip)
++#endif
++/* inode TO hidden_inode */
++# define itohi(ino) (itopd(ino)->wii_inode)
++# define itohi2(ino) (itopd(ino)->wii_inode2)
++
++/* superblock TO private_data */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
++# define __stopd(super) ((super)->s_fs_info)
++#else
++# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
++# define __stopd(super) ((super)->u.generic_sbp)
++#endif
++
++/* unused? # define vfs2priv stopd */
++/* superblock TO hidden_superblock */
++
++# define stohs(super) (stopd(super)->wsi_sb)
++# define stohs2(super) (stopd(super)->wsi_sb2)
++
++/* dentry TO private_data */
++# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
++# define __dtopd(dentry) ((dentry)->d_fsdata)
++/* dentry TO hidden_dentry */
++# define dtohd(dent) (dtopd(dent)->wdi_dentry)
++# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
++
++/* dentry to state */
++# define dtost(dent) (dtopd(dent)->state)
++# define sbt(sb) ((sb)->s_type->name)
++
++#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
++#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
++
++/* macros to simplify non-SCA code */
++#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
++#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
++#  define FREE_PAGE_POINTERS(hidden_pages, num)
++#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
++#  define FOR_EACH_PAGE
++#  define CURRENT_HIDDEN_PAGE hidden_page
++#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
++#  define CURRENT_HIDDEN_PAGEINDEX page->index
++
++/*
++ * EXTERNALS:
++ */
++extern struct file_operations mini_fo_main_fops;
++extern struct file_operations mini_fo_dir_fops;
++extern struct inode_operations mini_fo_main_iops;
++extern struct inode_operations mini_fo_dir_iops;
++extern struct inode_operations mini_fo_symlink_iops;
++extern struct super_operations mini_fo_sops;
++extern struct dentry_operations mini_fo_dops;
++extern struct vm_operations_struct mini_fo_shared_vmops;
++extern struct vm_operations_struct mini_fo_private_vmops;
++extern struct address_space_operations mini_fo_aops;
++
++#if 0 /* unused by mini_fo */
++extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
++#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
++extern page_t *mini_fo_get1page(file_t *file, int index);
++extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
++# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
++
++
++#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
++#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
++
++extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
++extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
++
++extern int mini_fo_read_file(const char *filename, void *buf, int len);
++extern int mini_fo_write_file(const char *filename, void *buf, int len);
++extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
++#endif /* unused by mini_fo */
++
++/* state transition functions */
++extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
++extern int nondir_del_rew_to_del(dentry_t *dentry);
++extern int nondir_creat_to_del(dentry_t *dentry);
++extern int nondir_mod_to_del(dentry_t *dentry);
++extern int nondir_unmod_to_del(dentry_t *dentry);
++
++extern int dir_unmod_to_mod(dentry_t *dentry);
++
++/* rename specials */
++extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
++extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
++
++/* misc stuff */
++extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
++                               dentry_t *hidden_sto_dentry,
++                               dentry_t *dentry,
++                               super_block_t *sb, int flag);
++
++extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
++                         dentry_t *src_dentry, struct vfsmount *src_mnt);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
++
++extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
++extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
++#else
++extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
++
++extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
++extern int create_sto_reg_file(dentry_t *dentry, int mode);
++#endif
++
++extern int create_sto_dir(dentry_t *dentry, int mode);
++
++extern int exists_in_storage(dentry_t *dentry);
++extern int is_mini_fo_existant(dentry_t *dentry);
++extern int get_neg_sto_dentry(dentry_t *dentry);
++extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
++extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
++extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
++extern int bpath_put(dentry_t *dentry);
++
++/* check_mini_fo types functions */
++extern int check_mini_fo_dentry(dentry_t *dentry);
++extern int check_mini_fo_file(file_t *file);
++extern int check_mini_fo_inode(inode_t *inode);
++
++/* General meta functions, can be called from outside of meta.c */
++extern int meta_build_lists(dentry_t *dentry);
++extern int meta_put_lists(dentry_t *dentry);
++extern int __meta_put_lists(inode_t *inode);
++
++extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
++extern int meta_add_r_entry(dentry_t *dentry,
++                          const char *old_name, int old_len,
++                          const char *new_name, int new_len);
++
++extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
++
++extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
++extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
++
++extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
++extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
++extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
++extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
++
++/* Specific meta functions, should be called only inside meta.c */
++extern int __meta_put_d_list(inode_t *inode);
++extern int __meta_put_r_list(inode_t *inode);
++
++extern int meta_list_add_d_entry(dentry_t *dentry,
++                               const char *name, int len);
++extern int meta_list_add_r_entry(dentry_t *dentry,
++                               const char *old_name, int old_len,
++                               const char *new_name, int new_len);
++
++extern int meta_list_remove_r_entry(dentry_t *dentry,
++                                  const char *name, int len);
++
++extern int __meta_list_remove_r_entry(inode_t *inode,
++                                    const char *name, int len);
++
++extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
++extern int meta_write_r_entry(dentry_t *dentry,
++                            const char *old_name, int old_len,
++                            const char *new_name, int new_len);
++
++extern int meta_sync_lists(dentry_t *dentry);
++extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
++extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
++
++/* ndl stuff */
++extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
++extern void ndl_put_list(struct readdir_data *rd);
++extern int ndl_check_entry(struct readdir_data *rd,
++                         const char *name, int len);
++
++
++# define copy_inode_size(dst, src) \
++    dst->i_size = src->i_size; \
++    dst->i_blocks = src->i_blocks;
++
++static inline void
++fist_copy_attr_atime(inode_t *dest, const inode_t *src)
++{
++      ASSERT(dest != NULL);
++      ASSERT(src != NULL);
++      dest->i_atime = src->i_atime;
++}
++static inline void
++fist_copy_attr_times(inode_t *dest, const inode_t *src)
++{
++      ASSERT(dest != NULL);
++      ASSERT(src != NULL);
++      dest->i_atime = src->i_atime;
++      dest->i_mtime = src->i_mtime;
++      dest->i_ctime = src->i_ctime;
++}
++static inline void
++fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
++{
++      ASSERT(dest != NULL);
++      ASSERT(src != NULL);
++      dest->i_atime = src->i_atime;
++      dest->i_mtime = src->i_mtime;
++      dest->i_ctime = src->i_ctime;
++      copy_inode_size(dest, src);
++}
++static inline void
++fist_copy_attr_all(inode_t *dest, const inode_t *src)
++{
++      ASSERT(dest != NULL);
++      ASSERT(src != NULL);
++      dest->i_mode = src->i_mode;
++      dest->i_nlink = src->i_nlink;
++      dest->i_uid = src->i_uid;
++      dest->i_gid = src->i_gid;
++      dest->i_rdev = src->i_rdev;
++      dest->i_atime = src->i_atime;
++      dest->i_mtime = src->i_mtime;
++      dest->i_ctime = src->i_ctime;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++      dest->i_blksize = src->i_blksize;
++#endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
++      dest->i_blkbits = src->i_blkbits;
++# endif /* linux 2.4.12 and newer */
++      copy_inode_size(dest, src);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++      dest->i_attr_flags = src->i_attr_flags;
++#else
++      dest->i_flags = src->i_flags;
++#endif
++}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++/* copied from linux/fs.h */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++static inline void double_lock(struct dentry *d1, struct dentry *d2)
++{
++      struct mutex *m1 = &d1->d_inode->i_mutex;
++      struct mutex *m2 = &d2->d_inode->i_mutex;
++      if (m1 != m2) {
++              if ((unsigned long) m1 < (unsigned long) m2) {
++                      struct mutex *tmp = m2;
++                      m2 = m1; m1 = tmp;
++              }
++              mutex_lock(m1);
++      }
++      mutex_lock(m2);
++}
++
++static inline void double_unlock(struct dentry *d1, struct dentry *d2)
++{
++      struct mutex *m1 = &d1->d_inode->i_mutex;
++      struct mutex *m2 = &d2->d_inode->i_mutex;
++      mutex_unlock(m1);
++      if (m1 != m2)
++              mutex_unlock(m2);
++      dput(d1);
++      dput(d2);
++}
++
++#else
++static inline void double_down(struct semaphore *s1, struct semaphore *s2)
++{
++        if (s1 != s2) {
++                if ((unsigned long) s1 < (unsigned long) s2) {
++                        struct semaphore *tmp = s2;
++                        s2 = s1; s1 = tmp;
++                }
++                down(s1);
++        }
++        down(s2);
++}
++
++static inline void double_up(struct semaphore *s1, struct semaphore *s2)
++{
++        up(s1);
++        if (s1 != s2)
++                up(s2);
++}
++
++static inline void double_lock(struct dentry *d1, struct dentry *d2)
++{
++        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
++}
++
++static inline void double_unlock(struct dentry *d1, struct dentry *d2)
++{
++        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
++        dput(d1);
++        dput(d2);
++}
++#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
++#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
++#endif /* __KERNEL__ */
++
++/*
++ * Definitions for user and kernel code
++ */
++
++/* ioctls */
++
++#endif        /* not __MINI_FO_H_ */
+--- /dev/null
++++ b/fs/mini_fo/mini_fo-merge
+@@ -0,0 +1,180 @@
++#!/bin/bash
++#
++# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
++# 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.
++#
++
++BASE=
++STO=
++HELP=
++DRYRUN=
++VERBOSE=
++TMP="/tmp/"
++META_NAME="META_dAfFgHE39ktF3HD2sr"
++SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
++
++COMMAND=
++exec_command()
++{
++    if [ x$DRYRUN == "xset" ]; then
++      echo "  would run: $COMMAND"
++    elif ! [ x$DRYRUN == "xset" ]; then
++      if [ x$VERBOSE == "xset" ]; then
++          echo "  running: $COMMAND"
++      fi
++      eval $COMMAND
++    fi
++}
++
++usage()
++{
++cat <<EOF
++
++USAGE: $0 -b <base dir> -s <storage dir>
++Version 0.1
++
++This script merges the contents of a mini_fo storage file system back
++to the base file system.
++
++!!! Warning: This will modify the base filesystem and can destroy data
++             if used wrongly.
++
++Options:
++     -b <base dir>
++          the directory of the base file system.
++
++     -s <storage dir>
++          the directory of the storage file system.
++
++     -d   dry run, will not change anything and print the commands that
++          would be executed.
++
++     -t   tmp dir for storing temporary file. default: $TMP
++
++     -v   show what operations are performed.
++
++     -h   displays this message.
++
++EOF
++}
++
++# parse parameters
++while getopts hdvt:b:s: OPTS
++  do
++  case $OPTS in
++      h)  HELP="set";;
++      d)  DRYRUN="set";;
++      v)  VERBOSE="set";;
++      b)  BASE="$OPTARG";;
++      s)  STO="$OPTARG";;
++      t)  TMP="$OPTARG";;
++      ?)  usage
++        exit 1;;
++  esac
++done
++
++if [ "x$HELP" == "xset" ]; then
++    usage
++    exit -1
++fi
++
++if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
++    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
++    exit -1;
++fi
++
++# get full paths
++pushd $STO; STO=`pwd`; popd
++pushd $BASE; BASE=`pwd`; popd
++TMP=${TMP%/}
++
++
++cat<<EOF
++###############################################################################
++# mini_fo-merge
++#
++# base dir:       $BASE
++# storage dir:    $STO
++# meta filename:  $META_NAME
++# dry run:        $DRYRUN
++# verbose:        $VERBOSE
++# tmp files:      $TMP
++###############################################################################
++
++EOF
++
++rm $TMP/$SKIP_DEL_LIST
++
++# first process all renamed dirs
++echo "Merging renamed directories..."
++pushd $STO &> /dev/null
++find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
++    echo "entry: $ENTRY"
++    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
++    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
++    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
++    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
++    echo "META_FILE: $META_FILE"
++    echo "OLD_B_DIR: $OLD_B_DIR"
++    echo "NEW_NAME: $NEW_NAME"
++    echo  "NEW_B_DIR: $NEW_B_DIR"
++
++    pushd $BASE &> /dev/null
++    # remove an existing dir in storage
++    COMMAND="rm -rf $NEW_B_DIR"; exec_command
++    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
++    echo ""
++    popd &> /dev/null
++
++    # remember this dir to exclude it from deleting later
++    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
++done
++
++# delete all whiteouted files from base
++echo -e "\nDeleting whiteout'ed files from base file system..."
++find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
++    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
++    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
++    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
++    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
++    if [ $? -ne 0 ]; then
++      pushd $BASE &> /dev/null
++      COMMAND="rm -rf $DEL_FILE"; exec_command
++      popd &> /dev/null
++    else
++      echo "  excluding: $DEL_FILE as in skip-del-list."
++    fi
++done
++
++# create all dirs and update permissions
++echo -e "\nSetting up directory structures in base file system..."
++find . -type d | sed -e 's/^\.\///' | while read DIR; do
++    PERMS=`stat -c %a $DIR`
++    DIR_UID=`stat -c %u $DIR`
++    DIR_GID=`stat -c %g $DIR`
++    pushd $BASE &> /dev/null
++    if ! [ -d $DIR ]; then
++      COMMAND="mkdir -p $DIR"; exec_command
++    fi
++    COMMAND="chmod $PERMS $DIR"; exec_command
++    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
++    popd &> /dev/null
++done
++
++# merge all non-directory files
++echo -e "\nMerging all non-directory files...."
++for i in b c p f l s; do
++    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
++      pushd $BASE #&> /dev/null
++      COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
++      popd &> /dev/null
++    done
++done
++popd &> /dev/null
++
++#rm $TMP/$SKIP_DEL_LIST
++
++echo "Done!"
+--- /dev/null
++++ b/fs/mini_fo/mini_fo-overlay
+@@ -0,0 +1,130 @@
++#!/bin/bash
++#
++# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
++# 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.
++#
++
++HELP=
++SUFF=
++MNTP=
++MNT_DIR="/mnt"
++STO=
++STO_DIR="/tmp"
++BASE=
++
++usage()
++{
++cat <<EOF
++
++Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
++Version 0.1
++
++This script overlays the given base directory using the mini_fo file
++system. If only the base directory base_dir is given, $0
++will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
++and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
++
++Options:
++     -s <suffix>
++          add given suffix to storage directory and the mount
++          point. This is usefull for overlaying one base directory
++          several times and avoiding conflicts with storage directory
++          names and mount points.
++
++     -d <sto_dir_dir>
++          change the directory in which the storage directory will be
++          created (default is currently "$STO_DIR".
++
++     -m <mount point>
++          use an alternative directory to create the mini_fo
++          mountpoint (default is currently "$MNT_DIR".
++
++     -h   displays this message.
++
++EOF
++exit 1;
++}
++
++while getopts hm:s:d: OPTS
++  do
++  case $OPTS in
++      s)  SUFF="$OPTARG";;
++      d)  STO_DIR="$OPTARG";;
++      m)  MNT_DIR="$OPTARG";;
++      h)  HELP="set";;
++      ?)  usage
++        exit 1;;
++  esac
++done
++shift $(($OPTIND - 1))
++
++BASE="$1"
++
++if [ "x$HELP" == "xset" ]; then
++    usage
++    exit -1
++fi
++
++# fix suffix
++if [ "x$SUFF" != "x" ]; then
++    SUFF="-$SUFF"
++fi
++
++# kill trailing slashes
++MNT_DIR=${MNT_DIR%/}
++STO_DIR=${STO_DIR%/}
++BASE=${BASE%/}
++
++
++if ! [ -d "$BASE" ]; then
++    echo "invalid base dir $BASE, run $0 -h for help."
++    exit -1
++fi
++
++# check opts
++if ! [ -d "$MNT_DIR" ]; then
++    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
++    exit -1
++fi
++
++if ! [ -d "$STO_DIR" ]; then
++    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
++    exit -1
++fi
++
++MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
++STO="$STO_DIR/sto-`basename $BASE`$SUFF"
++
++# create the mount point if it doesn't exist
++mkdir -p $MNTP
++if [ $? -ne 0 ]; then
++    echo "Error, failed to create mount point $MNTP"
++fi
++
++mkdir -p $STO
++if [ $? -ne 0 ]; then
++    echo "Error, failed to create storage dir $STO"
++fi
++
++# check if fs is already mounted
++mount | grep mini_fo | grep $MNTP &> /dev/null
++if [ $? -eq 0 ]; then
++    echo "Error, existing mini_fo mount at $MNTP."
++    exit -1
++fi
++
++mount | grep mini_fo | grep $STO &> /dev/null
++if [ $? -eq 0 ]; then
++    echo "Error, $STO seems to be used already."
++    exit -1
++fi
++
++# mount
++mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
++
++if [ $? -ne 0 ]; then
++    echo "Error, mounting failed, maybe no permisson to mount?"
++fi
+--- /dev/null
++++ b/fs/mini_fo/mmap.c
+@@ -0,0 +1,637 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++/*
++ *  $Id$
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif /* HAVE_CONFIG_H */
++
++#include "fist.h"
++#include "mini_fo.h"
++
++
++#ifdef FIST_COUNT_WRITES
++/* for counting writes in the middle vs. regular writes */
++unsigned long count_writes = 0, count_writes_middle = 0;
++#endif /* FIST_COUNT_WRITES */
++
++/* forward declaration of commit write and prepare write */
++STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
++STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
++
++
++/*
++ * Function for handling creation of holes when lseek-ing past the
++ * end of the file and then writing some data.
++ */
++int
++mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
++{
++      int err = 0;
++      dentry_t *dentry = file->f_dentry;
++      inode_t *inode = dentry->d_inode;
++      page_t *tmp_page;
++      int index;
++
++      print_entry_location();
++
++      for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
++              tmp_page = mini_fo_get1page(file, index);
++              if (IS_ERR(tmp_page)) {
++                      err = PTR_ERR(tmp_page);
++                      goto out;
++              }
++
++              /*
++               * zero out rest of the contents of the page between the appropriate
++               * offsets.
++               */
++              memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
++
++              if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
++                      err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
++
++              page_cache_release(tmp_page);
++              if (err < 0)
++                      goto out;
++              if (current->need_resched)
++                      schedule();
++      }
++
++      /* zero out appropriate parts of last page */
++
++      /*
++       * if the encoding type is block, then adjust the 'from' (where the
++       * zeroing will start) offset appropriately
++       */
++      from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
++
++      if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
++
++              memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
++              if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
++                      err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
++
++              if (err < 0)
++                      goto out;
++              if (current->need_resched)
++                      schedule();
++      }
++
++ out:
++      print_exit_status(err);
++      return err;
++}
++
++
++
++STATIC int
++mini_fo_writepage(page_t *page)
++{
++      int err = -EIO;
++      inode_t *inode;
++      inode_t *hidden_inode;
++      page_t *hidden_page;
++      char *kaddr, *hidden_kaddr;
++
++      print_entry_location();
++
++      inode = page->mapping->host;
++      hidden_inode = itohi(inode);
++
++      /*
++       * writepage is called when shared mmap'ed files need to write
++       * their pages, while prepare/commit_write are called from the
++       * non-paged write() interface.  (However, in 2.3 the two interfaces
++       * share the same cache, while in 2.2 they didn't.)
++       *
++       * So we pretty much have to duplicate much of what commit_write does.
++       */
++
++      /* find lower page (returns a locked page) */
++      hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
++      if (!hidden_page)
++              goto out;
++
++      /* get page address, and encode it */
++      kaddr = (char *) kmap(page);
++      hidden_kaddr = (char*) kmap(hidden_page);
++      mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
++      /* if encode_block could fail, then return error */
++      kunmap(page);
++      kunmap(hidden_page);
++
++      /* call lower writepage (expects locked page) */
++      err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
++
++      /*
++       * update mtime and ctime of lower level file system
++       * mini_fo' mtime and ctime are updated by generic_file_write
++       */
++      hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
++      UnlockPage(hidden_page);        /* b/c grab_cache_page locked it */
++# endif /* kernel older than 2.4.1 */
++      page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
++
++      if (err)
++              ClearPageUptodate(page);
++      else
++              SetPageUptodate(page);
++ out:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
++      UnlockPage(page);
++# endif /* kernel 2.4.1 and newer */
++      print_exit_status(err);
++      return err;
++}
++
++
++/*
++ * get one page from cache or lower f/s, return error otherwise.
++ * returns unlocked, up-to-date page (if ok), with increased refcnt.
++ */
++page_t *
++mini_fo_get1page(file_t *file, int index)
++{
++      page_t *page;
++      dentry_t *dentry;
++      inode_t *inode;
++      struct address_space *mapping;
++      int err;
++
++      print_entry_location();
++
++      dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
++      inode = dentry->d_inode;
++      mapping = inode->i_mapping;
++
++      fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
++      if (index < 0) {
++              printk("%s BUG: index=%d\n", __FUNCTION__, index);
++              page = ERR_PTR(-EIO);
++              goto out;
++      }
++      page = read_cache_page(mapping,
++                             index,
++                             (filler_t *) mapping->a_ops->readpage,
++                             (void *) file);
++      if (IS_ERR(page))
++              goto out;
++      wait_on_page(page);
++      if (!Page_Uptodate(page)) {
++              lock_page(page);
++              err = mapping->a_ops->readpage(file, page);
++              if (err) {
++                      page = ERR_PTR(err);
++                      goto out;
++              }
++              wait_on_page(page);
++              if (!Page_Uptodate(page)) {
++                      page = ERR_PTR(-EIO);
++                      goto out;
++              }
++      }
++
++ out:
++      print_exit_pointer(page);
++      return page;
++}
++
++
++/*
++ * get one page from cache or lower f/s, return error otherwise.
++ * similar to get1page, but doesn't guarantee that it will return
++ * an unlocked page.
++ */
++page_t *
++mini_fo_get1page_cached(file_t *file, int index)
++{
++      page_t *page;
++      dentry_t *dentry;
++      inode_t *inode;
++      struct address_space *mapping;
++      int err;
++
++      print_entry_location();
++
++      dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
++      inode = dentry->d_inode;
++      mapping = inode->i_mapping;
++
++      fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
++      if (index < 0) {
++              printk("%s BUG: index=%d\n", __FUNCTION__, index);
++              page = ERR_PTR(-EIO);
++              goto out;
++      }
++      page = read_cache_page(mapping,
++                             index,
++                             (filler_t *) mapping->a_ops->readpage,
++                             (void *) file);
++      if (IS_ERR(page))
++              goto out;
++
++ out:
++      print_exit_pointer(page);
++      return page;
++}
++
++
++/*
++ * readpage is called from generic_page_read and the fault handler.
++ * If your file system uses generic_page_read for the read op, it
++ * must implement readpage.
++ *
++ * Readpage expects a locked page, and must unlock it.
++ */
++STATIC int
++mini_fo_do_readpage(file_t *file, page_t *page)
++{
++      int err = -EIO;
++      dentry_t *dentry;
++      file_t *hidden_file = NULL;
++      dentry_t *hidden_dentry;
++      inode_t *inode;
++      inode_t *hidden_inode;
++      char *page_data;
++      page_t *hidden_page;
++      char *hidden_page_data;
++      int real_size;
++
++      print_entry_location();
++
++      dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
++      if (ftopd(file) != NULL)
++              hidden_file = ftohf(file);
++      hidden_dentry = dtohd(dentry);
++      inode = dentry->d_inode;
++      hidden_inode = itohi(inode);
++
++      fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
++
++      MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
++      MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
++      FOR_EACH_PAGE
++              CURRENT_HIDDEN_PAGE = NULL;
++
++      /* find lower page (returns a locked page) */
++      FOR_EACH_PAGE {
++              fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
++              CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
++                                                    CURRENT_HIDDEN_PAGEINDEX,
++                                                    (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
++                                                    (void *) hidden_file);
++              if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
++                      err = PTR_ERR(CURRENT_HIDDEN_PAGE);
++                      CURRENT_HIDDEN_PAGE = NULL;
++                      goto out_release;
++              }
++      }
++
++      /*
++       * wait for the page data to show up
++       * (signaled by readpage as unlocking the page)
++       */
++      FOR_EACH_PAGE {
++              wait_on_page(CURRENT_HIDDEN_PAGE);
++              if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
++                      /*
++                       * call readpage() again if we returned from wait_on_page with a
++                       * page that's not up-to-date; that can happen when a partial
++                       * page has a few buffers which are ok, but not the whole
++                       * page.
++                       */
++                      lock_page(CURRENT_HIDDEN_PAGE);
++                      err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
++                                                                     CURRENT_HIDDEN_PAGE);
++                      if (err) {
++                              CURRENT_HIDDEN_PAGE = NULL;
++                              goto out_release;
++                      }
++                      wait_on_page(CURRENT_HIDDEN_PAGE);
++                      if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
++                              err = -EIO;
++                              goto out_release;
++                      }
++              }
++      }
++
++      /* map pages, get their addresses */
++      page_data = (char *) kmap(page);
++      FOR_EACH_PAGE
++              CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
++
++      /* if decode_block could fail, then return error */
++      err = 0;
++      real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
++      if (real_size <= 0)
++              memset(page_data, 0, PAGE_CACHE_SIZE);
++      else if (real_size < PAGE_CACHE_SIZE) {
++              mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
++              memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
++      } else
++              mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
++
++      FOR_EACH_PAGE
++              kunmap(CURRENT_HIDDEN_PAGE);
++      kunmap(page);
++
++ out_release:
++      FOR_EACH_PAGE
++              if (CURRENT_HIDDEN_PAGE)
++                      page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
++
++      FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
++      FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
++
++ out:
++      if (err == 0)
++              SetPageUptodate(page);
++      else
++              ClearPageUptodate(page);
++
++      print_exit_status(err);
++      return err;
++}
++
++
++STATIC int
++mini_fo_readpage(file_t *file, page_t *page)
++{
++      int err;
++      print_entry_location();
++
++      err = mini_fo_do_readpage(file, page);
++
++      /*
++       * we have to unlock our page, b/c we _might_ have gotten a locked page.
++       * but we no longer have to wakeup on our page here, b/c UnlockPage does
++       * it
++       */
++      UnlockPage(page);
++
++      print_exit_status(err);
++      return err;
++}
++
++
++STATIC int
++mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
++{
++      int err = 0;
++
++      print_entry_location();
++
++      /*
++       * we call kmap(page) only here, and do the kunmap
++       * and the actual downcalls, including unlockpage and uncache
++       * in commit_write.
++       */
++      kmap(page);
++
++      /* fast path for whole page writes */
++      if (from == 0 && to == PAGE_CACHE_SIZE)
++              goto out;
++      /* read the page to "revalidate" our data */
++      /* call the helper function which doesn't unlock the page */
++      if (!Page_Uptodate(page))
++              err = mini_fo_do_readpage(file, page);
++
++ out:
++      print_exit_status(err);
++      return err;
++}
++
++
++
++STATIC int
++mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
++{
++      int err = -ENOMEM;
++      inode_t *inode;
++      inode_t *hidden_inode;
++      page_t *hidden_page;
++      file_t *hidden_file = NULL;
++      loff_t pos;
++      unsigned bytes = to - from;
++      unsigned hidden_from, hidden_to, hidden_bytes;
++
++      print_entry_location();
++
++      inode = page->mapping->host; /* CPW: Moved below print_entry_location */
++      hidden_inode = itohi(inode);
++
++      ASSERT(file != NULL);
++      /*
++       * here we have a kmapped page, with data from the user copied
++       * into it.  we need to encode_block it, and then call the lower
++       * commit_write.  We also need to simulate same behavior of
++       * generic_file_write, and call prepare_write on the lower f/s first.
++       */
++#ifdef FIST_COUNT_WRITES
++      count_writes++;
++# endif /* FIST_COUNT_WRITES */
++
++      /* this is append and/or extend -- we can't have holes so fill them in */
++      if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
++              page_t *tmp_page;
++              int index;
++              for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
++                      tmp_page = mini_fo_get1page(file, index);
++                      if (IS_ERR(tmp_page)) {
++                              err = PTR_ERR(tmp_page);
++                              goto out;
++                      }
++                      /* zero out the contents of the page at the appropriate offsets */
++                      memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
++                      if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
++                              err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
++                      page_cache_release(tmp_page);
++                      if (err < 0)
++                              goto out;
++                      if (current->need_resched)
++                              schedule();
++              }
++      }
++
++      if (ftopd(file) != NULL)
++              hidden_file = ftohf(file);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_inode->i_mutex);
++#else
++      down(&hidden_inode->i_sem);
++#endif
++      /* find lower page (returns a locked page) */
++      hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
++      if (!hidden_page)
++              goto out;
++
++#if FIST_ENCODING_BLOCKSIZE > 1
++#  error encoding_blocksize greater than 1 is not yet supported
++# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
++
++      hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
++      hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
++      if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
++
++              /*
++               * if this call to commit_write had introduced holes and the code
++               * for handling holes was invoked, then the beginning of this page
++               * must be zeroed out
++               * zero out bytes from 'size_of_file%pagesize' to 'from'.
++               */
++              if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
++                      memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
++
++      }
++      hidden_bytes = hidden_to - hidden_from;
++
++      /* call lower prepare_write */
++      err = -EINVAL;
++      if (hidden_inode->i_mapping &&
++          hidden_inode->i_mapping->a_ops &&
++          hidden_inode->i_mapping->a_ops->prepare_write)
++              err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
++                                                                  hidden_page,
++                                                                  hidden_from,
++                                                                  hidden_to);
++      if (err)
++              /* don't leave locked pages behind, esp. on an ENOSPC */
++              goto out_unlock;
++
++      fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
++      mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
++      /* if encode_block could fail, then goto unlock and return error */
++
++      /* call lower commit_write */
++      err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
++                                                         hidden_page,
++                                                         hidden_from,
++                                                         hidden_to);
++
++      if (err < 0)
++              goto out_unlock;
++
++      err = bytes;    /* convert error to no. of bytes */
++
++      inode->i_blocks = hidden_inode->i_blocks;
++      /* we may have to update i_size */
++      pos = (page->index << PAGE_CACHE_SHIFT) + to;
++      if (pos > inode->i_size)
++              inode->i_size = pos;
++
++      /*
++       * update mtime and ctime of lower level file system
++       * mini_fo' mtime and ctime are updated by generic_file_write
++       */
++      hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
++
++      mark_inode_dirty_sync(inode);
++
++ out_unlock:
++      UnlockPage(hidden_page);
++      page_cache_release(hidden_page);
++      kunmap(page);           /* kmap was done in prepare_write */
++ out:
++      /* we must set our page as up-to-date */
++      if (err < 0)
++              ClearPageUptodate(page);
++      else
++              SetPageUptodate(page);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_inode->i_mutex);
++#else
++      up(&hidden_inode->i_sem);
++#endif
++      print_exit_status(err);
++      return err;                     /* assume all is ok */
++}
++
++
++STATIC int
++mini_fo_bmap(struct address_space *mapping, long block)
++{
++      int err = 0;
++      inode_t *inode;
++      inode_t *hidden_inode;
++
++      print_entry_location();
++
++      inode = (inode_t *) mapping->host;
++      hidden_inode = itohi(inode);
++
++      if (hidden_inode->i_mapping->a_ops->bmap)
++              err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
++      print_exit_location();
++      return err;
++}
++
++
++/*
++ * This function is copied verbatim from mm/filemap.c.
++ * XXX: It should be simply moved to some header file instead -- bug Al about it!
++ */
++static inline int sync_page(struct page *page)
++{
++      struct address_space *mapping = page->mapping;
++
++      if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
++              return mapping->a_ops->sync_page(page);
++      return 0;
++}
++
++
++/*
++ * XXX: we may not need this function if not FIST_FILTER_DATA.
++ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
++ */
++STATIC int
++mini_fo_sync_page(page_t *page)
++{
++      int err = 0;
++      inode_t *inode;
++      inode_t *hidden_inode;
++      page_t *hidden_page;
++
++      print_entry_location();
++
++      inode = page->mapping->host; /* CPW: Moved below print_entry_location */
++      hidden_inode = itohi(inode);
++
++      /* find lower page (returns a locked page) */
++      hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
++      if (!hidden_page)
++              goto out;
++
++      err = sync_page(hidden_page);
++
++      UnlockPage(hidden_page);        /* b/c grab_cache_page locked it */
++      page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
++
++ out:
++      print_exit_status(err);
++      return err;
++}
+--- /dev/null
++++ b/fs/mini_fo/README
+@@ -0,0 +1,163 @@
++README for the mini_fo overlay file system
++=========================================
++
++
++WHAT IS MINI_FO?
++----------------
++
++mini_fo is a virtual kernel file system that can make read-only
++file systems writable. This is done by redirecting modifying operations
++to a writeable location called "storage directory", and leaving the
++original data in the "base directory" untouched. When reading, the
++file system merges the modifed and original data so that only the
++newest versions will appear. This occurs transparently to the user,
++who can access the data like on any other read-write file system.
++
++Base and storage directories may be located on the same or on
++different partitions and may be of different file system types. While
++the storage directory obviously needs to be writable, the base may or
++may not be writable, what doesn't matter as it will no be modified
++anyway.
++
++
++WHAT IS GOOD FOR?
++-----------------
++
++The primary purpose of the mini_fo file system is to allow easy
++software updates to embedded systems, that often store their root
++file system in a read-only flash file system, but there are many
++more as for example sandboxing, or for allowing live-cds to
++permanently store information.
++
++
++BUILDING
++--------
++This should be simple. Adjust the Makefile to point to the correct
++kernel headers you want to build the module for. Then:
++
++    # make
++
++should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
++kernel.
++
++If you are building the module for you current kernel, you can install
++the module (as root):
++
++    # make install
++
++or uninstall with
++
++    # make uninstall
++
++
++USING THE FILE SYSTEM
++--------------------
++
++the general mount syntax is:
++
++   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
++                            <base directory> <mount point>
++
++Example:
++
++You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
++on it:
++
++load the module (as root)
++
++    # insmod mini_fo.o for a 2.4 kernel or
++
++    # insmod mini_fo.ko for a 2.6 kernel
++
++
++create a storage dir in tmp and a mountpoint for mini_fo:
++
++    # mkdir /tmp/sto
++    # mkdir /mnt/mini_fo
++
++and mount the mini_fo file system:
++
++    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
++
++
++Now the data stored on the cd can be accessed via the mini_fo
++mountpoint just like any read-write file system, files can be modified
++and deleted, new ones can be created and so on. When done unmount the
++file system:
++
++    # unmount /mnt/mini_fo
++
++Note that if the file system is mounted again using the same storage
++file system, of course it will appear in the modified state again. If
++you remount it using an new empty storage directory, it will be
++unmodified. Therefore by executing:
++
++    # cd /tmp/sto
++    # rm -rf *
++
++you can nuke all the changes you made to the original file system. But
++ remember NEVER do this while the mini_fo file system is mounted!
++
++
++Alternatively you can use the mini_fo-overlay bash script, that
++simplifies managing mini_fo mounts. See TOOLS Section.
++
++
++TOOLS
++-----
++
++mini_fo-merge (experimental):
++
++This is a bash script that will merge changes contained in the storage
++directory back to the base directory. This allows mini_fo to function
++as a cache file system by overlaying a slow (network, ...) file system
++and using a fast (ramdisk, ...) as storage. When done, changes can be
++merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
++-h" for details.
++
++It can be usefull for merging changes back after a successfull test
++(patches, software updates...)
++
++
++mini_fo-overlay:
++
++This bash script simplifies managing one or more mini_fo mounts. For
++overlaying a directory called "basedir1", you can just call:
++
++    # mini_fo-overlay basedir1
++
++This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
++as storage to "/mnt/mini_fo-basedir1/". It has more options though,
++type "mini_fo-overlay -h" for details.
++
++
++DOCUMENTATION, REPORTING BUGS, GETTING HELP
++-------------------------------------------
++
++Please visit the mini_fo project page at:
++
++http://www.denx.de/twiki/bin/view/Know/MiniFOHome
++
++
++WARNINGS
++--------
++
++Never modify the base or the storage directorys while the mini_fo
++file system is mounted, or you might crash you system. Simply accessing
++and reading should not cause any trouble.
++
++Exporting a mini_fo mount point via NFS has not been tested, and may
++or may not work.
++
++Check the RELEASE_NOTES for details on bugs and features.
++
++
++
++Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++
++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.
++
++
+--- /dev/null
++++ b/fs/mini_fo/RELEASE_NOTES
+@@ -0,0 +1,111 @@
++Release:      mini_fo-0.6.1 (v0-6-1)
++Date:         21.09.2005
++
++
++Changes:
++--------
++v0-6-1:
++
++- bugfixes (see ChangeLog)
++
++- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
++  README for details).
++
++v0-6-0:
++
++- Support for 2.4 and 2.6 (see Makefile)
++
++- Partial hard link support (creating works as expected, but already
++  existing links in the base file system will be treated as if they
++  were individual files).
++
++- Various bugfixes and cleanups.
++
++
++v0-6-0-pre1:
++
++- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
++  many vital mini_fo parts such as the old whiteout list code which
++  has been replaced by the new META subsystem.
++
++- Light weight directory renaming implemented. This means if a
++  directory is renamed via the mini_fo filesystem this will no longer
++  result in a complete copy in storage, instead only one empty
++  directory will be created. All base filed contained in the original
++  directory stay there until modified.
++
++- Special files (creating, renaming, deleting etc.) now working.
++
++- Many bugfixes and cleanup, mini_fo is now a lot more stable.
++
++
++v0-5-10:
++
++- Final release of the 0-5-* versions. Next will be a complete rewrite
++  of many features. This release contains several bugfixes related to
++  directory renaming.
++
++
++v0-5-10-pre6:
++
++- Lots of cleanup and several bugfixes related to directory deleting
++
++- Directory renaming suddenly works, what is most likely due to the
++  fact tha that "mv" is smart: if the classic rename doesn't work it
++  will assume that source and target file are on different fs and will
++  copy the directory and try to remove the source directory. Until
++  directory removing wasn't implemented, it would fail to do this and
++  rollback.
++  So, directory renaming works for now, but it doesn't yet do what you
++  would expect from a overlay fs, so use with care.
++
++
++v0-5-10-pre5:
++
++- implemented directory deleting
++- made parsing of mount options more stable
++- New format of mount options! (See README)
++- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
++  happily assume it never existed!
++
++
++Implemented features:
++---------------------
++
++- creating hard links (see BUGS on already existing hard links)
++- lightweight directory renaming
++- renaming device files, pipes, sockets, etc.
++- creating, renaming, deleting of special files
++- deleting directorys
++- general directory reading (simple "ls" )
++- creating files in existing directorys
++- creating directorys
++- renaming files.
++- reading and writing files (involves opening)
++- appending to files (creates copy in storage)
++- deleting files
++- llseek works too, what allows editors to work
++- persistency (a deleted file stay deleted over remounts)
++- use of symbolic links
++- creating of device files
++
++
++Not (yet) implemented features:
++-------------------------------
++
++- full hard link support.
++
++
++
++BUGS:
++-----
++
++Hard links in the base file system will be treated as individual
++files, not as links to one inode.
++
++The main problem with hard links isn't allowing to create them, but
++their pure existence. If you modify a base hard link, the changes made
++will only show up on this link, the other link will remain in the
++original state. I hope to fix this someday. Please note that this does
++not effect the special hard links '.' and '..', that are handled
++seperately by the lower fs.
+--- /dev/null
++++ b/fs/mini_fo/state.c
+@@ -0,0 +1,620 @@
++/*
++ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif /* HAVE_CONFIG_H */
++
++#include "fist.h"
++#include "mini_fo.h"
++
++
++/* create the storage file, setup new states */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
++#else
++int create_sto_reg_file(dentry_t *dentry, int mode)
++#endif
++{
++      int err = 0;
++      inode_t *dir;
++      dentry_t *hidden_sto_dentry;
++      dentry_t *hidden_sto_dir_dentry;
++
++      if(exists_in_storage(dentry)) {
++              printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
++              err = -EINVAL;
++              goto out;
++      }
++      err = get_neg_sto_dentry(dentry);
++
++      if (err) {
++              printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
++              goto out;
++      }
++
++      dir = dentry->d_parent->d_inode;
++      hidden_sto_dentry = dtohd2(dentry);
++
++      /* lock parent */
++      hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++        down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++      err = PTR_ERR(hidden_sto_dir_dentry);
++        if (IS_ERR(hidden_sto_dir_dentry))
++                goto out;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++      err = vfs_create(hidden_sto_dir_dentry->d_inode,
++                       hidden_sto_dentry,
++                       mode, nd);
++#else
++      err = vfs_create(hidden_sto_dir_dentry->d_inode,
++                       hidden_sto_dentry,
++                       mode);
++#endif
++        if(err) {
++              printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
++                goto out_lock;
++      }
++
++      if(!dtohd2(dentry)->d_inode) {
++              printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
++                err = -EINVAL;
++                goto out_lock;
++        }
++
++        /* interpose the new inode */
++        if(dtost(dentry) == DELETED) {
++                dtost(dentry) = DEL_REWRITTEN;
++                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
++                if(err)
++                        goto out_lock;
++        }
++        else if(dtost(dentry) == NON_EXISTANT) {
++                dtost(dentry) = CREATED;
++                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
++                if(err)
++                        goto out_lock;
++        }
++        else if(dtost(dentry) == UNMODIFIED) {
++                dtost(dentry) = MODIFIED;
++                /* interpose on new inode */
++                if(itohi2(dentry->d_inode) != NULL) {
++                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
++                        err = -EINVAL;
++                        goto out_lock;
++                }
++                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
++      }
++      fist_copy_attr_timesizes(dentry->d_parent->d_inode,
++                               hidden_sto_dir_dentry->d_inode);
++
++ out_lock:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++        dput(hidden_sto_dir_dentry);
++ out:
++      return err;
++}
++
++/* create the sto dir, setup states */
++int create_sto_dir(dentry_t *dentry, int mode)
++{
++      int err = 0;
++      inode_t *dir;
++      dentry_t *hidden_sto_dentry;
++        dentry_t *hidden_sto_dir_dentry;
++
++      /* had to take the "!S_ISDIR(mode))" check out, because it failed */
++      if(exists_in_storage(dentry)) {
++                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
++n");
++                err = -EINVAL;
++                goto out;
++        }
++
++      err = get_neg_sto_dentry(dentry);
++      if(err) {
++              err = -EINVAL;
++              goto out;
++      }
++
++      dir = dentry->d_parent->d_inode;
++      hidden_sto_dentry = dtohd2(dentry);
++
++      /* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
++      hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++      err = PTR_ERR(hidden_sto_dir_dentry);
++      if (IS_ERR(hidden_sto_dir_dentry))
++              goto out;
++
++      err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
++                      hidden_sto_dentry,
++                      mode);
++      if(err) {
++              printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
++              goto out_lock;
++      }
++
++      if(!dtohd2(dentry)->d_inode) {
++              printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
++              err = -EINVAL;
++              goto out_lock;
++      }
++
++      /* interpose the new inode */
++      if(dtost(dentry) == DELETED) {
++              dtost(dentry) = DEL_REWRITTEN;
++              err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
++              if(err)
++                      goto out_lock;
++      }
++      else if(dtopd(dentry)->state == NON_EXISTANT) {
++              dtopd(dentry)->state = CREATED;
++              err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
++              if(err)
++                      goto out_lock;
++      }
++      else if(dtopd(dentry)->state == UNMODIFIED) {
++              dtopd(dentry)->state = MODIFIED;
++              /* interpose on new inode */
++              if(itohi2(dentry->d_inode) != NULL) {
++                      printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
++                      err = -EINVAL;
++                      goto out_lock;
++              }
++              itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
++      }
++
++      fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
++
++      /* initalize the wol list */
++      itopd(dentry->d_inode)->deleted_list_size = -1;
++      itopd(dentry->d_inode)->renamed_list_size = -1;
++      meta_build_lists(dentry);
++
++
++ out_lock:
++      /* was: unlock_dir(hidden_sto_dir_dentry); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++      dput(hidden_sto_dir_dentry);
++ out:
++      return err;
++}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
++#else
++int create_sto_nod(dentry_t *dentry, int mode, int dev)
++#endif
++{
++      int err = 0;
++      inode_t *dir;
++      dentry_t *hidden_sto_dentry;
++      dentry_t *hidden_sto_dir_dentry;
++
++      if(exists_in_storage(dentry)) {
++              err = -EEXIST;
++              goto out;
++      }
++      err = get_neg_sto_dentry(dentry);
++
++      if (err) {
++                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
++                goto out;
++        }
++
++      dir = dentry->d_parent->d_inode;
++      hidden_sto_dentry = dtohd2(dentry);
++
++      /* lock parent */
++      hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++      err = PTR_ERR(hidden_sto_dir_dentry);
++      if (IS_ERR(hidden_sto_dir_dentry))
++              goto out;
++
++      err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
++      if(err)
++              goto out_lock;
++
++      if(!dtohd2(dentry)->d_inode) {
++              printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
++              err = -EINVAL; /* return something indicating failure */
++              goto out_lock;
++      }
++
++      /* interpose the new inode */
++      if(dtost(dentry) == DELETED) {
++              dtost(dentry) = DEL_REWRITTEN;
++              err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
++              if(err)
++                      goto out_lock;
++      }
++      else if(dtost(dentry) == NON_EXISTANT) {
++              dtost(dentry) = CREATED;
++              err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
++              if(err)
++                      goto out_lock;
++      }
++      else if(dtost(dentry) == UNMODIFIED) {
++              dtost(dentry) = MODIFIED;
++              /* interpose on new inode */
++              if(itohi2(dentry->d_inode) != NULL) {
++                      printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
++                      err = -EINVAL;
++                      goto out_lock;
++              }
++              itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
++      }
++
++      fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
++
++ out_lock:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++      dput(hidden_sto_dir_dentry);
++ out:
++      return err;
++}
++
++
++/* unimplemented (and possibly not usefull):
++
++   nondir-del_to_del_rew
++   nondir-non_exist_to_creat
++
++   dir-unmod_to_del
++   dir-mod_to_del
++   dir-creat_to_del
++   dir-del_rew_to_del
++   dir-del_to_del_rew
++   dir-non_exist_to_creat
++*/
++
++
++/* bring a file of any type from state UNMODIFIED to MODIFIED */
++int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
++{
++      int err = 0;
++      struct vfsmount *tgt_mnt;
++      struct vfsmount *src_mnt;
++      dentry_t *tgt_dentry;
++      dentry_t *src_dentry;
++      dentry_t *hidden_sto_dentry;
++      dentry_t *hidden_sto_dir_dentry;
++
++      check_mini_fo_dentry(dentry);
++
++      if((dtost(dentry) != UNMODIFIED) ||
++         S_ISDIR(dentry->d_inode->i_mode)) {
++              printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
++                                  wrong type or state.\n");
++              err = -1;
++              goto out;
++      }
++      err = get_neg_sto_dentry(dentry);
++
++      if (err) {
++              printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
++                                  ERROR getting neg. sto dentry.\n");
++              goto out;
++      }
++
++      /* create sto file */
++      hidden_sto_dentry = dtohd2(dentry);
++
++      /* lock parent */
++      hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++        down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++      err = PTR_ERR(hidden_sto_dir_dentry);
++        if (IS_ERR(hidden_sto_dir_dentry))
++                goto out;
++
++      /* handle different types of nondirs */
++      if(S_ISCHR(dentry->d_inode->i_mode) ||
++         S_ISBLK(dentry->d_inode->i_mode)) {
++              err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
++                              hidden_sto_dentry,
++                              dtohd(dentry)->d_inode->i_mode,
++                              dtohd(dentry)->d_inode->i_rdev);
++      }
++
++      else if(S_ISREG(dentry->d_inode->i_mode)) {
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++              err = vfs_create(hidden_sto_dir_dentry->d_inode,
++                               hidden_sto_dentry,
++                               dtohd(dentry)->d_inode->i_mode, NULL);
++#else
++              err = vfs_create(hidden_sto_dir_dentry->d_inode,
++                               hidden_sto_dentry,
++                               dtohd(dentry)->d_inode->i_mode);
++#endif
++      }
++        if(err) {
++              printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
++                                  ERROR creating sto file.\n");
++                goto out_lock;
++      }
++
++      /* interpose on new inode */
++      if(itohi2(dentry->d_inode) != NULL) {
++              printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
++                                  ERROR, invalid inode detected.\n");
++              err = -EINVAL;
++              goto out_lock;
++      }
++
++      itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
++
++        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
++                               hidden_sto_dir_dentry->d_inode);
++      dtost(dentry) = MODIFIED;
++
++      /* copy contents if regular file and cp_flag = 1 */
++      if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
++
++              /* unlock first */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++              mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++              up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++              dput(hidden_sto_dir_dentry);
++
++              tgt_dentry = dtohd2(dentry);
++              tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
++              src_dentry = dtohd(dentry);
++              src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
++
++              err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
++                                    src_dentry, src_mnt);
++              if(err) {
++                      printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
++                                          ERROR copying contents.\n");
++              }
++              goto out;
++      }
++
++ out_lock:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++        dput(hidden_sto_dir_dentry);
++ out:
++      return err;
++}
++
++/* this function is currently identical to nondir_creat_to_del */
++int nondir_del_rew_to_del(dentry_t *dentry)
++{
++      return nondir_creat_to_del(dentry);
++}
++
++int nondir_creat_to_del(dentry_t *dentry)
++{
++      int err = 0;
++
++      inode_t *hidden_sto_dir_inode;
++      dentry_t *hidden_sto_dir_dentry;
++      dentry_t *hidden_sto_dentry;
++
++      check_mini_fo_dentry(dentry);
++
++      /* for now this function serves for both state DEL_REWRITTEN and
++       * CREATED */
++      if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
++         S_ISDIR(dentry->d_inode->i_mode)) {
++              printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
++                                  wrong type or state.\n");
++              err = -1;
++              goto out;
++      }
++
++      hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
++      hidden_sto_dentry = dtohd2(dentry);
++
++      /* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
++      hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++      /* avoid destroying the hidden inode if the file is in use */
++      dget(hidden_sto_dentry);
++      err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
++      dput(hidden_sto_dentry);
++      if(!err)
++              d_delete(hidden_sto_dentry);
++
++      /* propagate number of hard-links */
++      dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
++
++      dtost(dentry) = NON_EXISTANT;
++
++      /* was: unlock_dir(hidden_sto_dir_dentry); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++      dput(hidden_sto_dir_dentry);
++
++ out:
++      return err;
++}
++
++int nondir_mod_to_del(dentry_t *dentry)
++{
++      int err;
++      dentry_t *hidden_sto_dentry;
++      inode_t *hidden_sto_dir_inode;
++      dentry_t *hidden_sto_dir_dentry;
++
++      check_mini_fo_dentry(dentry);
++
++      if(dtost(dentry) != MODIFIED ||
++         S_ISDIR(dentry->d_inode->i_mode)) {
++              printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
++                                  wrong type or state.\n");
++              err = -1;
++              goto out;
++      }
++
++      hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
++      hidden_sto_dentry = dtohd2(dentry);
++
++      /* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
++      hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      down(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++
++      /* avoid destroying the hidden inode if the file is in use */
++      dget(hidden_sto_dentry);
++      err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
++      dput(hidden_sto_dentry);
++      if(!err)
++              d_delete(hidden_sto_dentry);
++
++      /* propagate number of hard-links */
++      dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
++
++      /* dput base dentry, this will relase the inode and free the
++       * dentry, as we will never need it again. */
++      dput(dtohd(dentry));
++      dtohd(dentry) = NULL;
++      dtost(dentry) = DELETED;
++
++      /* add deleted file to META-file */
++      meta_add_d_entry(dentry->d_parent,
++                       dentry->d_name.name,
++                       dentry->d_name.len);
++
++      /* was: unlock_dir(hidden_sto_dir_dentry); */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++      mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++#else
++      up(&hidden_sto_dir_dentry->d_inode->i_sem);
++#endif
++      dput(hidden_sto_dir_dentry);
++
++ out:
++      return err;
++}
++
++int nondir_unmod_to_del(dentry_t *dentry)
++{
++      int err = 0;
++
++      check_mini_fo_dentry(dentry);
++
++      if(dtost(dentry) != UNMODIFIED ||
++         S_ISDIR(dentry->d_inode->i_mode)) {
++              printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
++                                  wrong type or state.\n");
++              err = -1;
++              goto out;
++      }
++
++       /* next we have to get a negative dentry for the storage file */
++      err = get_neg_sto_dentry(dentry);
++
++      if(err)
++              goto out;
++
++      /* add deleted file to META lists */
++      err = meta_add_d_entry(dentry->d_parent,
++                             dentry->d_name.name,
++                             dentry->d_name.len);
++
++      if(err)
++              goto out;
++
++      /* dput base dentry, this will relase the inode and free the
++       * dentry, as we will never need it again. */
++      dput(dtohd(dentry));
++      dtohd(dentry) = NULL;
++      dtost(dentry) = DELETED;
++
++ out:
++      return err;
++}
++
++/* bring a dir from state UNMODIFIED to MODIFIED */
++int dir_unmod_to_mod(dentry_t *dentry)
++{
++      int err;
++
++      check_mini_fo_dentry(dentry);
++
++      if(dtost(dentry) != UNMODIFIED ||
++         !S_ISDIR(dentry->d_inode->i_mode)) {
++              printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
++                                  wrong type or state.\n");
++              err = -1;
++              goto out;
++      }
++
++      /* this creates our dir incl. sto. structure */
++      err = build_sto_structure(dentry->d_parent, dentry);
++      if(err) {
++              printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
++                                  build_sto_structure failed.\n");
++              goto out;
++      }
++ out:
++      return err;
++}
++
+--- /dev/null
++++ b/fs/mini_fo/super.c
+@@ -0,0 +1,281 @@
++/*
++ * Copyright (c) 1997-2003 Erez Zadok
++ * Copyright (c) 2001-2003 Stony Brook University
++ *
++ * For specific licensing information, see the COPYING file distributed with
++ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
++ *
++ * This Copyright notice must be kept intact and distributed with all
++ * fistgen sources INCLUDING sources generated by fistgen.
++ */
++/*
++ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
++ *
++ * 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.
++ */
++
++/*
++ *  $Id$
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "fist.h"
++#include "mini_fo.h"
++
++
++STATIC void
++mini_fo_read_inode(inode_t *inode)
++{
++      static struct address_space_operations mini_fo_empty_aops;
++
++      __itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
++      if (!itopd(inode)) {
++              printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
++              ASSERT(NULL);
++      }
++      itohi(inode) = NULL;
++      itohi2(inode) = NULL;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++      inode->i_version++;
++#else
++      inode->i_version = ++event;     /* increment inode version */
++#endif
++      inode->i_op = &mini_fo_main_iops;
++      inode->i_fop = &mini_fo_main_fops;
++#if 0
++      /*
++       * XXX: To export a file system via NFS, it has to have the
++       * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
++       * the lower file system, or can we allow our file system to be exported
++       * even if the lower one cannot be natively exported.
++       */
++      inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
++      /*
++       * OK, the above was a hack, which is now turned off because it may
++       * cause a panic/oops on some systems.  The correct way to export a
++       * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
++       * parameter, which requires 2.4.20 or later.
++       */
++#endif
++      /* I don't think ->a_ops is ever allowed to be NULL */
++      inode->i_mapping->a_ops = &mini_fo_empty_aops;
++}
++
++
++#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
++/*
++ * No need to call write_inode() on the lower inode, as it
++ * will have been marked 'dirty' anyway. But we might need
++ * to write some of our own stuff to disk.
++ */
++STATIC void
++mini_fo_write_inode(inode_t *inode, int sync)
++{
++      print_entry_location();
++      print_exit_location();
++}
++#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
++
++
++STATIC void
++mini_fo_put_inode(inode_t *inode)
++{
++      /*
++       * This is really funky stuff:
++       * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
++       * It is currently holding a reference to the hidden inode.
++       * Therefore, it needs to release that reference by calling iput on the hidden inode.
++       * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
++       * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
++       * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
++       */
++      if (atomic_read(&inode->i_count) == 1)
++              inode->i_nlink = 0;
++}
++
++
++#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
++/*
++ * we now define delete_inode, because there are two VFS paths that may
++ * destroy an inode: one of them calls clear inode before doing everything
++ * else that's needed, and the other is fine.  This way we truncate the inode
++ * size (and its pages) and then clear our own inode, which will do an iput
++ * on our and the lower inode.
++ */
++STATIC void
++mini_fo_delete_inode(inode_t *inode)
++{
++      print_entry_location();
++
++      fist_checkinode(inode, "mini_fo_delete_inode IN");
++      inode->i_size = 0;              /* every f/s seems to do that */
++      clear_inode(inode);
++
++      print_exit_location();
++}
++#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
++
++
++/* final actions when unmounting a file system */
++STATIC void
++mini_fo_put_super(super_block_t *sb)
++{
++      if (stopd(sb)) {
++              mntput(stopd(sb)->hidden_mnt);
++              mntput(stopd(sb)->hidden_mnt2);
++
++              /* mk: no! dput(stopd(sb)->base_dir_dentry);
++                 dput(stopd(sb)->storage_dir_dentry); */
++
++              kfree(stopd(sb));
++              __stopd(sb) = NULL;
++      }
++}
++
++
++#ifdef NOT_NEEDED
++/*
++ * This is called in do_umount before put_super.
++ * The superblock lock is not held yet.
++ * We probably do not need to define this or call write_super
++ * on the hidden_sb, because sync_supers() will get to hidden_sb
++ * sooner or later.  But it is also called from file_fsync()...
++ */
++STATIC void
++mini_fo_write_super(super_block_t *sb)
++{
++      return;
++}
++#endif /* NOT_NEEDED */
++
++
++STATIC int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
++#else
++mini_fo_statfs(super_block_t *sb, struct statfs *buf)
++#endif
++{
++      int err = 0;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++      struct dentry *hidden_d;
++
++      hidden_d = dtohd(d);
++      err = vfs_statfs(hidden_d, buf);
++#else
++      super_block_t *hidden_sb;
++
++      hidden_sb = stohs(sb);
++      err = vfs_statfs(hidden_sb, buf);
++#endif
++
++      return err;
++}
++
++
++/*
++ * XXX: not implemented.  This is not allowed yet.
++ * Should we call this on the hidden_sb?  Probably not.
++ */
++STATIC int
++mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
++{
++      //printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
++      return -ENOSYS;
++}
++
++
++/*
++ * Called by iput() when the inode reference count reached zero
++ * and the inode is not hashed anywhere.  Used to clear anything
++ * that needs to be, before the inode is completely destroyed and put
++ * on the inode free list.
++ */
++STATIC void
++mini_fo_clear_inode(inode_t *inode)
++{
++      /*
++       * Decrement a reference to a hidden_inode, which was incremented
++       * by our read_inode when it was created initially.
++       */
++
++      /* release the wol_list */
++      if(S_ISDIR(inode->i_mode)) {
++              __meta_put_lists(inode);
++      }
++
++      /* mk: fan out fun */
++      if(itohi(inode))
++              iput(itohi(inode));
++      if(itohi2(inode))
++              iput(itohi2(inode));
++
++      // XXX: why this assertion fails?
++      // because it doesn't like us
++      // ASSERT((inode->i_state & I_DIRTY) == 0);
++      kfree(itopd(inode));
++      __itopd(inode) = NULL;
++}
++
++
++/*
++ * Called in do_umount() if the MNT_FORCE flag was used and this
++ * function is defined.  See comment in linux/fs/super.c:do_umount().
++ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
++ * code can actually succeed and won't leave tasks that need handling.
++ *
++ * PS. I wonder if this is somehow useful to undo damage that was
++ * left in the kernel after a user level file server (such as amd)
++ * dies.
++ */
++STATIC void
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++mini_fo_umount_begin(struct vfsmount *mnt, int flags)
++{
++      struct vfsmount *hidden_mnt;
++
++      hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
++
++      if (hidden_mnt->mnt_sb->s_op->umount_begin)
++              hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
++
++}
++#else
++mini_fo_umount_begin(super_block_t *sb)
++{
++      super_block_t *hidden_sb;
++
++      hidden_sb = stohs(sb);
++
++      if (hidden_sb->s_op->umount_begin)
++              hidden_sb->s_op->umount_begin(hidden_sb);
++
++}
++#endif
++
++
++struct super_operations mini_fo_sops =
++{
++      read_inode:             mini_fo_read_inode,
++#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
++      write_inode:    mini_fo_write_inode,
++#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
++      put_inode:              mini_fo_put_inode,
++#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
++      delete_inode:   mini_fo_delete_inode,
++#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
++      put_super:              mini_fo_put_super,
++      statfs:         mini_fo_statfs,
++      remount_fs:             mini_fo_remount_fs,
++      clear_inode:    mini_fo_clear_inode,
++      umount_begin:   mini_fo_umount_begin,
++};
+--- /dev/null
++++ b/fs/mini_fo/Kconfig
+@@ -0,0 +1,3 @@
++config MINI_FO
++      tristate "Mini fanout overlay filesystem"
++

diff --git a/target/linux/generic-2.6/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
new file mode 100644 (file)
index 0000000..b64630d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
@@ -0,0 +1,143 @@
+--- a/fs/mini_fo/main.c
++++ b/fs/mini_fo/main.c
+@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
+        * of the new inode's fields
+        */
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+       /*
+        * original: inode = iget(sb, hidden_inode->i_ino);
+        */
+@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
+               err = -EACCES;          /* should be impossible??? */
+               goto out;
+       }
++#else
++      inode = mini_fo_iget(sb, iunique(sb, 25));
++      if (IS_ERR(inode)) {
++              err = PTR_ERR(inode);
++              goto out;
++      }
++#endif
+ 
+       /*
+        * interpose the inode if not already interposed
+@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
+                               hidden_root = ERR_PTR(err);
+                               goto out;
+                       }
+-                      hidden_root = nd.dentry;
+-                      stopd(sb)->base_dir_dentry = nd.dentry;
+-                      stopd(sb)->hidden_mnt = nd.mnt;
++                      hidden_root = nd_get_dentry(&nd);
++                      stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
++                      stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
+ 
+               } else if(!strncmp("sto=", options, 4)) {
+                       /* parse the storage dir */
+@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
+                               hidden_root2 = ERR_PTR(err);
+                               goto out;
+                       }
+-                      hidden_root2 = nd2.dentry;
+-                      stopd(sb)->storage_dir_dentry = nd2.dentry;
+-                      stopd(sb)->hidden_mnt2 = nd2.mnt;
++                      hidden_root2 = nd_get_dentry(&nd2);
++                      stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
++                      stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
+                       stohs2(sb) = hidden_root2->d_sb;
+ 
+                       /* validate storage dir, this is done in
+--- a/fs/mini_fo/mini_fo.h
++++ b/fs/mini_fo/mini_fo.h
+@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
+ extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
+                          dentry_t *src_dentry, struct vfsmount *src_mnt);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
++extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
+ 
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct
+ #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
+ #endif /* __KERNEL__ */
+ 
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
++static inline dentry_t *nd_get_dentry(struct nameidata *nd)
++{
++      return (nd->path.dentry);
++}
++
++static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
++{
++      return (nd->path.mnt);
++}
++#else
++static inline dentry_t *nd_get_dentry(struct nameidata *nd)
++{
++      return (nd->dentry);
++}
++
++static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
++{
++      return (nd->mnt);
++}
++#endif
++
+ /*
+  * Definitions for user and kernel code
+  */
+--- a/fs/mini_fo/super.c
++++ b/fs/mini_fo/super.c
+@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
+ }
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
++struct inode *
++mini_fo_iget(struct super_block *sb, unsigned long ino)
++{
++      struct inode *inode;
++
++      inode = iget_locked(sb, ino);
++      if (!inode)
++              return ERR_PTR(-ENOMEM);
++
++      if (!(inode->i_state & I_NEW))
++              return inode;
++
++      mini_fo_read_inode(inode);
++
++      unlock_new_inode(inode);
++      return inode;
++}
++#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
+ 
+ struct super_operations mini_fo_sops =
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+       read_inode:             mini_fo_read_inode,
++#endif
+ #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+       write_inode:    mini_fo_write_inode,
+ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
+--- a/fs/mini_fo/aux.c
++++ b/fs/mini_fo/aux.c
+@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
+       err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
+ 
+       /* validate */
+-      if (err || !nd.dentry || !nd.dentry->d_inode) {
++      if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
+               printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
+               return NULL;
+       }
+-      return nd.dentry;
++      return nd_get_dentry(&nd);
+ }
+ 
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.35/211-mini_fo_2.6.25_dentry_open_war.patch
new file mode 100644 (file)
index 0000000..48a1942
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/211-mini_fo_2.6.25_dentry_open_war.patch
@@ -0,0 +1,66 @@
+--- a/fs/mini_fo/meta.c
++++ b/fs/mini_fo/meta.c
+@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
+                          S_IRUSR | S_IWUSR);
+ #endif
+       }
++
++      /* $%& err, is this correct? */
++      meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
++      mntget(meta_mnt);
++
+         /* open META-file for writing */
+         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
+         if(!meta_file || IS_ERR(meta_file)) {
+@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
+                          meta_dentry, S_IRUSR | S_IWUSR);
+ #endif
+       }
++
++      /* $%& err, is this correct? */
++      meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
++      mntget(meta_mnt);
++
+         /* open META-file for writing */
+         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
+         if(!meta_file || IS_ERR(meta_file)) {
+@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
+               }
+       }
+ 
++      /* $%& err, is this correct? */
++      meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
++      mntget(meta_mnt);
++
+         /* open META-file for writing */
+         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
+         if(!meta_file || IS_ERR(meta_file)) {
+                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
+                                   ERROR opening meta file.\n");
+-              /* we don't mntget so we dont't mntput (for now)
+-               * mntput(meta_mnt);
+-               */
++              mntput(meta_mnt);
+               dput(meta_dentry);
+               err = -1;
+                 goto out;
+@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
+               }
+       }
+ 
++      /* $%& err, is this correct? */
++      meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
++      mntget(meta_mnt);
++
+         /* open META-file for writing */
+         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
+         if(!meta_file || IS_ERR(meta_file)) {
+                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
+                                   ERROR opening meta file.\n");
+-              /* we don't mntget so we dont't mntput (for now)
+-               * mntput(meta_mnt);
+-               */
++              mntput(meta_mnt);
+               dput(meta_dentry);
+               err = -1;
+                 goto out;

diff --git a/target/linux/generic-2.6/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
new file mode 100644 (file)
index 0000000..b5fa64e
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
@@ -0,0 +1,37 @@
+--- a/fs/mini_fo/super.c
++++ b/fs/mini_fo/super.c
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
+ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
+ 
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+ STATIC void
+ mini_fo_put_inode(inode_t *inode)
+ {
+@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
+       if (atomic_read(&inode->i_count) == 1)
+               inode->i_nlink = 0;
+ }
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
+ 
+ 
+ #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
+  * dies.
+  */
+ STATIC void
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
+ mini_fo_umount_begin(struct vfsmount *mnt, int flags)
+ {
+       struct vfsmount *hidden_mnt;
+@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
+ #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+       write_inode:    mini_fo_write_inode,
+ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+       put_inode:              mini_fo_put_inode,
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
+ #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+       delete_inode:   mini_fo_delete_inode,
+ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */

diff --git a/target/linux/generic-2.6/patches-2.6.35/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.35/213-mini_fo_2.6.27_fixes.patch
new file mode 100644 (file)
index 0000000..f92c18b
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/213-mini_fo_2.6.27_fixes.patch
@@ -0,0 +1,41 @@
+--- a/fs/mini_fo/inode.c
++++ b/fs/mini_fo/inode.c
+@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
+       int err=0;
+       dentry_t *hidden_sto_dentry;
+       dentry_t *hidden_sto_dir_dentry;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+         umode_t mode;
+ #endif
+ 
+@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
+       down(&hidden_sto_dir_dentry->d_inode->i_sem);
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+       mode = S_IALLUGO;
+       err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
+                         hidden_sto_dentry, symname, mode);
+@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
+ #endif
+ 
+ STATIC int
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+ mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
+ #else
+ mini_fo_permission(inode_t *inode, int mask)
+@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
+        *      if (err)
+        *              goto out;
+        */
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++      err = inode_permission(hidden_inode, mask);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+       err = permission(hidden_inode, mask, nd);
+ #else
+       err = permission(hidden_inode, mask);

diff --git a/target/linux/generic-2.6/patches-2.6.35/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.35/214-mini_fo_2.6.29.patch
new file mode 100644 (file)
index 0000000..63d704b
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/214-mini_fo_2.6.29.patch
@@ -0,0 +1,96 @@
+--- a/fs/mini_fo/aux.c
++++ b/fs/mini_fo/aux.c
+@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
+       mntget(src_mnt);
+ 
+       /* open file write only */
+-      tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
++      tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
+       if(!tgt_file || IS_ERR(tgt_file)) {
+               printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
+               err = PTR_ERR(tgt_file);
+@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
+       }
+ 
+       /* open file read only */
+-      src_file = dentry_open(src_dentry, src_mnt, 0x0);
++      src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
+       if(!src_file || IS_ERR(src_file)) {
+               printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
+               err = PTR_ERR(src_file);
+--- a/fs/mini_fo/file.c
++++ b/fs/mini_fo/file.c
+@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
+                       mntget(stopd(inode->i_sb)->hidden_mnt);
+                       hidden_file = dentry_open(hidden_dentry,
+                                                 stopd(inode->i_sb)->hidden_mnt,
+-                                                hidden_flags);
++                                                hidden_flags, file->f_cred);
+                       if (IS_ERR(hidden_file)) {
+                               err = PTR_ERR(hidden_file);
+                               dput(hidden_dentry);
+@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
+                       mntget(stopd(inode->i_sb)->hidden_mnt);
+                       hidden_file = dentry_open(hidden_dentry,
+                                                 stopd(inode->i_sb)->hidden_mnt,
+-                                                hidden_flags);
++                                                hidden_flags, file->f_cred);
+                       if (IS_ERR(hidden_file)) {
+                               err = PTR_ERR(hidden_file);
+                               dput(hidden_dentry);
+@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
+       mntget(stopd(inode->i_sb)->hidden_mnt2);
+       hidden_sto_file = dentry_open(hidden_sto_dentry,
+                                     stopd(inode->i_sb)->hidden_mnt2,
+-                                    hidden_flags);
++                                    hidden_flags, file->f_cred);
+ 
+       /* dentry_open dputs the dentry if it fails */
+       if (IS_ERR(hidden_sto_file)) {
+--- a/fs/mini_fo/meta.c
++++ b/fs/mini_fo/meta.c
+@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
+ 
+ 
+               /* open META-file for reading */
+-              meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
++              meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
+               if(!meta_file || IS_ERR(meta_file)) {
+                       printk(KERN_CRIT "mini_fo: meta_build_lists: \
+                                           ERROR opening META file.\n");
+@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
+       mntget(meta_mnt);
+ 
+         /* open META-file for writing */
+-        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
++        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
+         if(!meta_file || IS_ERR(meta_file)) {
+                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
+                                   ERROR opening meta file.\n");
+@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
+       mntget(meta_mnt);
+ 
+         /* open META-file for writing */
+-        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
++        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
+         if(!meta_file || IS_ERR(meta_file)) {
+                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
+                                   ERROR opening meta file.\n");
+@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
+       mntget(meta_mnt);
+ 
+         /* open META-file for writing */
+-        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
++        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
+         if(!meta_file || IS_ERR(meta_file)) {
+                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
+                                   ERROR opening meta file.\n");
+@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
+       mntget(meta_mnt);
+ 
+         /* open META-file for writing */
+-        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
++        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
+         if(!meta_file || IS_ERR(meta_file)) {
+                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
+                                   ERROR opening meta file.\n");

diff --git a/target/linux/generic-2.6/patches-2.6.35/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.35/215-mini_fo_2.6.30.patch
new file mode 100644 (file)
index 0000000..2d20920
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/215-mini_fo_2.6.30.patch
@@ -0,0 +1,157 @@
+--- a/fs/mini_fo/aux.c
++++ b/fs/mini_fo/aux.c
+@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
+       len = dentry->d_name.len;
+       name = dentry->d_name.name;
+ 
++      mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
+       dtohd2(dentry) =
+               lookup_one_len(name, dtohd2(dentry->d_parent), len);
++      mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
+ 
+  out:
+       return err;
+@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
+               const unsigned char *name;
+               len = dtohd(dentry)->d_name.len;
+               name = dtohd(dentry)->d_name.name;
++              mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
+               hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
++              mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
+               dtohd2(dentry) = hidden_sto_dentry;
+       }
+ 
+--- a/fs/mini_fo/inode.c
++++ b/fs/mini_fo/inode.c
+@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
+               hidden_dir_dentry = hidden_dentry->d_parent;
+               kfree(bpath);
+       }
+-      else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
++      else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
++              mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
+               hidden_dentry =
+                       lookup_one_len(name, hidden_dir_dentry, namelen);
+-      else
++              mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
++      } else {
+               hidden_dentry = NULL;
++      }
+ 
+-      if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
++      if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
++              mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
+               hidden_sto_dentry =
+                       lookup_one_len(name, hidden_sto_dir_dentry, namelen);
+-      else
++              mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
++      } else {
+               hidden_sto_dentry =  NULL;
++      }
+ 
+       /* catch error in lookup */
+       if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
+@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
+ #endif
+ 
+               /* Delete an old WOL file contained in the storage dir */
++              mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
+               meta_dentry = lookup_one_len(META_FILENAME,
+                                            hidden_sto_dentry,
+                                            strlen(META_FILENAME));
++              mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
+               if(meta_dentry->d_inode) {
+                       err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
+                       dput(meta_dentry);
+@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
+ #endif
+ 
+               /* Delete an old WOL file contained in the storage dir */
++              mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
+               meta_dentry = lookup_one_len(META_FILENAME,
+                                            hidden_sto_dentry,
+                                            strlen(META_FILENAME));
++              mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
+               if(meta_dentry->d_inode) {
+                       /* is this necessary? dget(meta_dentry); */
+                       err = vfs_unlink(hidden_sto_dentry->d_inode,
+@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
+ #endif
+ 
+               /* Delete an old WOL file contained in the storage dir */
++              mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
+               meta_dentry = lookup_one_len(META_FILENAME,
+                                            hidden_sto_dentry,
+                                            strlen(META_FILENAME));
++              mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
+               if(meta_dentry->d_inode) {
+                       /* is this necessary? dget(meta_dentry); */
+                       err = vfs_unlink(hidden_sto_dentry->d_inode,
+--- a/fs/mini_fo/meta.c
++++ b/fs/mini_fo/meta.c
+@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
+ 
+       /* might there be a META-file? */
+       if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
++              mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
+               meta_dentry = lookup_one_len(META_FILENAME,
+                                            dtohd2(dentry),
+                                            strlen(META_FILENAME));
++              mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
+               if(!meta_dentry->d_inode) {
+                       dput(meta_dentry);
+                       goto out_ok;
+@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
+                       goto out;
+                 }
+         }
++
++      mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
+       meta_dentry = lookup_one_len(META_FILENAME,
+                                    dtohd2(dentry), strlen (META_FILENAME));
++      mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
+ 
+       /* We need to create a META-file */
+         if(!meta_dentry->d_inode) {
+@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
+                       goto out;
+                 }
+         }
++
++      mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
+       meta_dentry = lookup_one_len(META_FILENAME,
+                                    dtohd2(dentry),
+                                    strlen (META_FILENAME));
++      mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
++
+         if(!meta_dentry->d_inode) {
+                 /* We need to create a META-file */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
+                       goto out;
+                 }
+         }
++
++      mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
+       meta_dentry = lookup_one_len(META_FILENAME,
+                                    dtohd2(dentry),
+                                    strlen(META_FILENAME));
++      mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
++
+         if(!meta_dentry->d_inode) {
+                 /* We need to create a META-file */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
+                       goto out;
+                 }
+         }
++
++      mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
+       meta_dentry = lookup_one_len(META_FILENAME,
+                                    dtohd2(dentry),
+                                    strlen(META_FILENAME));
++      mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
++
+         if(!meta_dentry->d_inode) {
+                 /* We need to create a META-file */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)

diff --git a/target/linux/generic-2.6/patches-2.6.35/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.35/216-mini_fo_locking.patch
new file mode 100644 (file)
index 0000000..4f07592
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/216-mini_fo_locking.patch
@@ -0,0 +1,25 @@
+--- a/fs/mini_fo/state.c
++++ b/fs/mini_fo/state.c
+@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
+       dtohd(dentry) = NULL;
+       dtost(dentry) = DELETED;
+ 
+-      /* add deleted file to META-file */
+-      meta_add_d_entry(dentry->d_parent,
+-                       dentry->d_name.name,
+-                       dentry->d_name.len);
+-
+       /* was: unlock_dir(hidden_sto_dir_dentry); */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+       mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
+ #else
+       up(&hidden_sto_dir_dentry->d_inode->i_sem);
+ #endif
++      /* add deleted file to META-file */
++      meta_add_d_entry(dentry->d_parent,
++                       dentry->d_name.name,
++                       dentry->d_name.len);
++
+       dput(hidden_sto_dir_dentry);
+ 
+  out:

diff --git a/target/linux/generic-2.6/patches-2.6.35/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.35/219-kobject_uevent.patch
new file mode 100644 (file)
index 0000000..f15749f
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/219-kobject_uevent.patch
@@ -0,0 +1,32 @@
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -49,6 +49,18 @@ static const char *kobject_actions[] = {
+       [KOBJ_OFFLINE] =        "offline",
+ };
+ 
++u64 uevent_next_seqnum(void)
++{
++      u64 seq;
++
++      spin_lock(&sequence_lock);
++      seq = ++uevent_seqnum;
++      spin_unlock(&sequence_lock);
++
++      return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ /**
+  * kobject_action_type - translate action string to numeric type
+  *
+@@ -244,9 +256,7 @@ int kobject_uevent_env(struct kobject *k
+               kobj->state_remove_uevent_sent = 1;
+ 
+       /* we will send an event, so request a new sequence number */
+-      spin_lock(&sequence_lock);
+-      seq = ++uevent_seqnum;
+-      spin_unlock(&sequence_lock);
++      seq = uevent_next_seqnum();
+       retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
+       if (retval)
+               goto exit;

diff --git a/target/linux/generic-2.6/patches-2.6.35/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.35/220-sound_kconfig.patch
new file mode 100644 (file)
index 0000000..fb3df25
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/220-sound_kconfig.patch
@@ -0,0 +1,11 @@
+--- a/sound/core/Kconfig
++++ b/sound/core/Kconfig
+@@ -8,7 +8,7 @@ config SND_PCM
+       select GCD
+ 
+ config SND_HWDEP
+-      tristate
++      tristate "Sound hardware support"
+ 
+ config SND_RAWMIDI
+       tristate

diff --git a/target/linux/generic-2.6/patches-2.6.35/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.35/221-binfmt_elf_gcc4.1.patch
new file mode 100644 (file)
index 0000000..f452a25
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/221-binfmt_elf_gcc4.1.patch
@@ -0,0 +1,11 @@
+--- a/fs/binfmt_elf.c
++++ b/fs/binfmt_elf.c
+@@ -1136,7 +1136,7 @@ static unsigned long vma_dump_size(struc
+       if (FILTER(ELF_HEADERS) &&
+           vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
+               u32 __user *header = (u32 __user *) vma->vm_start;
+-              u32 word;
++              u32 word = 0;
+               mm_segment_t fs = get_fs();
+               /*
+                * Doing it this way gets the constant folded by GCC.

diff --git a/target/linux/generic-2.6/patches-2.6.35/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.35/222-partial_eraseblock_write.patch
new file mode 100644 (file)
index 0000000..0c7672e
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/222-partial_eraseblock_write.patch
@@ -0,0 +1,146 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -21,6 +21,8 @@
+ #include <linux/root_dev.h>
+ #include <linux/magic.h>
+ 
++#define MTD_ERASE_PARTIAL     0x8000 /* partition only covers parts of an erase block */
++
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+ 
+@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
+               return -EROFS;
+       if (instr->addr >= mtd->size)
+               return -EINVAL;
++
++      instr->partial_start = false;
++      if (mtd->flags & MTD_ERASE_PARTIAL) {
++              size_t readlen = 0;
++              u64 mtd_ofs;
++
++              instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
++              if (!instr->erase_buf)
++                      return -ENOMEM;
++
++              mtd_ofs = part->offset + instr->addr;
++              instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
++
++              if (instr->erase_buf_ofs > 0) {
++                      instr->addr -= instr->erase_buf_ofs;
++                      ret = part->master->read(part->master,
++                              instr->addr + part->offset,
++                              part->master->erasesize,
++                              &readlen, instr->erase_buf);
++
++                      instr->partial_start = true;
++              } else {
++                      mtd_ofs = part->offset + part->mtd.size;
++                      instr->erase_buf_ofs = part->master->erasesize -
++                              do_div(mtd_ofs, part->master->erasesize);
++
++                      if (instr->erase_buf_ofs > 0) {
++                              instr->len += instr->erase_buf_ofs;
++                              ret = part->master->read(part->master,
++                                      part->offset + instr->addr +
++                                      instr->len - part->master->erasesize,
++                                      part->master->erasesize, &readlen,
++                                      instr->erase_buf);
++                      } else {
++                              ret = 0;
++                      }
++              }
++              if (ret < 0) {
++                      kfree(instr->erase_buf);
++                      return ret;
++              }
++
++      }
++
+       instr->addr += part->offset;
+       ret = part->master->erase(part->master, instr);
+       if (ret) {
+               if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+                       instr->fail_addr -= part->offset;
+               instr->addr -= part->offset;
++              if (mtd->flags & MTD_ERASE_PARTIAL)
++                      kfree(instr->erase_buf);
+       }
++
+       return ret;
+ }
+ 
+@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
+ {
+       if (instr->mtd->erase == part_erase) {
+               struct mtd_part *part = PART(instr->mtd);
++              size_t wrlen = 0;
+ 
++              if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
++                      if (instr->partial_start) {
++                              part->master->write(part->master,
++                                      instr->addr, instr->erase_buf_ofs,
++                                      &wrlen, instr->erase_buf);
++                              instr->addr += instr->erase_buf_ofs;
++                      } else {
++                              instr->len -= instr->erase_buf_ofs;
++                              part->master->write(part->master,
++                                      instr->addr + instr->len,
++                                      instr->erase_buf_ofs, &wrlen,
++                                      instr->erase_buf +
++                                      part->master->erasesize -
++                                      instr->erase_buf_ofs);
++                      }
++                      kfree(instr->erase_buf);
++              }
+               if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+                       instr->fail_addr -= part->offset;
+               instr->addr -= part->offset;
+@@ -473,18 +540,24 @@ static struct mtd_part *add_one_partitio
+       if ((slave->mtd.flags & MTD_WRITEABLE) &&
+           mtd_mod_by_eb(slave->offset, &slave->mtd)) {
+               /* Doesn't start on a boundary of major erase size */
+-              /* FIXME: Let it be writable if it is on a boundary of
+-               * _minor_ erase size though */
+-              slave->mtd.flags &= ~MTD_WRITEABLE;
+-              printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
+-                      part->name);
++              slave->mtd.flags |= MTD_ERASE_PARTIAL;
++              if (((u32) slave->mtd.size) > master->erasesize)
++                      slave->mtd.flags &= ~MTD_WRITEABLE;
++              else
++                      slave->mtd.erasesize = slave->mtd.size;
+       }
+       if ((slave->mtd.flags & MTD_WRITEABLE) &&
+-          mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
+-              slave->mtd.flags &= ~MTD_WRITEABLE;
+-              printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
+-                      part->name);
+-      }
++          mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
++              slave->mtd.flags |= MTD_ERASE_PARTIAL;
++
++              if ((u32) slave->mtd.size > master->erasesize)
++                      slave->mtd.flags &= ~MTD_WRITEABLE;
++              else
++                      slave->mtd.erasesize = slave->mtd.size;
++      }
++      if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
++              printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
++                              part->name);
+ 
+       slave->mtd.ecclayout = master->ecclayout;
+       if (master->block_isbad) {
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -46,6 +46,10 @@ struct erase_info {
+       u_long priv;
+       u_char state;
+       struct erase_info *next;
++
++      u8 *erase_buf;
++      u32 erase_buf_ofs;
++      bool partial_start;
+ };
+ 
+ struct mtd_erase_region_info {

diff --git a/target/linux/generic-2.6/patches-2.6.35/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.35/240-packet_socket_type.patch
new file mode 100644 (file)
index 0000000..afaf920
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/240-packet_socket_type.patch
@@ -0,0 +1,132 @@
+This patch allows the user to specify desired packet types (outgoing,
+broadcast, unicast, etc.) on packet sockets via setsockopt.
+This can reduce the load in situations where only a limited number
+of packet types are necessary
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/include/linux/if_packet.h
++++ b/include/linux/if_packet.h
+@@ -29,6 +29,8 @@ struct sockaddr_ll {
+ /* These ones are invisible by user level */
+ #define PACKET_LOOPBACK               5               /* MC/BRD frame looped back */
+ #define PACKET_FASTROUTE      6               /* Fastrouted frame     */
++#define PACKET_MASK_ANY               0xffffffff      /* mask for packet type bits */
++
+ 
+ /* Packet socket options */
+ 
+@@ -48,6 +50,7 @@ struct sockaddr_ll {
+ #define PACKET_LOSS                   14
+ #define PACKET_VNET_HDR                       15
+ #define PACKET_TX_TIMESTAMP           16
++#define PACKET_RECV_TYPE              17
+ 
+ struct tpacket_stats {
+       unsigned int    tp_packets;
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -202,6 +202,7 @@ struct packet_sock {
+       unsigned int            tp_reserve;
+       unsigned int            tp_loss:1;
+       struct packet_type      prot_hook ____cacheline_aligned_in_smp;
++      __u8                    pkt_type:3;
+ };
+ 
+ struct packet_skb_cb {
+@@ -336,6 +337,7 @@ static int packet_rcv_spkt(struct sk_buf
+ {
+       struct sock *sk;
+       struct sockaddr_pkt *spkt;
++      struct packet_sock *po;
+ 
+       /*
+        *      When we registered the protocol we saved the socket in the data
+@@ -343,6 +345,7 @@ static int packet_rcv_spkt(struct sk_buf
+        */
+ 
+       sk = pt->af_packet_priv;
++      po = pkt_sk(sk);
+ 
+       /*
+        *      Yank back the headers [hope the device set this
+@@ -355,7 +358,7 @@ static int packet_rcv_spkt(struct sk_buf
+        *      so that this procedure is noop.
+        */
+ 
+-      if (skb->pkt_type == PACKET_LOOPBACK)
++      if (!(po->pkt_type & (1 << skb->pkt_type)))
+               goto out;
+ 
+       if (!net_eq(dev_net(dev), sock_net(sk)))
+@@ -531,12 +534,12 @@ static int packet_rcv(struct sk_buff *sk
+       int skb_len = skb->len;
+       unsigned int snaplen, res;
+ 
+-      if (skb->pkt_type == PACKET_LOOPBACK)
+-              goto drop;
+-
+       sk = pt->af_packet_priv;
+       po = pkt_sk(sk);
+ 
++      if (!(po->pkt_type & (1 << skb->pkt_type)))
++              goto drop;
++
+       if (!net_eq(dev_net(dev), sock_net(sk)))
+               goto drop;
+ 
+@@ -651,12 +654,12 @@ static int tpacket_rcv(struct sk_buff *s
+       struct timeval tv;
+       struct timespec ts;
+ 
+-      if (skb->pkt_type == PACKET_LOOPBACK)
+-              goto drop;
+-
+       sk = pt->af_packet_priv;
+       po = pkt_sk(sk);
+ 
++      if (!(po->pkt_type & (1 << skb->pkt_type)))
++              goto drop;
++
+       if (!net_eq(dev_net(dev), sock_net(sk)))
+               goto drop;
+ 
+@@ -1464,6 +1467,7 @@ static int packet_create(struct net *net
+       spin_lock_init(&po->bind_lock);
+       mutex_init(&po->pg_vec_lock);
+       po->prot_hook.func = packet_rcv;
++      po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
+ 
+       if (sock->type == SOCK_PACKET)
+               po->prot_hook.func = packet_rcv_spkt;
+@@ -1968,6 +1972,16 @@ packet_setsockopt(struct socket *sock, i
+               po->has_vnet_hdr = !!val;
+               return 0;
+       }
++        case PACKET_RECV_TYPE:
++        {
++                unsigned int val;
++                if (optlen != sizeof(val))
++                        return -EINVAL;
++                if (copy_from_user(&val, optval, sizeof(val)))
++                        return -EFAULT;
++                po->pkt_type = val & ~PACKET_LOOPBACK;
++                return 0;
++        }
+       default:
+               return -ENOPROTOOPT;
+       }
+@@ -2025,6 +2039,13 @@ static int packet_getsockopt(struct sock
+ 
+               data = &val;
+               break;
++      case PACKET_RECV_TYPE:
++              if (len > sizeof(unsigned int))
++                      len = sizeof(unsigned int);
++              val = po->pkt_type;
++
++              data = &val;
++              break;
+       case PACKET_VERSION:
+               if (len > sizeof(int))
+                       len = sizeof(int);

diff --git a/target/linux/generic-2.6/patches-2.6.35/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.35/250-pppoe_header_pad.patch
new file mode 100644 (file)
index 0000000..a2535db
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/250-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/pppoe.c
++++ b/drivers/net/pppoe.c
+@@ -862,7 +862,7 @@ static int pppoe_sendmsg(struct kiocb *i
+               goto end;
+ 
+ 
+-      skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
++      skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
+                          0, GFP_KERNEL);
+       if (!skb) {
+               error = -ENOMEM;
+@@ -870,7 +870,7 @@ static int pppoe_sendmsg(struct kiocb *i
+       }
+ 
+       /* Reserve space for headers. */
+-      skb_reserve(skb, dev->hard_header_len);
++      skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
+       skb_reset_network_header(skb);
+ 
+       skb->dev = dev;

diff --git a/target/linux/generic-2.6/patches-2.6.35/260-crypto_optional_tests.patch b/target/linux/generic-2.6/patches-2.6.35/260-crypto_optional_tests.patch
new file mode 100644 (file)
index 0000000..f431f5d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/260-crypto_optional_tests.patch
@@ -0,0 +1,63 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2
+       select CRYPTO_BLKCIPHER2
+       select CRYPTO_PCOMP
+ 
++config CRYPTO_MANAGER_NO_TESTS
++      bool "Disable internal testsuite to save space"
++      depends on CRYPTO_MANAGER
++
+ config CRYPTO_GF128MUL
+       tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+--- a/crypto/testmgr.c
++++ b/crypto/testmgr.c
+@@ -47,6 +47,8 @@
+ #define ENCRYPT 1
+ #define DECRYPT 0
+ 
++#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
++
+ struct tcrypt_result {
+       struct completion completion;
+       int err;
+@@ -2443,8 +2445,11 @@ static int alg_find_test(const char *alg
+       return -1;
+ }
+ 
++#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
++
+ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
+ {
++#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
+       int i;
+       int j;
+       int rc;
+@@ -2499,5 +2504,8 @@ notest:
+       return 0;
+ non_fips_alg:
+       return -EINVAL;
++#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
++      return 0;
++#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
+ }
+ EXPORT_SYMBOL_GPL(alg_test);
+--- a/crypto/testmgr.h
++++ b/crypto/testmgr.h
+@@ -20,6 +20,8 @@
+ 
+ #include <crypto/compress.h>
+ 
++#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
++
+ #define MAX_DIGEST_SIZE               64
+ #define MAX_TAP                       8
+ 
+@@ -9552,4 +9554,6 @@ static struct hash_testvec crc32c_tv_tem
+       },
+ };
+ 
++#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
++
+ #endif        /* _CRYPTO_TESTMGR_H */

diff --git a/target/linux/generic-2.6/patches-2.6.35/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.35/400-ledtrig_morse.patch
new file mode 100644 (file)
index 0000000..3f43c90
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/400-ledtrig_morse.patch
@@ -0,0 +1,18 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -354,4 +354,8 @@ endif # LEDS_TRIGGERS
+ 
+ endif # LEDS_CLASS
+ 
++config LEDS_TRIGGER_MORSE
++      tristate "LED Morse Trigger"
++      depends on LEDS_TRIGGERS
++
+ endif # NEW_LEDS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -46,3 +46,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
+ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)  += ledtrig-backlight.o
+ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledtrig-gpio.o
+ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
++obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.35/402-ledtrig_netdev.patch
new file mode 100644 (file)
index 0000000..da66e54
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/402-ledtrig_netdev.patch
@@ -0,0 +1,21 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -358,4 +358,11 @@ config LEDS_TRIGGER_MORSE
+       tristate "LED Morse Trigger"
+       depends on LEDS_TRIGGERS
+ 
++config LEDS_TRIGGER_NETDEV
++      tristate "LED Netdev Trigger"
++      depends on LEDS_TRIGGERS
++      help
++        This allows LEDs to be controlled by network device activity.
++        If unsure, say Y.
++
+ endif # NEW_LEDS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -47,3 +47,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
+ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledtrig-gpio.o
+ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
++obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.35/410-gpio_buttons.patch
new file mode 100644 (file)
index 0000000..e38c31d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/410-gpio_buttons.patch
@@ -0,0 +1,31 @@
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
+@@ -340,4 +340,20 @@ config INPUT_PCAP
+         To compile this driver as a module, choose M here: the
+         module will be called pcap_keys.
+ 
++config INPUT_GPIO_BUTTONS
++      tristate "Polled GPIO buttons interface"
++      depends on GENERIC_GPIO
++      select INPUT_POLLDEV
++      help
++        This driver implements support for buttons connected
++        to GPIO pins of various CPUs (and some other chips).
++
++        Say Y here if your device has buttons connected
++        directly to such GPIO pins.  Your board-specific
++        setup logic must also provide a platform device,
++        with configuration data saying which GPIOs are used.
++
++        To compile this driver as a module, choose M here: the
++        module will be called gpio-buttons.
++
+ endif
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
+@@ -32,4 +32,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR)              += winb
+ obj-$(CONFIG_INPUT_WISTRON_BTNS)      += wistron_btns.o
+ obj-$(CONFIG_INPUT_WM831X_ON)         += wm831x-on.o
+ obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
++obj-$(CONFIG_INPUT_GPIO_BUTTONS)      += gpio_buttons.o
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.35/420-gpiodev.patch
new file mode 100644 (file)
index 0000000..27da3c7
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/420-gpiodev.patch
@@ -0,0 +1,27 @@
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -1024,6 +1024,14 @@ config CS5535_GPIO
+ 
+         If compiled as a module, it will be called cs5535_gpio.
+ 
++config GPIO_DEVICE
++      tristate "GPIO device support"
++      depends on GENERIC_GPIO
++      help
++        Say Y to enable Linux GPIO device support.  This allows control of
++        GPIO pins using a character device
++
++
+ config RAW_DRIVER
+       tristate "RAW driver (/dev/raw/rawN)"
+       depends on BLOCK
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)    += scx200_gpio
+ obj-$(CONFIG_PC8736x_GPIO)    += pc8736x_gpio.o
+ obj-$(CONFIG_NSC_GPIO)                += nsc_gpio.o
+ obj-$(CONFIG_CS5535_GPIO)     += cs5535_gpio.o
++obj-$(CONFIG_GPIO_DEVICE)     += gpio_dev.o
+ obj-$(CONFIG_GPIO_TB0219)     += tb0219.o
+ obj-$(CONFIG_TELCLOCK)                += tlclk.o
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.35/430-scsi_header_fix.patch
new file mode 100644 (file)
index 0000000..59e4333
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/430-scsi_header_fix.patch
@@ -0,0 +1,17 @@
+--- a/include/scsi/scsi.h
++++ b/include/scsi/scsi.h
+@@ -149,10 +149,10 @@ struct scsi_cmnd;
+ 
+ /* defined in T10 SCSI Primary Commands-2 (SPC2) */
+ struct scsi_varlen_cdb_hdr {
+-      u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
+-      u8 control;
+-      u8 misc[5];
+-      u8 additional_cdb_length;         /* total cdb length - 8 */
++      __u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
++      __u8 control;
++      __u8 misc[5];
++      __u8 additional_cdb_length;         /* total cdb length - 8 */
+       __be16 service_action;
+       /* service specific data follows */
+ };

diff --git a/target/linux/generic-2.6/patches-2.6.35/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.35/510-yaffs_support.patch
new file mode 100644 (file)
index 0000000..192181f
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/510-yaffs_support.patch
@@ -0,0 +1,18 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -44,6 +44,7 @@ source "fs/gfs2/Kconfig"
+ source "fs/ocfs2/Kconfig"
+ source "fs/btrfs/Kconfig"
+ source "fs/nilfs2/Kconfig"
++source "fs/yaffs2/Kconfig"
+ 
+ endif # BLOCK
+ 
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -127,3 +127,5 @@ obj-$(CONFIG_BTRFS_FS)             += btrfs/
+ obj-$(CONFIG_GFS2_FS)           += gfs2/
+ obj-$(CONFIG_EXOFS_FS)          += exofs/
+ obj-$(CONFIG_CEPH_FS)         += ceph/
++obj-$(CONFIG_YAFFS_FS)                += yaffs2/
++

diff --git a/target/linux/generic-2.6/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch
new file mode 100644 (file)
index 0000000..c40da10
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch
@@ -0,0 +1,12344 @@
+--- a/fs/yaffs2/devextras.h
++++ b/fs/yaffs2/devextras.h
+@@ -14,194 +14,135 @@
+  */
+ 
+ /*
+- * This file is just holds extra declarations used during development.
+- * Most of these are from kernel includes placed here so we can use them in
+- * applications.
++ * This file is just holds extra declarations of macros that would normally
++ * be providesd in the Linux kernel. These macros have been written from
++ * scratch but are functionally equivalent to the Linux ones.
+  *
+  */
+ 
+ #ifndef __EXTRAS_H__
+ #define __EXTRAS_H__
+ 
+-#if defined WIN32
+-#define __inline__ __inline
+-#define new newHack
+-#endif
+-
+-#if !(defined __KERNEL__) || (defined WIN32)
+ 
+-/* User space defines */
++#if !(defined __KERNEL__)
+ 
++/* Definition of types */
+ typedef unsigned char __u8;
+ typedef unsigned short __u16;
+ typedef unsigned __u32;
+ 
++#endif
++
+ /*
+- * Simple doubly linked list implementation.
+- *
+- * Some of the internal functions ("__xxx") are useful when
+- * manipulating whole lists rather than single entries, as
+- * sometimes we already know the next/prev entries and we can
+- * generate better code by using them directly rather than
+- * using the generic single-entry routines.
++ * This is a simple doubly linked list implementation that matches the
++ * way the Linux kernel doubly linked list implementation works.
+  */
+ 
+-#define prefetch(x) 1
+-
+-struct list_head {
+-      struct list_head *next, *prev;
++struct ylist_head {
++      struct ylist_head *next; /* next in chain */
++      struct ylist_head *prev; /* previous in chain */
+ };
+ 
+-#define LIST_HEAD_INIT(name) { &(name), &(name) }
+ 
+-#define LIST_HEAD(name) \
+-      struct list_head name = LIST_HEAD_INIT(name)
++/* Initialise a static list */
++#define YLIST_HEAD(name) \
++struct ylist_head name = { &(name), &(name)}
++
+ 
+-#define INIT_LIST_HEAD(ptr) do { \
+-      (ptr)->next = (ptr); (ptr)->prev = (ptr); \
++
++/* Initialise a list head to an empty list */
++#define YINIT_LIST_HEAD(p) \
++do { \
++      (p)->next = (p);\
++      (p)->prev = (p); \
+ } while (0)
+ 
+-/*
+- * Insert a new entry between two known consecutive entries.
+- *
+- * This is only for internal list manipulation where we know
+- * the prev/next entries already!
+- */
+-static __inline__ void __list_add(struct list_head *new,
+-                                struct list_head *prev,
+-                                struct list_head *next)
+-{
+-      next->prev = new;
+-      new->next = next;
+-      new->prev = prev;
+-      prev->next = new;
+-}
+ 
+-/**
+- * list_add - add a new entry
+- * @new: new entry to be added
+- * @head: list head to add it after
+- *
+- * Insert a new entry after the specified head.
+- * This is good for implementing stacks.
+- */
+-static __inline__ void list_add(struct list_head *new, struct list_head *head)
++/* Add an element to a list */
++static __inline__ void ylist_add(struct ylist_head *newEntry,
++                              struct ylist_head *list)
+ {
+-      __list_add(new, head, head->next);
+-}
++      struct ylist_head *listNext = list->next;
++
++      list->next = newEntry;
++      newEntry->prev = list;
++      newEntry->next = listNext;
++      listNext->prev = newEntry;
+ 
+-/**
+- * list_add_tail - add a new entry
+- * @new: new entry to be added
+- * @head: list head to add it before
+- *
+- * Insert a new entry before the specified head.
+- * This is useful for implementing queues.
+- */
+-static __inline__ void list_add_tail(struct list_head *new,
+-                                   struct list_head *head)
+-{
+-      __list_add(new, head->prev, head);
+ }
+ 
+-/*
+- * Delete a list entry by making the prev/next entries
+- * point to each other.
+- *
+- * This is only for internal list manipulation where we know
+- * the prev/next entries already!
+- */
+-static __inline__ void __list_del(struct list_head *prev,
+-                                struct list_head *next)
++static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
++                               struct ylist_head *list)
+ {
+-      next->prev = prev;
+-      prev->next = next;
++      struct ylist_head *listPrev = list->prev;
++
++      list->prev = newEntry;
++      newEntry->next = list;
++      newEntry->prev = listPrev;
++      listPrev->next = newEntry;
++
+ }
+ 
+-/**
+- * list_del - deletes entry from list.
+- * @entry: the element to delete from the list.
+- * Note: list_empty on entry does not return true after this, the entry is
+- * in an undefined state.
+- */
+-static __inline__ void list_del(struct list_head *entry)
++
++/* Take an element out of its current list, with or without
++ * reinitialising the links.of the entry*/
++static __inline__ void ylist_del(struct ylist_head *entry)
+ {
+-      __list_del(entry->prev, entry->next);
++      struct ylist_head *listNext = entry->next;
++      struct ylist_head *listPrev = entry->prev;
++
++      listNext->prev = listPrev;
++      listPrev->next = listNext;
++
+ }
+ 
+-/**
+- * list_del_init - deletes entry from list and reinitialize it.
+- * @entry: the element to delete from the list.
+- */
+-static __inline__ void list_del_init(struct list_head *entry)
++static __inline__ void ylist_del_init(struct ylist_head *entry)
+ {
+-      __list_del(entry->prev, entry->next);
+-      INIT_LIST_HEAD(entry);
++      ylist_del(entry);
++      entry->next = entry->prev = entry;
+ }
+ 
+-/**
+- * list_empty - tests whether a list is empty
+- * @head: the list to test.
+- */
+-static __inline__ int list_empty(struct list_head *head)
++
++/* Test if the list is empty */
++static __inline__ int ylist_empty(struct ylist_head *entry)
+ {
+-      return head->next == head;
++      return (entry->next == entry);
+ }
+ 
+-/**
+- * list_splice - join two lists
+- * @list: the new list to add.
+- * @head: the place to add it in the first list.
++
++/* ylist_entry takes a pointer to a list entry and offsets it to that
++ * we can find a pointer to the object it is embedded in.
+  */
+-static __inline__ void list_splice(struct list_head *list,
+-                                 struct list_head *head)
+-{
+-      struct list_head *first = list->next;
+ 
+-      if (first != list) {
+-              struct list_head *last = list->prev;
+-              struct list_head *at = head->next;
+-
+-              first->prev = head;
+-              head->next = first;
+-
+-              last->next = at;
+-              at->prev = last;
+-      }
+-}
+ 
+-/**
+- * list_entry - get the struct for this entry
+- * @ptr:      the &struct list_head pointer.
+- * @type:     the type of the struct this is embedded in.
+- * @member:   the name of the list_struct within the struct.
+- */
+-#define list_entry(ptr, type, member) \
+-      ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
+-
+-/**
+- * list_for_each      -       iterate over a list
+- * @pos:      the &struct list_head to use as a loop counter.
+- * @head:     the head for your list.
+- */
+-#define list_for_each(pos, head) \
+-      for (pos = (head)->next, prefetch(pos->next); pos != (head); \
+-              pos = pos->next, prefetch(pos->next))
+-
+-/**
+- * list_for_each_safe -       iterate over a list safe against removal
+- *                              of list entry
+- * @pos:      the &struct list_head to use as a loop counter.
+- * @n:                another &struct list_head to use as temporary storage
+- * @head:     the head for your list.
+- */
+-#define list_for_each_safe(pos, n, head) \
+-      for (pos = (head)->next, n = pos->next; pos != (head); \
+-              pos = n, n = pos->next)
++#define ylist_entry(entry, type, member) \
++      ((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
+ 
+-/*
+- * File types
++
++/* ylist_for_each and list_for_each_safe  iterate over lists.
++ * ylist_for_each_safe uses temporary storage to make the list delete safe
+  */
++
++#define ylist_for_each(itervar, list) \
++      for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
++
++#define ylist_for_each_safe(itervar, saveVar, list) \
++      for (itervar = (list)->next, saveVar = (list)->next->next; \
++              itervar != (list); itervar = saveVar, saveVar = saveVar->next)
++
++
++#if !(defined __KERNEL__)
++
++
++#ifndef WIN32
++#include <sys/stat.h>
++#endif
++
++
++#ifdef CONFIG_YAFFS_PROVIDE_DEFS
++/* File types */
++
++
+ #define DT_UNKNOWN    0
+ #define DT_FIFO               1
+ #define DT_CHR                2
+@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
+ #define DT_SOCK               12
+ #define DT_WHT                14
+ 
++
+ #ifndef WIN32
+ #include <sys/stat.h>
+ #endif
+@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
+ #define ATTR_ATIME    16
+ #define ATTR_MTIME    32
+ #define ATTR_CTIME    64
+-#define ATTR_ATIME_SET        128
+-#define ATTR_MTIME_SET        256
+-#define ATTR_FORCE    512     /* Not a change, but a change it */
+-#define ATTR_ATTR_FLAG        1024
+ 
+ struct iattr {
+       unsigned int ia_valid;
+@@ -244,21 +182,15 @@ struct iattr {
+       unsigned int ia_attr_flags;
+ };
+ 
+-#define KERN_DEBUG
++#endif
+ 
+ #else
+ 
+-#ifndef WIN32
+ #include <linux/types.h>
+-#include <linux/list.h>
+ #include <linux/fs.h>
+ #include <linux/stat.h>
+-#endif
+ 
+ #endif
+ 
+-#if defined WIN32
+-#undef new
+-#endif
+ 
+ #endif
+--- a/fs/yaffs2/Kconfig
++++ b/fs/yaffs2/Kconfig
+@@ -5,7 +5,7 @@
+ config YAFFS_FS
+       tristate "YAFFS2 file system support"
+       default n
+-      depends on MTD
++      depends on MTD_BLOCK
+       select YAFFS_YAFFS1
+       select YAFFS_YAFFS2
+       help
+@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
+         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.
++        older-style format.  See notes on tags formats and MTD versions
++        in yaffs_mtdif1.c.
+ 
+         If unsure, say N.
+ 
+@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
+ 
+         If unsure, say N.
+ 
+-config YAFFS_CHECKPOINT_RESERVED_BLOCKS
+-      int "Reserved blocks for checkpointing"
+-      depends on YAFFS_YAFFS2
+-      default 10
+-      help
+-          Give the number of Blocks to reserve for checkpointing.
+-        Checkpointing saves the state at unmount so that mounting is
+-        much faster as a scan of all the flash to regenerate this state
+-        is not needed.  These Blocks are reserved per partition, so if
+-        you have very small partitions the default (10) may be a mess
+-        for you.  You can set this value to 0, but that does not mean
+-        checkpointing is disabled at all. There only won't be any
+-        specially reserved blocks for checkpointing, so if there is
+-        enough free space on the filesystem, it will be used for
+-        checkpointing.
+-
+-        If unsure, leave at default (10), but don't wonder if there are
+-        always 2MB used on your large page device partition (10 x 2k
+-        pagesize). When using small partitions or when being very small
+-        on space, you probably want to set this to zero.
+ 
+ config YAFFS_DISABLE_WIDE_TNODES
+       bool "Turn off wide tnodes"
+--- a/fs/yaffs2/Makefile
++++ b/fs/yaffs2/Makefile
+@@ -5,7 +5,6 @@
+ obj-$(CONFIG_YAFFS_FS) += yaffs.o
+ 
+ yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
+-yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
++yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
+ yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
+-yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
+-yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
++yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
+--- a/fs/yaffs2/moduleconfig.h
++++ b/fs/yaffs2/moduleconfig.h
+@@ -27,12 +27,12 @@
+ 
+ /* Default: Not selected */
+ /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
+-//#define CONFIG_YAFFS_DOES_ECC
++/* #define CONFIG_YAFFS_DOES_ECC */
+ 
+ /* Default: Not selected */
+ /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
+ /*          CONFIG_YAFFS_DOES_ECC is set */
+-//#define CONFIG_YAFFS_ECC_WRONG_ORDER
++/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
+ 
+ /* Default: Selected */
+ /* Meaning: Disables testing whether chunks are erased before writing to them*/
+@@ -54,11 +54,11 @@ that you need to continue to support.  N
+ 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.
++MTD versions in yaffs_mtdif1.c.
+ */
+ /* Default: Not selected */
+ /* Meaning: Use older-style on-NAND data format with pageStatus byte */
+-#define CONFIG_YAFFS_9BYTE_TAGS
++/* #define CONFIG_YAFFS_9BYTE_TAGS */
+ 
+ #endif /* YAFFS_OUT_OF_TREE */
+ 
+--- a/fs/yaffs2/yaffs_checkptrw.c
++++ b/fs/yaffs2/yaffs_checkptrw.c
+@@ -12,48 +12,43 @@
+  */
+ 
+ const char *yaffs_checkptrw_c_version =
+-    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
++      "$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
+ 
+ 
+ #include "yaffs_checkptrw.h"
+-
++#include "yaffs_getblockinfo.h"
+ 
+ static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
+ {
+-
+       int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
+ 
+       T(YAFFS_TRACE_CHECKPOINT,
+               (TSTR("checkpt blocks available = %d" TENDSTR),
+               blocksAvailable));
+ 
+-
+       return (blocksAvailable <= 0) ? 0 : 1;
+ }
+ 
+ 
+ static int yaffs_CheckpointErase(yaffs_Device *dev)
+ {
+-
+       int i;
+ 
+-
+-      if(!dev->eraseBlockInNAND)
++      if (!dev->eraseBlockInNAND)
+               return 0;
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
+-              dev->internalStartBlock,dev->internalEndBlock));
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
++              dev->internalStartBlock, dev->internalEndBlock));
+ 
+-      for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
+-              yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
+-              if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
+-                      T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
+-                      if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
++      for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
++              yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
++              if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
++                      T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
++                      if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
+                               bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
+                               dev->nErasedBlocks++;
+                               dev->nFreeChunks += dev->nChunksPerBlock;
+-                      }
+-                      else {
+-                              dev->markNANDBlockBad(dev,i);
++                      } else {
++                              dev->markNANDBlockBad(dev, i);
+                               bi->blockState = YAFFS_BLOCK_STATE_DEAD;
+                       }
+               }
+@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
+       int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
+       T(YAFFS_TRACE_CHECKPOINT,
+               (TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
+-              dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
++              dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
+ 
+-      if(dev->checkpointNextBlock >= 0 &&
+-         dev->checkpointNextBlock <= dev->internalEndBlock &&
+-         blocksAvailable > 0){
+-
+-              for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
+-                      yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
+-                      if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
++      if (dev->checkpointNextBlock >= 0 &&
++                      dev->checkpointNextBlock <= dev->internalEndBlock &&
++                      blocksAvailable > 0) {
++
++              for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
++                      yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
++                      if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
+                               dev->checkpointNextBlock = i + 1;
+                               dev->checkpointCurrentBlock = i;
+-                              T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
++                              T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
+                               return;
+                       }
+               }
+       }
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
+ 
+       dev->checkpointNextBlock = -1;
+       dev->checkpointCurrentBlock = -1;
+@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
+       int  i;
+       yaffs_ExtendedTags tags;
+ 
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
+               dev->blocksInCheckpoint, dev->checkpointNextBlock));
+ 
+-      if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
+-              for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
++      if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
++              for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
+                       int chunk = i * dev->nChunksPerBlock;
+                       int realignedChunk = chunk - dev->chunkOffset;
+ 
+-                      dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
+-                      T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
+-                              i, tags.objectId,tags.sequenceNumber,tags.eccResult));
++                      dev->readChunkWithTagsFromNAND(dev, realignedChunk,
++                                      NULL, &tags);
++                      T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
++                              i, tags.objectId, tags.sequenceNumber, tags.eccResult));
+ 
+-                      if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
++                      if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
+                               /* Right kind of block */
+                               dev->checkpointNextBlock = tags.objectId;
+                               dev->checkpointCurrentBlock = i;
+                               dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
+                               dev->blocksInCheckpoint++;
+-                              T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
++                              T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
+                               return;
+                       }
+               }
+ 
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
+ 
+       dev->checkpointNextBlock = -1;
+       dev->checkpointCurrentBlock = -1;
+@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
+ 
+       /* Got the functions we need? */
+       if (!dev->writeChunkWithTagsToNAND ||
+-          !dev->readChunkWithTagsFromNAND ||
+-          !dev->eraseBlockInNAND ||
+-          !dev->markNANDBlockBad)
++                      !dev->readChunkWithTagsFromNAND ||
++                      !dev->eraseBlockInNAND ||
++                      !dev->markNANDBlockBad)
+               return 0;
+ 
+-      if(forWriting && !yaffs_CheckpointSpaceOk(dev))
++      if (forWriting && !yaffs_CheckpointSpaceOk(dev))
+               return 0;
+ 
+-      if(!dev->checkpointBuffer)
+-              dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
+-      if(!dev->checkpointBuffer)
++      if (!dev->checkpointBuffer)
++              dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
++      if (!dev->checkpointBuffer)
+               return 0;
+ 
+ 
+@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
+       dev->checkpointNextBlock = dev->internalStartBlock;
+ 
+       /* Erase all the blocks in the checkpoint area */
+-      if(forWriting){
+-              memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
++      if (forWriting) {
++              memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
+               dev->checkpointByteOffset = 0;
+               return yaffs_CheckpointErase(dev);
+-
+-
+       } else {
+               int i;
+               /* Set to a value that will kick off a read */
+@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
+               dev->blocksInCheckpoint = 0;
+               dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
+               dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
+-              for(i = 0; i < dev->checkpointMaxBlocks; i++)
++              for (i = 0; i < dev->checkpointMaxBlocks; i++)
+                       dev->checkpointBlockList[i] = -1;
+       }
+ 
+@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
+ 
+ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
+ {
+-
+       int chunk;
+       int realignedChunk;
+ 
+       yaffs_ExtendedTags tags;
+ 
+-      if(dev->checkpointCurrentBlock < 0){
++      if (dev->checkpointCurrentBlock < 0) {
+               yaffs_CheckpointFindNextErasedBlock(dev);
+               dev->checkpointCurrentChunk = 0;
+       }
+ 
+-      if(dev->checkpointCurrentBlock < 0)
++      if (dev->checkpointCurrentBlock < 0)
+               return 0;
+ 
+       tags.chunkDeleted = 0;
+@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
+       tags.chunkId = dev->checkpointPageSequence + 1;
+       tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
+       tags.byteCount = dev->nDataBytesPerChunk;
+-      if(dev->checkpointCurrentChunk == 0){
++      if (dev->checkpointCurrentChunk == 0) {
+               /* First chunk we write for the block? Set block state to
+                  checkpoint */
+-              yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
++              yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
+               bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
+               dev->blocksInCheckpoint++;
+       }
+@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
+       chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
+ 
+ 
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
+-              chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
++              chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
+ 
+       realignedChunk = chunk - dev->chunkOffset;
+ 
+-      dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
++      dev->writeChunkWithTagsToNAND(dev, realignedChunk,
++                      dev->checkpointBuffer, &tags);
+       dev->checkpointByteOffset = 0;
+       dev->checkpointPageSequence++;
+       dev->checkpointCurrentChunk++;
+-      if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
++      if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
+               dev->checkpointCurrentChunk = 0;
+               dev->checkpointCurrentBlock = -1;
+       }
+-      memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
++      memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
+ 
+       return 1;
+ }
+ 
+ 
+-int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
++int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
+ {
+-      int i=0;
++      int i = 0;
+       int ok = 1;
+ 
+ 
+@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
+ 
+ 
+ 
+-      if(!dev->checkpointBuffer)
++      if (!dev->checkpointBuffer)
+               return 0;
+ 
+-      if(!dev->checkpointOpenForWrite)
++      if (!dev->checkpointOpenForWrite)
+               return -1;
+ 
+-      while(i < nBytes && ok) {
+-
+-
+-
+-              dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
++      while (i < nBytes && ok) {
++              dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
+               dev->checkpointSum += *dataBytes;
+               dev->checkpointXor ^= *dataBytes;
+ 
+@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
+               dev->checkpointByteCount++;
+ 
+ 
+-              if(dev->checkpointByteOffset < 0 ||
++              if (dev->checkpointByteOffset < 0 ||
+                  dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
+                       ok = yaffs_CheckpointFlushBuffer(dev);
+-
+       }
+ 
+-      return  i;
++      return i;
+ }
+ 
+ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
+ {
+-      int i=0;
++      int i = 0;
+       int ok = 1;
+       yaffs_ExtendedTags tags;
+ 
+@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
+ 
+       __u8 *dataBytes = (__u8 *)data;
+ 
+-      if(!dev->checkpointBuffer)
++      if (!dev->checkpointBuffer)
+               return 0;
+ 
+-      if(dev->checkpointOpenForWrite)
++      if (dev->checkpointOpenForWrite)
+               return -1;
+ 
+-      while(i < nBytes && ok) {
++      while (i < nBytes && ok) {
+ 
+ 
+-              if(dev->checkpointByteOffset < 0 ||
+-                 dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
++              if (dev->checkpointByteOffset < 0 ||
++                      dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
+ 
+-                      if(dev->checkpointCurrentBlock < 0){
++                      if (dev->checkpointCurrentBlock < 0) {
+                               yaffs_CheckpointFindNextCheckpointBlock(dev);
+                               dev->checkpointCurrentChunk = 0;
+                       }
+ 
+-                      if(dev->checkpointCurrentBlock < 0)
++                      if (dev->checkpointCurrentBlock < 0)
+                               ok = 0;
+                       else {
+-
+-                              chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
+-                                        dev->checkpointCurrentChunk;
++                              chunk = dev->checkpointCurrentBlock *
++                                      dev->nChunksPerBlock +
++                                      dev->checkpointCurrentChunk;
+ 
+                               realignedChunk = chunk - dev->chunkOffset;
+ 
+-                              /* read in the next chunk */
+-                              /* printf("read checkpoint page %d\n",dev->checkpointPage); */
+-                              dev->readChunkWithTagsFromNAND(dev, realignedChunk,
+-                                                             dev->checkpointBuffer,
+-                                                            &tags);
+-
+-                              if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
+-                                 tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
+-                                 ok = 0;
++                              /* read in the next chunk */
++                              /* printf("read checkpoint page %d\n",dev->checkpointPage); */
++                              dev->readChunkWithTagsFromNAND(dev,
++                                              realignedChunk,
++                                              dev->checkpointBuffer,
++                                              &tags);
++
++                              if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
++                                      tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
++                                      tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
++                                      ok = 0;
+ 
+                               dev->checkpointByteOffset = 0;
+                               dev->checkpointPageSequence++;
+                               dev->checkpointCurrentChunk++;
+ 
+-                              if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
++                              if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
+                                       dev->checkpointCurrentBlock = -1;
+                       }
+               }
+ 
+-              if(ok){
++              if (ok) {
+                       *dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
+                       dev->checkpointSum += *dataBytes;
+                       dev->checkpointXor ^= *dataBytes;
+@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
+ int yaffs_CheckpointClose(yaffs_Device *dev)
+ {
+ 
+-      if(dev->checkpointOpenForWrite){
+-              if(dev->checkpointByteOffset != 0)
++      if (dev->checkpointOpenForWrite) {
++              if (dev->checkpointByteOffset != 0)
+                       yaffs_CheckpointFlushBuffer(dev);
+       } else {
+               int i;
+-              for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
+-                      yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
+-                      if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
++              for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
++                      yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
++                      if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
+                               bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
+                       else {
+-                              // Todo this looks odd...
++                              /* Todo this looks odd... */
+                       }
+               }
+               YFREE(dev->checkpointBlockList);
+@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
+       dev->nErasedBlocks -= dev->blocksInCheckpoint;
+ 
+ 
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
+                       dev->checkpointByteCount));
+ 
+-      if(dev->checkpointBuffer){
++      if (dev->checkpointBuffer) {
+               /* free the buffer */
+               YFREE(dev->checkpointBuffer);
+               dev->checkpointBuffer = NULL;
+               return 1;
+-      }
+-      else
++      } else
+               return 0;
+-
+ }
+ 
+ int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
+ {
+       /* Erase the first checksum block */
+ 
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
+ 
+-      if(!yaffs_CheckpointSpaceOk(dev))
++      if (!yaffs_CheckpointSpaceOk(dev))
+               return 0;
+ 
+       return yaffs_CheckpointErase(dev);
+--- a/fs/yaffs2/yaffs_checkptrw.h
++++ b/fs/yaffs2/yaffs_checkptrw.h
+@@ -20,9 +20,9 @@
+ 
+ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
+ 
+-int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
++int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
+ 
+-int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
++int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
+ 
+ int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
+ 
+--- a/fs/yaffs2/yaffs_ecc.c
++++ b/fs/yaffs2/yaffs_ecc.c
+@@ -29,7 +29,7 @@
+  */
+ 
+ const char *yaffs_ecc_c_version =
+-    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
++      "$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
+ 
+ #include "yportenv.h"
+ 
+@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
+               b = column_parity_table[*data++];
+               col_parity ^= b;
+ 
+-              if (b & 0x01)   // odd number of bits in the byte
+-              {
++              if (b & 0x01) {         /* odd number of bits in the byte */
+                       line_parity ^= i;
+                       line_parity_prime ^= ~i;
+               }
+-
+       }
+ 
+       ecc[2] = (~col_parity) | 0x03;
+@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
+       ecc[0] = ~t;
+ 
+ #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
+-      // Swap the bytes into the wrong order
++      /* Swap the bytes into the wrong order */
+       t = ecc[0];
+       ecc[0] = ecc[1];
+       ecc[1] = t;
+@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
+               unsigned bit;
+ 
+ #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
+-              // swap the bytes to correct for the wrong order
++              /* swap the bytes to correct for the wrong order */
+               unsigned char t;
+ 
+               t = d0;
+@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
+  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
+  */
+ void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
+-                           yaffs_ECCOther * eccOther)
++                              yaffs_ECCOther *eccOther)
+ {
+       unsigned int i;
+ 
+@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
+ }
+ 
+ int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
+-                        yaffs_ECCOther * read_ecc,
+-                        const yaffs_ECCOther * test_ecc)
++                      yaffs_ECCOther *read_ecc,
++                      const yaffs_ECCOther *test_ecc)
+ {
+       unsigned char cDelta;   /* column parity delta */
+       unsigned lDelta;        /* line parity delta */
+@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
+               return 0; /* no error */
+ 
+       if (lDelta == ~lDeltaPrime &&
+-          (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
+-      {
++          (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
+               /* Single bit (recoverable) error in data */
+ 
+               bit = 0;
+@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
+               if (cDelta & 0x02)
+                       bit |= 0x01;
+ 
+-              if(lDelta >= nBytes)
++              if (lDelta >= nBytes)
+                       return -1;
+ 
+               data[lDelta] ^= (1 << bit);
+@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
+       }
+ 
+       if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
+-           yaffs_CountBits(cDelta)) == 1) {
++                      yaffs_CountBits(cDelta)) == 1) {
+               /* Reccoverable error in ecc */
+ 
+               *read_ecc = *test_ecc;
+@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
+       /* Unrecoverable error */
+ 
+       return -1;
+-
+ }
+-
+--- a/fs/yaffs2/yaffs_ecc.h
++++ b/fs/yaffs2/yaffs_ecc.h
+@@ -13,15 +13,15 @@
+  * 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.
+-  *
+-  */
++/*
++ * 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__
+@@ -34,11 +34,11 @@ typedef struct {
+ 
+ void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
+ int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
+-                   const unsigned char *test_ecc);
++              const unsigned char *test_ecc);
+ 
+ void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
+-                           yaffs_ECCOther * ecc);
++                      yaffs_ECCOther *ecc);
+ int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
+-                        yaffs_ECCOther * read_ecc,
+-                        const yaffs_ECCOther * test_ecc);
++                      yaffs_ECCOther *read_ecc,
++                      const yaffs_ECCOther *test_ecc);
+ #endif
+--- a/fs/yaffs2/yaffs_fs.c
++++ b/fs/yaffs2/yaffs_fs.c
+@@ -1,7 +1,7 @@
+ /*
+  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+  *
+- * Copyright (C) 2002-2007 Aleph One Ltd.
++ * Copyright (C) 2002-2009 Aleph One Ltd.
+  *   for Toby Churchill Ltd and Brightstar Engineering
+  *
+  * Created by Charles Manning <charles@aleph1.co.uk>
+@@ -32,18 +32,17 @@
+  */
+ 
+ const char *yaffs_fs_c_version =
+-    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
++    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
+ extern const char *yaffs_guts_c_version;
+ 
+ #include <linux/version.h>
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#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/list.h>
+ #include <linux/fs.h>
+ #include <linux/proc_fs.h>
+ #include <linux/smp_lock.h>
+@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
+ #include <linux/string.h>
+ #include <linux/ctype.h>
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#include "asm/div64.h"
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+ 
+ #include <linux/statfs.h>     /* Added NCB 15-8-2003 */
+-#include <asm/statfs.h>
++#include <linux/statfs.h>
+ #define UnlockPage(p) unlock_page(p)
+ #define Page_Uptodate(page)   test_bit(PG_uptodate, &(page)->flags)
+ 
+@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
+ #define       BDEVNAME_SIZE           0
+ #define       yaffs_devname(sb, buf)  kdevname(sb->s_dev)
+ 
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
++#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,17))
++#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, 17))
+ #define WRITE_SIZE_STR "writesize"
+-#define WRITE_SIZE(mtd) (mtd)->writesize
++#define WRITE_SIZE(mtd) ((mtd)->writesize)
+ #else
+ #define WRITE_SIZE_STR "oobblock"
+-#define WRITE_SIZE(mtd) (mtd)->oobblock
++#define WRITE_SIZE(mtd) ((mtd)->oobblock)
+ #endif
+ 
+-#include <asm/uaccess.h>
++#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(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 "yportenv.h"
+ #include "yaffs_guts.h"
+@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
+ 
+ unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
+ unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
++unsigned int yaffs_auto_checkpoint = 1;
+ 
+ /* Module Parameters */
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+-module_param(yaffs_traceMask,uint,0644);
+-module_param(yaffs_wr_attempts,uint,0644);
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++module_param(yaffs_traceMask, uint, 0644);
++module_param(yaffs_wr_attempts, uint, 0644);
++module_param(yaffs_auto_checkpoint, uint, 0644);
++#else
++MODULE_PARM(yaffs_traceMask, "i");
++MODULE_PARM(yaffs_wr_attempts, "i");
++MODULE_PARM(yaffs_auto_checkpoint, "i");
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
++/* use iget and read_inode */
++#define Y_IGET(sb, inum) iget((sb), (inum))
++static void yaffs_read_inode(struct inode *inode);
++
+ #else
+-MODULE_PARM(yaffs_traceMask,"i");
+-MODULE_PARM(yaffs_wr_attempts,"i");
++/* Call local equivalent */
++#define YAFFS_USE_OWN_IGET
++#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
++
++static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
+ #endif
+ 
+ /*#define T(x) printk x */
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
+-#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
++#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
+ #else
+-#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
++#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
+ #endif
+ 
+ #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
+ #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+ #define yaffs_SuperToDevice(sb)       ((yaffs_Device *)sb->s_fs_info)
+ #else
+ #define yaffs_SuperToDevice(sb)       ((yaffs_Device *)sb->u.generic_sbp)
+@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
+ static void yaffs_put_super(struct super_block *sb);
+ 
+ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
+-                              loff_t * pos);
++                              loff_t *pos);
++static ssize_t yaffs_hold_space(struct file *f);
++static void yaffs_release_space(struct file *f);
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#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
+ 
+ static int yaffs_sync_object(struct file *file, struct dentry *dentry,
+-                           int datasync);
++                              int datasync);
+ 
+ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
+                       struct nameidata *n);
+ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
+-                                 struct nameidata *n);
++                                      struct nameidata *n);
+ #else
+ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
+ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
+ #endif
+ static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
+-                    struct dentry *dentry);
++                      struct dentry *dentry);
+ static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
+ static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
+-                       const char *symname);
++                      const char *symname);
+ static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+-                     dev_t dev);
++                      dev_t dev);
+ #else
+ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+-                     int dev);
++                      int dev);
+ #endif
+ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
+                       struct inode *new_dir, struct dentry *new_dentry);
+ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+ static int yaffs_sync_fs(struct super_block *sb, int wait);
+ static void yaffs_write_super(struct super_block *sb);
+ #else
+@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
+ static int yaffs_write_super(struct super_block *sb);
+ #endif
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
+-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+ static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
+ #else
+ static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
+ #endif
+-static void yaffs_read_inode(struct inode *inode);
+ 
++#ifdef YAFFS_HAS_PUT_INODE
+ static void yaffs_put_inode(struct inode *inode);
++#endif
++
+ static void yaffs_delete_inode(struct inode *);
+ static void yaffs_clear_inode(struct inode *);
+ 
+ static int yaffs_readpage(struct file *file, struct page *page);
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,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
++
++
++#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);
++static int yaffs_write_end(struct file *filp, struct address_space *mapping,
++                              loff_t pos, unsigned len, unsigned copied,
++                              struct page *pg, void *fsdadata);
++#else
+ static int yaffs_prepare_write(struct file *f, struct page *pg,
+-                             unsigned offset, unsigned to);
++                              unsigned offset, unsigned to);
+ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
+-                            unsigned to);
++                              unsigned to);
+ 
+-static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
+-                        int buflen);
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
++#endif
++
++static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
++                              int buflen);
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
+ static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
+ #else
+ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
+@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
+ 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,22))
+-static struct file_operations yaffs_file_operations = {
++#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,
+@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
+       .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))
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
+ 
+-static struct file_operations yaffs_file_operations = {
++static const struct file_operations yaffs_file_operations = {
+       .read = do_sync_read,
+       .write = do_sync_write,
+       .aio_read = generic_file_aio_read,
+@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
+ 
+ #else
+ 
+-static struct file_operations yaffs_file_operations = {
++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))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+       .sendfile = generic_file_sendfile,
+ #endif
+ };
+ #endif
+ 
+-static struct inode_operations yaffs_file_inode_operations = {
++static const struct inode_operations yaffs_file_inode_operations = {
+       .setattr = yaffs_setattr,
+ };
+ 
+-static struct inode_operations yaffs_symlink_inode_operations = {
++static const struct inode_operations yaffs_symlink_inode_operations = {
+       .readlink = yaffs_readlink,
+       .follow_link = yaffs_follow_link,
+       .setattr = yaffs_setattr,
+ };
+ 
+-static struct inode_operations yaffs_dir_inode_operations = {
++static const struct inode_operations yaffs_dir_inode_operations = {
+       .create = yaffs_create,
+       .lookup = yaffs_lookup,
+       .link = yaffs_link,
+@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
+       .setattr = yaffs_setattr,
+ };
+ 
+-static struct file_operations yaffs_dir_operations = {
++static const struct file_operations yaffs_dir_operations = {
+       .read = generic_read_dir,
+       .readdir = yaffs_readdir,
+       .fsync = yaffs_sync_object,
+ };
+ 
+-static struct super_operations yaffs_super_ops = {
++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,
+       .delete_inode = yaffs_delete_inode,
+       .clear_inode = yaffs_clear_inode,
+@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
+       .write_super = yaffs_write_super,
+ };
+ 
+-static void yaffs_GrossLock(yaffs_Device * dev)
++static void yaffs_GrossLock(yaffs_Device *dev)
+ {
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
+-
++      T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
+       down(&dev->grossLock);
++      T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
+ }
+ 
+-static void yaffs_GrossUnlock(yaffs_Device * dev)
++static void yaffs_GrossUnlock(yaffs_Device *dev)
+ {
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
++      T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
+       up(&dev->grossLock);
+-
+ }
+ 
+-static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
+-                        int buflen)
++static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
++                      int buflen)
+ {
+       unsigned char *alias;
+       int ret;
+@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
+       return ret;
+ }
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
+ static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+ #else
+ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
+ 
+       yaffs_GrossUnlock(dev);
+ 
+-      if (!alias)
+-        {
++      if (!alias) {
+               ret = -ENOMEM;
+               goto out;
+-        }
++      }
+ 
+       ret = vfs_follow_link(nd, alias);
+       kfree(alias);
+ out:
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
+-      return ERR_PTR (ret);
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
++      return ERR_PTR(ret);
+ #else
+       return ret;
+ #endif
+ }
+ 
+ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
+-                            yaffs_Object * obj);
++                              yaffs_Object *obj);
+ 
+ /*
+  * Lookup is used to find objects in the fs
+  */
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+ 
+ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
+-                                 struct nameidata *n)
++                              struct nameidata *n)
+ #else
+ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
+ #endif
+@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
+       yaffs_GrossLock(dev);
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_lookup for %d:%s\n",
+-         yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
++              ("yaffs_lookup for %d:%s\n",
++              yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
+ 
+-      obj =
+-          yaffs_FindObjectByName(yaffs_InodeToObject(dir),
+-                                 dentry->d_name.name);
++      obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
++                                      dentry->d_name.name);
+ 
+       obj = yaffs_GetEquivalentObject(obj);   /* in case it was a hardlink */
+ 
+@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
+ 
+       if (obj) {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
++                      ("yaffs_lookup found %d\n", obj->objectId));
+ 
+               inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
+ 
+               if (inode) {
+                       T(YAFFS_TRACE_OS,
+-                        (KERN_DEBUG "yaffs_loookup dentry \n"));
++                              ("yaffs_loookup dentry \n"));
+ /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
+  * d_add even if NULL inode */
+ #if 0
+@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
+               }
+ 
+       } else {
+-              T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
++              T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
+ 
+       }
+ 
+@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
+       d_add(dentry, inode);
+ 
+       return NULL;
+-      /*      return (ERR_PTR(-EIO)); */
+-
+ }
+ 
++
++#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)
+ {
+       T(YAFFS_TRACE_OS,
+-        ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
+-         atomic_read(&inode->i_count)));
++              ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
++              atomic_read(&inode->i_count)));
+ 
+ }
++#endif
+ 
+ /* clear is called to tell the fs to release any per-inode data it holds */
+ static void yaffs_clear_inode(struct inode *inode)
+@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
+       obj = yaffs_InodeToObject(inode);
+ 
+       T(YAFFS_TRACE_OS,
+-        ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
+-         atomic_read(&inode->i_count),
+-         obj ? "object exists" : "null object"));
++              ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
++              atomic_read(&inode->i_count),
++              obj ? "object exists" : "null object"));
+ 
+       if (obj) {
+               dev = obj->myDev;
+@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
+       yaffs_Device *dev;
+ 
+       T(YAFFS_TRACE_OS,
+-        ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
+-         atomic_read(&inode->i_count),
+-         obj ? "object exists" : "null object"));
++              ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
++              atomic_read(&inode->i_count),
++              obj ? "object exists" : "null object"));
+ 
+       if (obj) {
+               dev = obj->myDev;
+               yaffs_GrossLock(dev);
+-              yaffs_DeleteFile(obj);
++              yaffs_DeleteObject(obj);
+               yaffs_GrossUnlock(dev);
+       }
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
+-        truncate_inode_pages (&inode->i_data, 0);
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
++      truncate_inode_pages(&inode->i_data, 0);
+ #endif
+       clear_inode(inode);
+ }
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#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)
+@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
+       yaffs_Device *dev = obj->myDev;
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
+-         obj->dirty ? "dirty" : "clean"));
++              ("yaffs_file_flush object %d (%s)\n", obj->objectId,
++              obj->dirty ? "dirty" : "clean"));
+ 
+       yaffs_GrossLock(dev);
+ 
+@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
+ 
+       yaffs_Device *dev;
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
+-                         (unsigned)(pg->index << PAGE_CACHE_SHIFT),
+-                         (unsigned)PAGE_CACHE_SIZE));
++      T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
++                      (unsigned)(pg->index << PAGE_CACHE_SHIFT),
++                      (unsigned)PAGE_CACHE_SIZE));
+ 
+       obj = yaffs_DentryToObject(f->f_dentry);
+ 
+       dev = obj->myDev;
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+       BUG_ON(!PageLocked(pg));
+ #else
+       if (!PageLocked(pg))
+@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
+ 
+       yaffs_GrossLock(dev);
+ 
+-      ret =
+-          yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
+-                                 PAGE_CACHE_SIZE);
++      ret = yaffs_ReadDataFromFile(obj, pg_buf,
++                              pg->index << PAGE_CACHE_SHIFT,
++                              PAGE_CACHE_SIZE);
+ 
+       yaffs_GrossUnlock(dev);
+ 
+@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
+       flush_dcache_page(pg);
+       kunmap(pg);
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
+       return ret;
+ }
+ 
+@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
+ 
+ /* writepage inspired by/stolen from smbfs */
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,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)
+@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
+ 
+       if (offset > inode->i_size) {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG
+-                 "yaffs_writepage at %08x, inode size = %08x!!!\n",
+-                 (unsigned)(page->index << PAGE_CACHE_SHIFT),
+-                 (unsigned)inode->i_size));
++                      ("yaffs_writepage at %08x, inode size = %08x!!!\n",
++                      (unsigned)(page->index << PAGE_CACHE_SHIFT),
++                      (unsigned)inode->i_size));
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "                -> don't care!!\n"));
++                      ("                -> don't care!!\n"));
+               unlock_page(page);
+               return 0;
+       }
+@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
+       end_index = inode->i_size >> PAGE_CACHE_SHIFT;
+ 
+       /* easy case */
+-      if (page->index < end_index) {
++      if (page->index < end_index)
+               nBytes = PAGE_CACHE_SIZE;
+-      } else {
++      else
+               nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
+-      }
+ 
+       get_page(page);
+ 
+@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
+       yaffs_GrossLock(obj->myDev);
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
+-         (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
++              ("yaffs_writepage at %08x, size %08x\n",
++              (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
+-         (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
++              ("writepag0: obj = %05x, ino = %05x\n",
++              (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
+ 
+-      nWritten =
+-          yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
+-                                nBytes, 0);
++      nWritten = yaffs_WriteDataToFile(obj, buffer,
++                      page->index << PAGE_CACHE_SHIFT, nBytes, 0);
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
+-         (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
++              ("writepag1: obj = %05x, ino = %05x\n",
++              (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
+ 
+       yaffs_GrossUnlock(obj->myDev);
+ 
+@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
+       return (nWritten == nBytes) ? 0 : -ENOSPC;
+ }
+ 
++
++#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;
++      uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
++      uint32_t to = offset + len;
++
++      int ret = 0;
++      int space_held = 0;
++
++      T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
++      /* 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;
++      }
++      /* Get fs space */
++      space_held = yaffs_hold_space(filp);
++
++      if (!space_held) {
++              ret = -ENOSPC;
++              goto out;
++      }
++
++      /* Update page if required */
++
++      if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
++              ret = yaffs_readpage_nolock(filp, pg);
++
++      if (ret)
++              goto out;
++
++      /* Happy path return */
++      T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
++
++      return 0;
++
++out:
++      T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", 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)
++                              unsigned offset, unsigned to)
+ {
++      T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
+       if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
+               return yaffs_readpage_nolock(f, pg);
+-
+       return 0;
++}
++#endif
++
++#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;
++
++      T(YAFFS_TRACE_OS,
++              ("yaffs_write_end addr %x pos %x nBytes %d\n",
++              (unsigned) addr,
++              (int)pos, copied));
++
++      ret = yaffs_file_write(filp, addr, copied, &pos);
++
++      if (ret != copied) {
++              T(YAFFS_TRACE_OS,
++                      ("yaffs_write_end not same size ret %d  copied %d\n",
++                      ret, copied));
++              SetPageError(pg);
++              ClearPageUptodate(pg);
++      } else {
++              SetPageUptodate(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)
++                              unsigned to)
+ {
++      void *addr, *kva;
+ 
+-      void *addr = page_address(pg) + offset;
+       loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
+       int nBytes = to - offset;
+       int nWritten;
+ 
+       unsigned spos = pos;
+-      unsigned saddr = (unsigned)addr;
++      unsigned saddr;
++
++      kva = kmap(pg);
++      addr = kva + offset;
++
++      saddr = (unsigned) addr;
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
+-         spos, nBytes));
++              ("yaffs_commit_write addr %x pos %x nBytes %d\n",
++              saddr, spos, nBytes));
+ 
+       nWritten = yaffs_file_write(f, addr, nBytes, &pos);
+ 
+       if (nWritten != nBytes) {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG
+-                 "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
+-                 nWritten, nBytes));
++                      ("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
++                      nWritten, nBytes));
+               SetPageError(pg);
+               ClearPageUptodate(pg);
+       } else {
+               SetPageUptodate(pg);
+       }
+ 
++      kunmap(pg);
++
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_commit_write returning %d\n",
+-         nWritten == nBytes ? 0 : nWritten));
++              ("yaffs_commit_write returning %d\n",
++              nWritten == nBytes ? 0 : nWritten));
+ 
+       return nWritten == nBytes ? 0 : nWritten;
+-
+ }
++#endif
++
+ 
+-static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
++static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
+ {
+       if (inode && obj) {
+ 
+ 
+               /* Check mode against the variant type and attempt to repair if broken. */
+-              __u32 mode = obj->yst_mode;
+-              switch( obj->variantType ){
+-              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;
+-              }
++              __u32 mode = obj->yst_mode;
++              switch (obj->variantType) {
++              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->objectId;
+               inode->i_mode = obj->yst_mode;
+               inode->i_uid = obj->yst_uid;
+               inode->i_gid = obj->yst_gid;
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#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))
++#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);
+@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
+               inode->i_nlink = yaffs_GetObjectLinkCount(obj);
+ 
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG
+-                 "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
+-                 inode->i_mode, inode->i_uid, inode->i_gid,
+-                 (int)inode->i_size, atomic_read(&inode->i_count)));
++                      ("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
++                      inode->i_mode, inode->i_uid, inode->i_gid,
++                      (int)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))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+                       init_special_inode(inode, obj->yst_mode,
+-                                         old_decode_dev(obj->yst_rdev));
++                                      old_decode_dev(obj->yst_rdev));
+ #else
+                       init_special_inode(inode, obj->yst_mode,
+-                                         (dev_t) (obj->yst_rdev));
++                                      (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;
++                              &yaffs_file_address_operations;
+                       break;
+               case S_IFDIR:   /* directory */
+                       inode->i_op = &yaffs_dir_inode_operations;
+@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
+ 
+       } else {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
++                      ("yaffs_FileInode invalid parameters\n"));
+       }
+ 
+ }
+ 
+ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
+-                            yaffs_Object * obj)
++                              yaffs_Object *obj)
+ {
+       struct inode *inode;
+ 
+       if (!sb) {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
++                      ("yaffs_get_inode for NULL super_block!!\n"));
+               return NULL;
+ 
+       }
+ 
+       if (!obj) {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
++                      ("yaffs_get_inode for NULL object!!\n"));
+               return NULL;
+ 
+       }
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
++              ("yaffs_get_inode for object %d\n", obj->objectId));
+ 
+-      inode = iget(sb, obj->objectId);
++      inode = Y_IGET(sb, obj->objectId);
++      if (IS_ERR(inode))
++              return NULL;
+ 
+       /* NB Side effect: iget calls back to yaffs_read_inode(). */
+       /* iget also increments the inode's i_count */
+@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
+ }
+ 
+ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
+-                              loff_t * pos)
++                              loff_t *pos)
+ {
+       yaffs_Object *obj;
+       int nWritten, ipos;
+@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
+ 
+       inode = f->f_dentry->d_inode;
+ 
+-      if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
++      if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
+               ipos = inode->i_size;
+-      } else {
++      else
+               ipos = *pos;
+-      }
+ 
+-      if (!obj) {
++      if (!obj)
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
+-      } else {
++                      ("yaffs_file_write: hey obj is null!\n"));
++      else
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG
+-                 "yaffs_file_write about to write writing %d bytes"
+-                 "to object %d at %d\n",
+-                 n, obj->objectId, ipos));
+-      }
++                      ("yaffs_file_write about to write writing %zu bytes"
++                      "to object %d at %d\n",
++                      n, obj->objectId, ipos));
+ 
+       nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
+-         n, nWritten, ipos));
++              ("yaffs_file_write writing %zu bytes, %d written at %d\n",
++              n, nWritten, ipos));
++
+       if (nWritten > 0) {
+               ipos += nWritten;
+               *pos = ipos;
+@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
+                       inode->i_blocks = (ipos + 511) >> 9;
+ 
+                       T(YAFFS_TRACE_OS,
+-                        (KERN_DEBUG
+-                         "yaffs_file_write size updated to %d bytes, "
+-                         "%d blocks\n",
+-                         ipos, (int)(inode->i_blocks)));
++                              ("yaffs_file_write size updated to %d bytes, "
++                              "%d blocks\n",
++                              ipos, (int)(inode->i_blocks)));
+               }
+ 
+       }
+@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
+       return nWritten == 0 ? -ENOSPC : nWritten;
+ }
+ 
++/* 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)
++{
++      yaffs_Object *obj;
++      yaffs_Device *dev;
++
++      int nFreeChunks;
++
++
++      obj = yaffs_DentryToObject(f->f_dentry);
++
++      dev = obj->myDev;
++
++      yaffs_GrossLock(dev);
++
++      nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
++
++      yaffs_GrossUnlock(dev);
++
++      return (nFreeChunks > 20) ? 1 : 0;
++}
++
++static void yaffs_release_space(struct file *f)
++{
++      yaffs_Object *obj;
++      yaffs_Device *dev;
++
++
++      obj = yaffs_DentryToObject(f->f_dentry);
++
++      dev = obj->myDev;
++
++      yaffs_GrossLock(dev);
++
++
++      yaffs_GrossUnlock(dev);
++}
++
+ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
+ {
+       yaffs_Object *obj;
+       yaffs_Device *dev;
+       struct inode *inode = f->f_dentry->d_inode;
+       unsigned long offset, curoffs;
+-      struct list_head *i;
++      struct ylist_head *i;
+       yaffs_Object *l;
+ 
+       char name[YAFFS_MAX_NAME_LENGTH + 1];
+@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
+ 
+       if (offset == 0) {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
+-                 (int)inode->i_ino));
+-              if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
+-                  < 0) {
++                      ("yaffs_readdir: entry . ino %d \n",
++                      (int)inode->i_ino));
++              if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
+                       goto out;
+-              }
+               offset++;
+               f->f_pos++;
+       }
+       if (offset == 1) {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
+-                 (int)f->f_dentry->d_parent->d_inode->i_ino));
+-              if (filldir
+-                  (dirent, "..", 2, offset,
+-                   f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
++                      ("yaffs_readdir: entry .. ino %d \n",
++                      (int)f->f_dentry->d_parent->d_inode->i_ino));
++              if (filldir(dirent, "..", 2, offset,
++                      f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
+                       goto out;
+-              }
+               offset++;
+               f->f_pos++;
+       }
+@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
+               f->f_version = inode->i_version;
+       }
+ 
+-      list_for_each(i, &obj->variant.directoryVariant.children) {
++      ylist_for_each(i, &obj->variant.directoryVariant.children) {
+               curoffs++;
+               if (curoffs >= offset) {
+-                      l = list_entry(i, yaffs_Object, siblings);
++                      l = ylist_entry(i, yaffs_Object, siblings);
+ 
+                       yaffs_GetObjectName(l, name,
+                                           YAFFS_MAX_NAME_LENGTH + 1);
+                       T(YAFFS_TRACE_OS,
+-                        (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
++                        ("yaffs_readdir: %s inode %d\n", name,
+                          yaffs_GetObjectInode(l)));
+ 
+                       if (filldir(dirent,
+-                                  name,
+-                                  strlen(name),
+-                                  offset,
+-                                  yaffs_GetObjectInode(l),
+-                                  yaffs_GetObjectType(l))
+-                          < 0) {
++                                      name,
++                                      strlen(name),
++                                      offset,
++                                      yaffs_GetObjectInode(l),
++                                      yaffs_GetObjectType(l)) < 0)
+                               goto up_and_out;
+-                      }
+ 
+                       offset++;
+                       f->f_pos++;
+               }
+       }
+ 
+-      up_and_out:
+-      out:
+-
++up_and_out:
++out:
+       yaffs_GrossUnlock(dev);
+ 
+       return 0;
+@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
+ /*
+  * File creation. Allocate an inode, and we're done..
+  */
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++
++#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(2, 5, 0))
+ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+-                     dev_t rdev)
++                      dev_t rdev)
+ #else
+ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+-                     int rdev)
++                      int rdev)
+ #endif
+ {
+       struct inode *inode;
+@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
+       yaffs_Object *parent = yaffs_InodeToObject(dir);
+ 
+       int error = -ENOSPC;
+-      uid_t uid = current->fsuid;
+-      gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
++      uid_t uid = YCRED(current)->fsuid;
++      gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
+ 
+-      if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
++      if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+               mode |= S_ISGID;
+ 
+       if (parent) {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
+-                 parent->objectId, parent->variantType));
++                      ("yaffs_mknod: parent object %d type %d\n",
++                      parent->objectId, parent->variantType));
+       } else {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
++                      ("yaffs_mknod: could not get parent object\n"));
+               return -EPERM;
+       }
+ 
+       T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
+-                         "mode %x dev %x\n",
+-                         dentry->d_name.name, mode, rdev));
++                      "mode %x dev %x\n",
++                      dentry->d_name.name, mode, rdev));
+ 
+       dev = parent->myDev;
+ 
+@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
+       switch (mode & S_IFMT) {
+       default:
+               /* Special (socket, fifo, device...) */
+-              T(YAFFS_TRACE_OS, (KERN_DEBUG
+-                                 "yaffs_mknod: making special\n"));
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+-              obj =
+-                  yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
+-                                     gid, old_encode_dev(rdev));
+-#else
+-              obj =
+-                  yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
+-                                     gid, rdev);
++              T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
++              obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
++                              gid, old_encode_dev(rdev));
++#else
++              obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
++                              gid, rdev);
+ #endif
+               break;
+       case S_IFREG:           /* file          */
+-              T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
+-              obj =
+-                  yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
+-                                  gid);
++              T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
++              obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
++                              gid);
+               break;
+       case S_IFDIR:           /* directory */
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_mknod: making directory\n"));
+-              obj =
+-                  yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
+-                                       uid, gid);
++                      ("yaffs_mknod: making directory\n"));
++              obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
++                                      uid, gid);
+               break;
+       case S_IFLNK:           /* symlink */
+-              T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
++              T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
+               obj = NULL;     /* Do we ever get here? */
+               break;
+       }
+@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
+               inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
+               d_instantiate(dentry, inode);
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
+-                 obj->objectId, atomic_read(&inode->i_count)));
++                      ("yaffs_mknod created object %d count = %d\n",
++                      obj->objectId, atomic_read(&inode->i_count)));
+               error = 0;
+       } else {
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_mknod failed making object\n"));
++                      ("yaffs_mknod failed making object\n"));
+               error = -ENOMEM;
+       }
+ 
+@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
+ static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+ {
+       int retVal;
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
+       retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
+-#if 0
+-      /* attempt to fix dir bug - didn't work */
+-      if (!retVal) {
+-              dget(dentry);
+-      }
+-#endif
+       return retVal;
+ }
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#if (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
+ {
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_create\n"));
+       return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
+ }
+ 
+@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
+       yaffs_Device *dev;
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
+-         dentry->d_name.name));
++              ("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
++              dentry->d_name.name));
+ 
+       dev = yaffs_InodeToObject(dir)->myDev;
+ 
+@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
+  * Create a link...
+  */
+ static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
+-                    struct dentry *dentry)
++                      struct dentry *dentry)
+ {
+       struct inode *inode = old_dentry->d_inode;
+       yaffs_Object *obj = NULL;
+       yaffs_Object *link = NULL;
+       yaffs_Device *dev;
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_link\n"));
+ 
+       obj = yaffs_InodeToObject(inode);
+       dev = obj->myDev;
+ 
+       yaffs_GrossLock(dev);
+ 
+-      if (!S_ISDIR(inode->i_mode))    /* Don't link directories */
+-      {
+-              link =
+-                  yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
+-                             obj);
+-      }
++      if (!S_ISDIR(inode->i_mode))            /* Don't link directories */
++              link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
++                      obj);
+ 
+       if (link) {
+               old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
+               d_instantiate(dentry, old_dentry->d_inode);
+               atomic_inc(&old_dentry->d_inode->i_count);
+               T(YAFFS_TRACE_OS,
+-                (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
+-                 old_dentry->d_inode->i_nlink,
+-                 atomic_read(&old_dentry->d_inode->i_count)));
+-
++                      ("yaffs_link link count %d i_count %d\n",
++                      old_dentry->d_inode->i_nlink,
++                      atomic_read(&old_dentry->d_inode->i_count)));
+       }
+ 
+       yaffs_GrossUnlock(dev);
+ 
+-      if (link) {
+-
++      if (link)
+               return 0;
+-      }
+ 
+       return -EPERM;
+ }
+ 
+ static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
+-                       const char *symname)
++                              const char *symname)
+ {
+       yaffs_Object *obj;
+       yaffs_Device *dev;
+-      uid_t uid = current->fsuid;
+-      gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
++      uid_t uid = YCRED(current)->fsuid;
++      gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
+ 
+       dev = yaffs_InodeToObject(dir)->myDev;
+       yaffs_GrossLock(dev);
+       obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
+-                               S_IFLNK | S_IRWXUGO, uid, gid, symname);
++                              S_IFLNK | S_IRWXUGO, uid, gid, symname);
+       yaffs_GrossUnlock(dev);
+ 
+       if (obj) {
+-
+               struct inode *inode;
+ 
+               inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
+               d_instantiate(dentry, inode);
+-              T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
++              T(YAFFS_TRACE_OS, ("symlink created OK\n"));
+               return 0;
+       } else {
+-              T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
+-
++              T(YAFFS_TRACE_OS, ("symlink not created\n"));
+       }
+ 
+       return -ENOMEM;
+ }
+ 
+ static int yaffs_sync_object(struct file *file, struct dentry *dentry,
+-                           int datasync)
++                              int datasync)
+ {
+ 
+       yaffs_Object *obj;
+@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
+ 
+       dev = obj->myDev;
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
+       yaffs_GrossLock(dev);
+       yaffs_FlushFile(obj, 1);
+       yaffs_GrossUnlock(dev);
+@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
+       int retVal = YAFFS_FAIL;
+       yaffs_Object *target;
+ 
+-        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
+       dev = yaffs_InodeToObject(old_dir)->myDev;
+ 
+       yaffs_GrossLock(dev);
+ 
+       /* Check if the target is an existing directory that is not empty. */
+-      target =
+-          yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
+-                                 new_dentry->d_name.name);
++      target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
++                              new_dentry->d_name.name);
+ 
+ 
+ 
+-      if (target &&
+-          target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
+-          !list_empty(&target->variant.directoryVariant.children)) {
++      if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
++              !ylist_empty(&target->variant.directoryVariant.children)) {
+ 
+-              T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
++              T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
+ 
+               retVal = YAFFS_FAIL;
+       } else {
+-
+               /* Now does unlinking internally using shadowing mechanism */
+-              T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
+-
+-              retVal =
+-                  yaffs_RenameObject(yaffs_InodeToObject(old_dir),
+-                                     old_dentry->d_name.name,
+-                                     yaffs_InodeToObject(new_dir),
+-                                     new_dentry->d_name.name);
++              T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
+ 
++              retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
++                              old_dentry->d_name.name,
++                              yaffs_InodeToObject(new_dir),
++                              new_dentry->d_name.name);
+       }
+       yaffs_GrossUnlock(dev);
+ 
+       if (retVal == YAFFS_OK) {
+-              if(target) {
++              if (target) {
+                       new_dentry->d_inode->i_nlink--;
+                       mark_inode_dirty(new_dentry->d_inode);
+               }
+@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
+       } else {
+               return -ENOTEMPTY;
+       }
+-
+ }
+ 
+ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
+@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
+       yaffs_Device *dev;
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_setattr of object %d\n",
+-         yaffs_InodeToObject(inode)->objectId));
+-
+-      if ((error = inode_change_ok(inode, attr)) == 0) {
++              ("yaffs_setattr of object %d\n",
++              yaffs_InodeToObject(inode)->objectId));
+ 
++      error = inode_change_ok(inode, attr);
++      if (error == 0) {
+               dev = yaffs_InodeToObject(inode)->myDev;
+               yaffs_GrossLock(dev);
+               if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
+-                  YAFFS_OK) {
++                              YAFFS_OK) {
+                       error = 0;
+               } else {
+                       error = -EPERM;
+@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
+       return error;
+ }
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
+ {
+       yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
+       struct super_block *sb = dentry->d_sb;
+-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+ static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
+ {
+       yaffs_Device *dev = yaffs_SuperToDevice(sb);
+@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
+       yaffs_Device *dev = yaffs_SuperToDevice(sb);
+ #endif
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
+ 
+       yaffs_GrossLock(dev);
+ 
+       buf->f_type = YAFFS_MAGIC;
+       buf->f_bsize = sb->s_blocksize;
+       buf->f_namelen = 255;
+-      if (sb->s_blocksize > dev->nDataBytesPerChunk) {
++
++      if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
++              /* Do this if chunk size is not a power of 2 */
++
++              uint64_t bytesInDev;
++              uint64_t bytesFree;
++
++              bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
++                      ((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
++
++              do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
++              buf->f_blocks = bytesInDev;
++
++              bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
++                      ((uint64_t)(dev->nDataBytesPerChunk));
++
++              do_div(bytesFree, sb->s_blocksize);
++
++              buf->f_bfree = bytesFree;
++
++      } else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
+ 
+               buf->f_blocks =
+-                  (dev->endBlock - dev->startBlock +
+-                   1) * dev->nChunksPerBlock / (sb->s_blocksize /
+-                                                dev->nDataBytesPerChunk);
++                      (dev->endBlock - dev->startBlock + 1) *
++                      dev->nChunksPerBlock /
++                      (sb->s_blocksize / dev->nDataBytesPerChunk);
+               buf->f_bfree =
+-                  yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
+-                                                      dev->nDataBytesPerChunk);
++                      yaffs_GetNumberOfFreeChunks(dev) /
++                      (sb->s_blocksize / dev->nDataBytesPerChunk);
+       } else {
+-
+               buf->f_blocks =
+-                  (dev->endBlock - dev->startBlock +
+-                   1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
+-                                                sb->s_blocksize);
++                      (dev->endBlock - dev->startBlock + 1) *
++                      dev->nChunksPerBlock *
++                      (dev->nDataBytesPerChunk / sb->s_blocksize);
++
+               buf->f_bfree =
+-                  yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
+-                                                      sb->s_blocksize);
++                      yaffs_GetNumberOfFreeChunks(dev) *
++                      (dev->nDataBytesPerChunk / sb->s_blocksize);
+       }
++
+       buf->f_files = 0;
+       buf->f_ffree = 0;
+       buf->f_bavail = buf->f_bfree;
+@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
+ }
+ 
+ 
+-/**
+ static int yaffs_do_sync_fs(struct super_block *sb)
+ {
+ 
+       yaffs_Device *dev = yaffs_SuperToDevice(sb);
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
+ 
+-      if(sb->s_dirt) {
++      if (sb->s_dirt) {
+               yaffs_GrossLock(dev);
+ 
+-              if(dev)
++              if (dev) {
++                      yaffs_FlushEntireDeviceCache(dev);
+                       yaffs_CheckpointSave(dev);
++              }
+ 
+               yaffs_GrossUnlock(dev);
+ 
+@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
+       }
+       return 0;
+ }
+-**/
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++
++#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
+ {
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
+-      return 0; /* yaffs_do_sync_fs(sb);*/
++      T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
++      if (yaffs_auto_checkpoint >= 2)
++              yaffs_do_sync_fs(sb);
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
++      return 0;
+ #endif
+ }
+ 
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#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
+ {
++      T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
++
++      if (yaffs_auto_checkpoint >= 1)
++              yaffs_do_sync_fs(sb);
++
++      return 0;
++}
++
++#ifdef YAFFS_USE_OWN_IGET
++
++static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
++{
++      struct inode *inode;
++      yaffs_Object *obj;
++      yaffs_Device *dev = yaffs_SuperToDevice(sb);
++
++      T(YAFFS_TRACE_OS,
++              ("yaffs_iget for %lu\n", ino));
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
++      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.
++       */
+ 
+-      return 0; /* yaffs_do_sync_fs(sb);*/
++      yaffs_GrossLock(dev);
+ 
++      obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
++
++      yaffs_FillInodeFromObject(inode, obj);
++
++      yaffs_GrossUnlock(dev);
++
++      unlock_new_inode(inode);
++      return inode;
+ }
+ 
++#else
+ 
+ static void yaffs_read_inode(struct inode *inode)
+ {
+@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
+       yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
+ 
+       T(YAFFS_TRACE_OS,
+-        (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
++              ("yaffs_read_inode for %d\n", (int)inode->i_ino));
+ 
+       yaffs_GrossLock(dev);
+ 
+@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
+       yaffs_GrossUnlock(dev);
+ }
+ 
+-static LIST_HEAD(yaffs_dev_list);
++#endif
++
++static YLIST_HEAD(yaffs_dev_list);
+ 
+-#if 0 // not used
++#if 0 /* not used */
+ static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
+ {
+       yaffs_Device    *dev = yaffs_SuperToDevice(sb);
+ 
+-      if( *flags & MS_RDONLY ) {
++      if (*flags & MS_RDONLY) {
+               struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
+ 
+               T(YAFFS_TRACE_OS,
+-                      (KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
++                      ("yaffs_remount_fs: %s: RO\n", dev->name));
+ 
+               yaffs_GrossLock(dev);
+ 
+@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
+                       mtd->sync(mtd);
+ 
+               yaffs_GrossUnlock(dev);
+-      }
+-      else {
++      } else {
+               T(YAFFS_TRACE_OS,
+-                      (KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
++                      ("yaffs_remount_fs: %s: RW\n", dev->name));
+       }
+ 
+       return 0;
+@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
+ {
+       yaffs_Device *dev = yaffs_SuperToDevice(sb);
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
++      T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
+ 
+       yaffs_GrossLock(dev);
+ 
+@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
+ 
+       yaffs_CheckpointSave(dev);
+ 
+-      if (dev->putSuperFunc) {
++      if (dev->putSuperFunc)
+               dev->putSuperFunc(sb);
+-      }
+ 
+       yaffs_Deinitialise(dev);
+ 
+       yaffs_GrossUnlock(dev);
+ 
+       /* we assume this is protected by lock_kernel() in mount/umount */
+-      list_del(&dev->devList);
++      ylist_del(&dev->devList);
+ 
+-      if(dev->spareBuffer){
++      if (dev->spareBuffer) {
+               YFREE(dev->spareBuffer);
+               dev->spareBuffer = NULL;
+       }
+@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
+ 
+ static void yaffs_MTDPutSuper(struct super_block *sb)
+ {
+-
+       struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
+ 
+-      if (mtd->sync) {
++      if (mtd->sync)
+               mtd->sync(mtd);
+-      }
+ 
+       put_mtd_device(mtd);
+ }
+@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
+ {
+       struct super_block *sb = (struct super_block *)vsb;
+ 
+-      T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
+-//    if(sb)
+-//            sb->s_dirt = 1;
++      T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
++      if (sb)
++              sb->s_dirt = 1;
+ }
+ 
+ typedef struct {
+@@ -1546,48 +1788,48 @@ typedef struct {
+ #define MAX_OPT_LEN 20
+ static int yaffs_parse_options(yaffs_options *options, const char *options_str)
+ {
+-      char cur_opt[MAX_OPT_LEN+1];
++      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);
++      while (options_str && *options_str && !error) {
++              memset(cur_opt, 0, MAX_OPT_LEN + 1);
+               p = 0;
+ 
+-              while(*options_str && *options_str != ','){
+-                      if(p < MAX_OPT_LEN){
++              while (*options_str && *options_str != ',') {
++                      if (p < MAX_OPT_LEN) {
+                               cur_opt[p] = *options_str;
+                               p++;
+                       }
+                       options_str++;
+               }
+ 
+-              if(!strcmp(cur_opt,"inband-tags"))
++              if (!strcmp(cur_opt, "inband-tags"))
+                       options->inband_tags = 1;
+-              else if(!strcmp(cur_opt,"no-cache"))
++              else if (!strcmp(cur_opt, "no-cache"))
+                       options->no_cache = 1;
+-              else if(!strcmp(cur_opt,"no-checkpoint-read"))
++              else if (!strcmp(cur_opt, "no-checkpoint-read"))
+                       options->skip_checkpoint_read = 1;
+-              else if(!strcmp(cur_opt,"no-checkpoint-write"))
++              else if (!strcmp(cur_opt, "no-checkpoint-write"))
+                       options->skip_checkpoint_write = 1;
+-              else if(!strcmp(cur_opt,"no-checkpoint")){
++              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);
++                      printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
++                                      cur_opt);
+                       error = 1;
+               }
+-
+       }
+ 
+       return error;
+ }
+ 
+ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
+-                                                   struct super_block *sb,
+-                                                   void *data, int silent)
++                                              struct super_block *sb,
++                                              void *data, int silent)
+ {
+       int nBlocks;
+       struct inode *inode = NULL;
+@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
+ 
+       sb->s_magic = YAFFS_MAGIC;
+       sb->s_op = &yaffs_super_ops;
++      sb->s_flags |= MS_NOATIME;
+ 
+       if (!sb)
+               printk(KERN_INFO "yaffs: sb is NULL\n");
+@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
+                      sb->s_dev,
+                      yaffs_devname(sb, devname_buf));
+ 
+-      if(!data_str)
++      if (!data_str)
+               data_str = "";
+ 
+-      printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
++      printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
+ 
+-      memset(&options,0,sizeof(options));
++      memset(&options, 0, sizeof(options));
+ 
+-      if(yaffs_parse_options(&options,data_str)){
++      if (yaffs_parse_options(&options, data_str)) {
+               /* Option parsing failed */
+               return NULL;
+       }
+@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
+                              yaffs_devname(sb, devname_buf)));
+ 
+       /* Check it's an mtd device..... */
+-      if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
++      if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
+               return NULL;    /* This isn't an mtd device */
+-      }
++
+       /* Get the device */
+       mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
+       if (!mtd) {
+@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
+       T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
+       T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
+       T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
+-      T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
++      T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
++#else
++      T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
++#endif
+ 
+ #ifdef CONFIG_YAFFS_AUTO_YAFFS2
+ 
+-      if (yaffsVersion == 1 &&
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+-          mtd->writesize >= 2048) {
+-#else
+-          mtd->oobblock >= 2048) {
+-#endif
+-          T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
+-          yaffsVersion = 2;
++      if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
++              T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
++              yaffsVersion = 2;
+       }
+ 
+       /* Added NCB 26/5/2006 for completeness */
+-      if (yaffsVersion == 2 &&
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+-          mtd->writesize == 512) {
+-#else
+-          mtd->oobblock == 512) {
+-#endif
+-          T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
+-          yaffsVersion = 1;
++      if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
++              T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
++              yaffsVersion = 1;
+       }
+ 
+ #endif
+@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
+                   !mtd->block_markbad ||
+                   !mtd->read ||
+                   !mtd->write ||
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+                   !mtd->read_oob || !mtd->write_oob) {
+ #else
+                   !mtd->write_ecc ||
+@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
+                       return NULL;
+               }
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+-              if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+-#else
+-              if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+-#endif
+-                  mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
++              if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
++                  mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
++                  !options.inband_tags) {
+                       T(YAFFS_TRACE_ALWAYS,
+                         ("yaffs: MTD device does not have the "
+                          "right page sizes\n"));
+@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
+               if (!mtd->erase ||
+                   !mtd->read ||
+                   !mtd->write ||
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+                   !mtd->read_oob || !mtd->write_oob) {
+ #else
+                   !mtd->write_ecc ||
+@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
+        * Set the yaffs_Device up for mtd
+        */
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+       sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
+ #else
+       sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
+@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
+ 
+       /* Set up the memory size parameters.... */
+ 
+-      nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
++      nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
++
+       dev->startBlock = 0;
+       dev->endBlock = nBlocks - 1;
+       dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
+-      dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
++      dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
+       dev->nReservedBlocks = 5;
+       dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
++      dev->inbandTags = options.inband_tags;
+ 
+       /* ... and the functions. */
+       if (yaffsVersion == 2) {
+@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
+               dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
+               dev->spareBuffer = YMALLOC(mtd->oobsize);
+               dev->isYaffs2 = 1;
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+-              dev->nDataBytesPerChunk = mtd->writesize;
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++              dev->totalBytesPerChunk = mtd->writesize;
+               dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
+ #else
+-              dev->nDataBytesPerChunk = mtd->oobblock;
++              dev->totalBytesPerChunk = mtd->oobblock;
+               dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
+ #endif
+-              nBlocks = mtd->size / mtd->erasesize;
++              nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
+ 
+-              dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
+               dev->startBlock = 0;
+               dev->endBlock = nBlocks - 1;
+       } else {
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+               /* use the MTD interface in yaffs_mtdif1.c */
+               dev->writeChunkWithTagsToNAND =
+                       nandmtd1_WriteChunkWithTagsToNAND;
+@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
+       dev->skipCheckpointWrite = options.skip_checkpoint_write;
+ 
+       /* we assume this is protected by lock_kernel() in mount/umount */
+-      list_add_tail(&dev->devList, &yaffs_dev_list);
++      ylist_add_tail(&dev->devList, &yaffs_dev_list);
+ 
+       init_MUTEX(&dev->grossLock);
+ 
+@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
+               return NULL;
+       }
+       sb->s_root = root;
++      sb->s_dirt = !dev->isCheckpointed;
++      T(YAFFS_TRACE_ALWAYS,
++        ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
+ 
+       T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
+       return sb;
+ }
+ 
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#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,17))
++#if (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)
+@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
+ 
+ #ifdef CONFIG_YAFFS_YAFFS2
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#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,17))
++#if (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)
+@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
+ {
+       buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
+       buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
++      buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
+       buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
+       buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
+       buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
+       buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
+       buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
+-      buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
+       buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
+       buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
+       buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
+@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
+       buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
+       buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
+       buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
+-      buf +=
+-          sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
+-      buf +=
+-          sprintf(buf, "passiveGCs......... %d\n",
++      buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
++      buf += sprintf(buf, "passiveGCs......... %d\n",
+                   dev->passiveGarbageCollections);
+       buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
+       buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
+@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
+           sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
+       buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
+       buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
++      buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
+ 
+       return buf;
+ }
+@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
+                          char **start,
+                          off_t offset, int count, int *eof, void *data)
+ {
+-      struct list_head *item;
++      struct ylist_head *item;
+       char *buf = page;
+       int step = offset;
+       int n = 0;
+@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
+       lock_kernel();
+ 
+       /* Locate and print the Nth entry.  Order N-squared but N is small. */
+-      list_for_each(item, &yaffs_dev_list) {
+-              yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
++      ylist_for_each(item, &yaffs_dev_list) {
++              yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
+               if (n < step) {
+                       n++;
+                       continue;
+@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
+       char *end;
+       char *mask_name;
+       const char *x;
+-      char substring[MAX_MASK_NAME_LENGTH+1];
++      char substring[MAX_MASK_NAME_LENGTH + 1];
+       int i;
+       int done = 0;
+       int add, len = 0;
+@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
+ 
+       while (!done && (pos < count)) {
+               done = 1;
+-              while ((pos < count) && isspace(buf[pos])) {
++              while ((pos < count) && isspace(buf[pos]))
+                       pos++;
+-              }
+ 
+               switch (buf[pos]) {
+               case '+':
+@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
+               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;
++                      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){
++                              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;
+@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
+ 
+               if (mask_name != NULL) {
+                       done = 0;
+-                      switch(add) {
++                      switch (add) {
+                       case '-':
+                               rg &= ~mask_bitfield;
+                               break;
+@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
+ 
+       yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
+ 
+-      printk("new trace = 0x%08X\n",yaffs_traceMask);
++      printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
+ 
+       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("%c%s\n", flag, mask_flags[i].mask_name);
++                      printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
+               }
+       }
+ 
+@@ -2211,12 +2448,8 @@ struct file_system_to_install {
+ };
+ 
+ static struct file_system_to_install fs_to_install[] = {
+-//#ifdef CONFIG_YAFFS_YAFFS1
+       {&yaffs_fs_type, 0},
+-//#endif
+-//#ifdef CONFIG_YAFFS_YAFFS2
+       {&yaffs2_fs_type, 0},
+-//#endif
+       {NULL, 0}
+ };
+ 
+@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
+       /* Install the proc_fs entry */
+       my_proc_entry = create_proc_entry("yaffs",
+                                              S_IRUGO | S_IFREG,
+-                                             &proc_root);
++                                             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 {
++      } else
+               return -ENOMEM;
+-      }
+ 
+       /* Now add the file system entries */
+ 
+@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
+ 
+       while (fsinst->fst && !error) {
+               error = register_filesystem(fsinst->fst);
+-              if (!error) {
++              if (!error)
+                       fsinst->installed = 1;
+-              }
+               fsinst++;
+       }
+ 
+@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
+       T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
+                              " removing. \n"));
+ 
+-      remove_proc_entry("yaffs", &proc_root);
++      remove_proc_entry("yaffs", YPROC_ROOT);
+ 
+       fsinst = fs_to_install;
+ 
+@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
+               }
+               fsinst++;
+       }
+-
+ }
+ 
+ module_init(init_yaffs_fs)
+--- /dev/null
++++ b/fs/yaffs2/yaffs_getblockinfo.h
+@@ -0,0 +1,34 @@
++/*
++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
++ *
++ * Copyright (C) 2002-2007 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"
++
++/* Function to manipulate block info */
++static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
++{
++      if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
++              T(YAFFS_TRACE_ERROR,
++                (TSTR
++                 ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
++                 blk));
++              YBUG();
++      }
++      return &dev->blockInfo[blk - dev->internalStartBlock];
++}
++
++#endif
+--- a/fs/yaffs2/yaffs_guts.c
++++ b/fs/yaffs2/yaffs_guts.c
+@@ -12,16 +12,17 @@
+  */
+ 
+ const char *yaffs_guts_c_version =
+-    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
++    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
+ 
+ #include "yportenv.h"
+ 
+ #include "yaffsinterface.h"
+ #include "yaffs_guts.h"
+ #include "yaffs_tagsvalidity.h"
++#include "yaffs_getblockinfo.h"
+ 
+ #include "yaffs_tagscompat.h"
+-#ifndef  CONFIG_YAFFS_USE_OWN_SORT
++#ifndef CONFIG_YAFFS_USE_OWN_SORT
+ #include "yaffs_qsort.h"
+ #endif
+ #include "yaffs_nand.h"
+@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
+ #include "yaffs_packedtags2.h"
+ 
+ 
+-#ifdef CONFIG_YAFFS_WINCE
+-void yfsd_LockYAFFS(BOOL fsLockOnly);
+-void yfsd_UnlockYAFFS(BOOL fsLockOnly);
+-#endif
+-
+ #define YAFFS_PASSIVE_GC_CHUNKS 2
+ 
+ #include "yaffs_ecc.h"
+ 
+ 
+ /* Robustification (if it ever comes about...) */
+-static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
+-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
+-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
+-                                   const __u8 * data,
+-                                   const yaffs_ExtendedTags * tags);
+-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
+-                                  const yaffs_ExtendedTags * tags);
++static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
++static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
++              int erasedOk);
++static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
++                              const __u8 *data,
++                              const yaffs_ExtendedTags *tags);
++static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
++                              const yaffs_ExtendedTags *tags);
+ 
+ /* Other local prototypes */
+-static int yaffs_UnlinkObject( yaffs_Object *obj);
++static int yaffs_UnlinkObject(yaffs_Object *obj);
+ static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
+ 
+ static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
+ 
+-static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
+-                                           const __u8 * buffer,
+-                                           yaffs_ExtendedTags * tags,
+-                                           int useReserve);
+-static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
+-                                int chunkInNAND, int inScan);
+-
+-static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
+-                                         yaffs_ObjectType type);
+-static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
+-                                     yaffs_Object * obj);
+-static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
+-                                  int force, int isShrink, int shadows);
+-static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
++static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
++                                      const __u8 *buffer,
++                                      yaffs_ExtendedTags *tags,
++                                      int useReserve);
++static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
++                              int chunkInNAND, int inScan);
++
++static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
++                                      yaffs_ObjectType type);
++static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
++                              yaffs_Object *obj);
++static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
++                              int force, int isShrink, int shadows);
++static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
+ static int yaffs_CheckStructures(void);
+-static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
+-                            int chunkOffset, int *limit);
+-static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
+-
+-static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
+-
+-static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
+-static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
+-                                  int lineNo);
++static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
++                      int chunkOffset, int *limit);
++static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
++
++static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
+ 
+-static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
+-                                int chunkInNAND);
+ 
+-static int yaffs_UnlinkWorker(yaffs_Object * obj);
+-static void yaffs_DestroyObject(yaffs_Object * obj);
++static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
++                              int chunkInNAND);
+ 
+-static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
+-                         int chunkInObject);
++static int yaffs_UnlinkWorker(yaffs_Object *obj);
+ 
+-loff_t yaffs_GetFileSize(yaffs_Object * obj);
++static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
++                      int chunkInObject);
+ 
+-static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
++static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
++                              yaffs_BlockInfo **blockUsedPtr);
+ 
+-static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
++static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
+ 
+ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
+ 
++static void yaffs_VerifyDirectory(yaffs_Object *directory);
+ #ifdef YAFFS_PARANOID
+-static int yaffs_CheckFileSanity(yaffs_Object * in);
++static int yaffs_CheckFileSanity(yaffs_Object *in);
+ #else
+ #define yaffs_CheckFileSanity(in)
+ #endif
+ 
+-static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
+-static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
++static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
++static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
+ 
+ static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
+ 
+-static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
+-                               yaffs_ExtendedTags * tags);
++static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
++                              yaffs_ExtendedTags *tags);
+ 
+-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
+-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
+-                                        yaffs_FileStructure * fStruct,
+-                                        __u32 chunkId);
++static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
++              unsigned pos);
++static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
++                                      yaffs_FileStructure *fStruct,
++                                      __u32 chunkId);
+ 
+ 
+ /* Function to calculate chunk and offset */
+ 
+-static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
++static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
++              __u32 *offsetOut)
+ {
+-      if(dev->chunkShift){
+-              /* Easy-peasy power of 2 case */
+-              *chunk  = (__u32)(addr >> dev->chunkShift);
+-              *offset = (__u32)(addr & dev->chunkMask);
+-      }
+-      else if(dev->crumbsPerChunk)
+-      {
+-              /* Case where we're using "crumbs" */
+-              *offset = (__u32)(addr & dev->crumbMask);
+-              addr >>= dev->crumbShift;
+-              *chunk = ((__u32)addr)/dev->crumbsPerChunk;
+-              *offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
++      int chunk;
++      __u32 offset;
++
++      chunk  = (__u32)(addr >> dev->chunkShift);
++
++      if (dev->chunkDiv == 1) {
++              /* easy power of 2 case */
++              offset = (__u32)(addr & dev->chunkMask);
++      } else {
++              /* Non power-of-2 case */
++
++              loff_t chunkBase;
++
++              chunk /= dev->chunkDiv;
++
++              chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
++              offset = (__u32)(addr - chunkBase);
+       }
+-      else
+-              YBUG();
++
++      *chunkOut = chunk;
++      *offsetOut = offset;
+ }
+ 
+-/* Function to return the number of shifts for a power of 2 greater than or equal
+- * to the given number
++/* 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.
+  */
+@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
+ 
+       nShifts = extraBits = 0;
+ 
+-      while(x>1){
+-              if(x & 1) extraBits++;
+-              x>>=1;
++      while (x > 1) {
++              if (x & 1)
++                      extraBits++;
++              x >>= 1;
+               nShifts++;
+       }
+ 
+-      if(extraBits)
++      if (extraBits)
+               nShifts++;
+ 
+       return nShifts;
+@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
+ /* Function to return the number of shifts to get a 1 in bit 0
+  */
+ 
+-static __u32 ShiftDiv(__u32 x)
++static __u32 Shifts(__u32 x)
+ {
+       int nShifts;
+ 
+       nShifts =  0;
+ 
+-      if(!x) return 0;
++      if (!x)
++              return 0;
+ 
+-      while( !(x&1)){
+-              x>>=1;
++      while (!(x&1)) {
++              x >>= 1;
+               nShifts++;
+       }
+ 
+@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
+       int i;
+       __u8 *buf = (__u8 *)1;
+ 
+-      memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
++      memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
+ 
+       for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
+               dev->tempBuffer[i].line = 0;    /* not in use */
+               dev->tempBuffer[i].buffer = buf =
+-                  YMALLOC_DMA(dev->nDataBytesPerChunk);
++                  YMALLOC_DMA(dev->totalBytesPerChunk);
+       }
+ 
+       return buf ? YAFFS_OK : YAFFS_FAIL;
+-
+ }
+ 
+-static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
++__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
+ {
+       int i, j;
++
++      dev->tempInUse++;
++      if (dev->tempInUse > dev->maxTemp)
++              dev->maxTemp = dev->tempInUse;
++
+       for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
+               if (dev->tempBuffer[i].line == 0) {
+                       dev->tempBuffer[i].line = lineNo;
+@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
+       T(YAFFS_TRACE_BUFFERS,
+         (TSTR("Out of temp buffers at line %d, other held by lines:"),
+          lineNo));
+-      for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
++      for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
+               T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
+-      }
++
+       T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
+ 
+       /*
+@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
+ 
+ }
+ 
+-static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
++void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
+                                   int lineNo)
+ {
+       int i;
++
++      dev->tempInUse--;
++
+       for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
+               if (dev->tempBuffer[i].buffer == buffer) {
+                       dev->tempBuffer[i].line = 0;
+@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
+ /*
+  * Determine if we have a managed buffer.
+  */
+-int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
++int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
+ {
+       int i;
++
+       for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
+               if (dev->tempBuffer[i].buffer == buffer)
+                       return 1;
++      }
+ 
++      for (i = 0; i < dev->nShortOpCaches; i++) {
++              if (dev->srCache[i].data == buffer)
++                      return 1;
+       }
+ 
+-    for (i = 0; i < dev->nShortOpCaches; i++) {
+-        if( dev->srCache[i].data == buffer )
+-            return 1;
+-
+-    }
+-
+-    if (buffer == dev->checkpointBuffer)
+-      return 1;
+-
+-    T(YAFFS_TRACE_ALWAYS,
+-        (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
+-    return 0;
++      if (buffer == dev->checkpointBuffer)
++              return 1;
++
++      T(YAFFS_TRACE_ALWAYS,
++              (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
++      return 0;
+ }
+ 
+ 
+@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
+  * Chunk bitmap manipulations
+  */
+ 
+-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
++static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
+ {
+       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
+               T(YAFFS_TRACE_ERROR,
+-                (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
+-                 blk));
++                      (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
++                      blk));
+               YBUG();
+       }
+       return dev->chunkBits +
+-          (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
++              (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
+ }
+ 
+ static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
+ {
+-      if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
+-         chunk < 0 || chunk >= dev->nChunksPerBlock) {
+-         T(YAFFS_TRACE_ERROR,
+-          (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
+-          YBUG();
++      if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
++                      chunk < 0 || chunk >= dev->nChunksPerBlock) {
++              T(YAFFS_TRACE_ERROR,
++              (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
++                      blk, chunk));
++              YBUG();
+       }
+ }
+ 
+-static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
++static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
+ {
+       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+ 
+       memset(blkBits, 0, dev->chunkBitmapStride);
+ }
+ 
+-static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
++static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
+ {
+       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+ 
+-      yaffs_VerifyChunkBitId(dev,blk,chunk);
++      yaffs_VerifyChunkBitId(dev, blk, chunk);
+ 
+       blkBits[chunk / 8] &= ~(1 << (chunk & 7));
+ }
+ 
+-static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
++static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
+ {
+       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+ 
+-      yaffs_VerifyChunkBitId(dev,blk,chunk);
++      yaffs_VerifyChunkBitId(dev, blk, chunk);
+ 
+       blkBits[chunk / 8] |= (1 << (chunk & 7));
+ }
+ 
+-static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
++static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
+ {
+       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+-      yaffs_VerifyChunkBitId(dev,blk,chunk);
++      yaffs_VerifyChunkBitId(dev, blk, chunk);
+ 
+       return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
+ }
+ 
+-static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
++static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
+ {
+       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       int i;
+@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
+       return 0;
+ }
+ 
+-static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
++static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
+ {
+       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       int i;
+       int n = 0;
+       for (i = 0; i < dev->chunkBitmapStride; i++) {
+               __u8 x = *blkBits;
+-              while(x){
+-                      if(x & 1)
++              while (x) {
++                      if (x & 1)
+                               n++;
+-                      x >>=1;
++                      x >>= 1;
+               }
+ 
+               blkBits++;
+@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
+       return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
+ }
+ 
+-static const char * blockStateName[] = {
++static const char *blockStateName[] = {
+ "Unknown",
+ "Needs scanning",
+ "Scanning",
+@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
+ "Dead"
+ };
+ 
+-static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
++static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
+ {
+       int actuallyUsed;
+       int inUse;
+ 
+-      if(yaffs_SkipVerification(dev))
++      if (yaffs_SkipVerification(dev))
+               return;
+ 
+       /* Report illegal runtime states */
+-      if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
+-              T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
++      if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
++              T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
+ 
+-      switch(bi->blockState){
+-       case YAFFS_BLOCK_STATE_UNKNOWN:
+-       case YAFFS_BLOCK_STATE_SCANNING:
+-       case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
+-              T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
+-              n,blockStateName[bi->blockState]));
++      switch (bi->blockState) {
++      case YAFFS_BLOCK_STATE_UNKNOWN:
++      case YAFFS_BLOCK_STATE_SCANNING:
++      case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
++              T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
++              n, blockStateName[bi->blockState]));
+       }
+ 
+       /* Check pages in use and soft deletions are legal */
+ 
+       actuallyUsed = bi->pagesInUse - bi->softDeletions;
+ 
+-      if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
++      if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
+          bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
+          actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
+-              T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
+-              n,bi->pagesInUse,bi->softDeletions));
++              T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
++              n, bi->pagesInUse, bi->softDeletions));
+ 
+ 
+       /* Check chunk bitmap legal */
+-      inUse = yaffs_CountChunkBits(dev,n);
+-      if(inUse != bi->pagesInUse)
+-              T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
+-                      n,bi->pagesInUse,inUse));
++      inUse = yaffs_CountChunkBits(dev, n);
++      if (inUse != bi->pagesInUse)
++              T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
++                      n, bi->pagesInUse, inUse));
+ 
+       /* Check that the sequence number is valid.
+        * Ten million is legal, but is very unlikely
+        */
+-      if(dev->isYaffs2 &&
++      if (dev->isYaffs2 &&
+          (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
+-         (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
+-              T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
+-              n,bi->sequenceNumber));
+-
++         (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
++              T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
++              n, bi->sequenceNumber));
+ }
+ 
+-static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
++static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
++              int n)
+ {
+-      yaffs_VerifyBlock(dev,bi,n);
++      yaffs_VerifyBlock(dev, bi, n);
+ 
+       /* After collection the block should be in the erased state */
+-      /* TODO: This will need to change if we do partial gc */
++      /* This will need to change if we do partial gc */
+ 
+-      if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
+-              T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
+-                      n,bi->blockState));
++      if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
++                      bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
++              T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
++                      n, bi->blockState));
+       }
+ }
+ 
+@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
+       int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
+       int nIllegalBlockStates = 0;
+ 
+-
+-      if(yaffs_SkipVerification(dev))
++      if (yaffs_SkipVerification(dev))
+               return;
+ 
+-      memset(nBlocksPerState,0,sizeof(nBlocksPerState));
+-
++      memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
+ 
+-      for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
+-              yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
+-              yaffs_VerifyBlock(dev,bi,i);
++      for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
++              yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
++              yaffs_VerifyBlock(dev, bi, i);
+ 
+-              if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
++              if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
+                       nBlocksPerState[bi->blockState]++;
+               else
+                       nIllegalBlockStates++;
+-
+       }
+ 
+-      T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
+-      T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
++      T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
++      T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
+ 
+-      T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
+-      if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
+-              T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
++      T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
++      if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
++              T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
+ 
+-      for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
++      for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
+               T(YAFFS_TRACE_VERIFY,
+                 (TSTR("%s %d blocks"TENDSTR),
+-                blockStateName[i],nBlocksPerState[i]));
++                blockStateName[i], nBlocksPerState[i]));
+ 
+-      if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
++      if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
+               T(YAFFS_TRACE_VERIFY,
+                (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
+                dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
+ 
+-      if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
++      if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
+               T(YAFFS_TRACE_VERIFY,
+                (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
+                dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
+ 
+-      if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
++      if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
+               T(YAFFS_TRACE_VERIFY,
+                (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
+                nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
+ 
+-      T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
++      T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
+ 
+ }
+ 
+@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
+  */
+ static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
+ {
+-      if(yaffs_SkipVerification(obj->myDev))
++      if (obj && yaffs_SkipVerification(obj->myDev))
+               return;
+ 
+-      if(!(tags && obj && oh)){
+-              T(YAFFS_TRACE_VERIFY,
+-                              (TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
+-                              (__u32)tags,(__u32)obj,(__u32)oh));
++      if (!(tags && obj && oh)) {
++              T(YAFFS_TRACE_VERIFY,
++                              (TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
++                              (__u32)tags, (__u32)obj, (__u32)oh));
+               return;
+       }
+ 
+-      if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
+-         oh->type > YAFFS_OBJECT_TYPE_MAX)
+-              T(YAFFS_TRACE_VERIFY,
+-               (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
+-               tags->objectId, oh->type));
+-
+-      if(tags->objectId != obj->objectId)
+-              T(YAFFS_TRACE_VERIFY,
+-               (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
+-               tags->objectId, obj->objectId));
++      if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
++                      oh->type > YAFFS_OBJECT_TYPE_MAX)
++              T(YAFFS_TRACE_VERIFY,
++                      (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
++                      tags->objectId, oh->type));
++
++      if (tags->objectId != obj->objectId)
++              T(YAFFS_TRACE_VERIFY,
++                      (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
++                      tags->objectId, obj->objectId));
+ 
+ 
+       /*
+@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
+        * Tests do not apply to the root object.
+        */
+ 
+-      if(parentCheck && tags->objectId > 1 && !obj->parent)
+-              T(YAFFS_TRACE_VERIFY,
+-               (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
+-               tags->objectId, oh->parentObjectId));
+-
+-
+-      if(parentCheck && obj->parent &&
+-         oh->parentObjectId != obj->parent->objectId &&
+-         (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
+-          obj->parent->objectId != YAFFS_OBJECTID_DELETED))
+-              T(YAFFS_TRACE_VERIFY,
+-               (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
+-               tags->objectId, oh->parentObjectId, obj->parent->objectId));
++      if (parentCheck && tags->objectId > 1 && !obj->parent)
++              T(YAFFS_TRACE_VERIFY,
++                      (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
++                      tags->objectId, oh->parentObjectId));
+ 
++      if (parentCheck && obj->parent &&
++                      oh->parentObjectId != obj->parent->objectId &&
++                      (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
++                      obj->parent->objectId != YAFFS_OBJECTID_DELETED))
++              T(YAFFS_TRACE_VERIFY,
++                      (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
++                      tags->objectId, oh->parentObjectId, obj->parent->objectId));
+ 
+-      if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
++      if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
+               T(YAFFS_TRACE_VERIFY,
+-              (TSTR("Obj %d header name is NULL"TENDSTR),
+-               obj->objectId));
++                      (TSTR("Obj %d header name is NULL"TENDSTR),
++                      obj->objectId));
+ 
+-      if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
++      if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
+               T(YAFFS_TRACE_VERIFY,
+-              (TSTR("Obj %d header name is 0xFF"TENDSTR),
+-               obj->objectId));
++                      (TSTR("Obj %d header name is 0xFF"TENDSTR),
++                      obj->objectId));
+ }
+ 
+ 
+ 
+-static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
+-                                      __u32 level, int chunkOffset)
++static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
++                                      __u32 level, int chunkOffset)
+ {
+       int i;
+       yaffs_Device *dev = obj->myDev;
+       int ok = 1;
+-      int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
+ 
+       if (tn) {
+               if (level > 0) {
+ 
+-                      for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
++                      for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
+                               if (tn->internal[i]) {
+                                       ok = yaffs_VerifyTnodeWorker(obj,
+                                                       tn->internal[i],
+@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
+                               }
+                       }
+               } else if (level == 0) {
+-                      int i;
+                       yaffs_ExtendedTags tags;
+                       __u32 objectId = obj->objectId;
+ 
+                       chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
+ 
+-                      for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
+-                              __u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
++                      for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
++                              __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
+ 
+-                              if(theChunk > 0){
++                              if (theChunk > 0) {
+                                       /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
+-                                      yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
+-                                      if(tags.objectId != objectId || tags.chunkId != chunkOffset){
+-                                              T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
++                                      yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
++                                      if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
++                                              T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+                                                       objectId, chunkOffset, theChunk,
+                                                       tags.objectId, tags.chunkId));
+                                       }
+@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
+       __u32 lastChunk;
+       __u32 x;
+       __u32 i;
+-      int ok;
+       yaffs_Device *dev;
+       yaffs_ExtendedTags tags;
+       yaffs_Tnode *tn;
+       __u32 objectId;
+ 
+-      if(obj && yaffs_SkipVerification(obj->myDev))
++      if (!obj)
++              return;
++
++      if (yaffs_SkipVerification(obj->myDev))
+               return;
+ 
+       dev = obj->myDev;
+@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
+       lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
+       x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
+       requiredTallness = 0;
+-      while (x> 0) {
++      while (x > 0) {
+               x >>= YAFFS_TNODES_INTERNAL_BITS;
+               requiredTallness++;
+       }
+ 
+       actualTallness = obj->variant.fileVariant.topLevel;
+ 
+-      if(requiredTallness > actualTallness )
++      if (requiredTallness > actualTallness)
+               T(YAFFS_TRACE_VERIFY,
+               (TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
+-               obj->objectId,actualTallness, requiredTallness));
++               obj->objectId, actualTallness, requiredTallness));
+ 
+ 
+       /* Check that the chunks in the tnode tree are all correct.
+@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
+        * checking the tags for every chunk match.
+        */
+ 
+-      if(yaffs_SkipNANDVerification(dev))
++      if (yaffs_SkipNANDVerification(dev))
+               return;
+ 
+-      for(i = 1; i <= lastChunk; i++){
+-              tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
++      for (i = 1; i <= lastChunk; i++) {
++              tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
+ 
+               if (tn) {
+-                      __u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
+-                      if(theChunk > 0){
++                      __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
++                      if (theChunk > 0) {
+                               /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
+-                              yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
+-                              if(tags.objectId != objectId || tags.chunkId != i){
+-                                      T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
++                              yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
++                              if (tags.objectId != objectId || tags.chunkId != i) {
++                                      T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+                                               objectId, i, theChunk,
+                                               tags.objectId, tags.chunkId));
+                               }
+                       }
+               }
+-
+       }
+-
+ }
+ 
+-static void yaffs_VerifyDirectory(yaffs_Object *obj)
+-{
+-      if(obj && yaffs_SkipVerification(obj->myDev))
+-              return;
+-
+-}
+ 
+ static void yaffs_VerifyHardLink(yaffs_Object *obj)
+ {
+-      if(obj && yaffs_SkipVerification(obj->myDev))
++      if (obj && yaffs_SkipVerification(obj->myDev))
+               return;
+ 
+       /* Verify sane equivalent object */
+@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
+ 
+ static void yaffs_VerifySymlink(yaffs_Object *obj)
+ {
+-      if(obj && yaffs_SkipVerification(obj->myDev))
++      if (obj && yaffs_SkipVerification(obj->myDev))
+               return;
+ 
+       /* Verify symlink string */
+@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
+ 
+ static void yaffs_VerifySpecial(yaffs_Object *obj)
+ {
+-      if(obj && yaffs_SkipVerification(obj->myDev))
++      if (obj && yaffs_SkipVerification(obj->myDev))
+               return;
+ }
+ 
+@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
+       __u32 chunkMax;
+ 
+       __u32 chunkIdOk;
+-      __u32 chunkIsLive;
++      __u32 chunkInRange;
++      __u32 chunkShouldNotBeDeleted;
++      __u32 chunkValid;
++
++      if (!obj)
++              return;
+ 
+-      if(!obj)
++      if (obj->beingCreated)
+               return;
+ 
+       dev = obj->myDev;
+ 
+-      if(yaffs_SkipVerification(dev))
++      if (yaffs_SkipVerification(dev))
+               return;
+ 
+       /* Check sane object header chunk */
+@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
+       chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
+       chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
+ 
+-      chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
+-      chunkIsLive = chunkIdOk &&
++      chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
++      chunkIdOk = chunkInRange || obj->hdrChunk == 0;
++      chunkValid = chunkInRange &&
+                       yaffs_CheckChunkBit(dev,
+-                                          obj->chunkId / dev->nChunksPerBlock,
+-                                          obj->chunkId % dev->nChunksPerBlock);
+-      if(!obj->fake &&
+-          (!chunkIdOk || !chunkIsLive)) {
+-         T(YAFFS_TRACE_VERIFY,
+-         (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
+-         obj->objectId,obj->chunkId,
+-         chunkIdOk ? "" : ",out of range",
+-         chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
++                                      obj->hdrChunk / dev->nChunksPerBlock,
++                                      obj->hdrChunk % dev->nChunksPerBlock);
++      chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
++
++      if (!obj->fake &&
++                      (!chunkIdOk || chunkShouldNotBeDeleted)) {
++              T(YAFFS_TRACE_VERIFY,
++                      (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
++                      obj->objectId, obj->hdrChunk,
++                      chunkIdOk ? "" : ",out of range",
++                      chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
+       }
+ 
+-      if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
++      if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
+               yaffs_ExtendedTags tags;
+               yaffs_ObjectHeader *oh;
+-              __u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
++              __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
+ 
+               oh = (yaffs_ObjectHeader *)buffer;
+ 
+-              yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
++              yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
++                              &tags);
+ 
+-              yaffs_VerifyObjectHeader(obj,oh,&tags,1);
++              yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
+ 
+-              yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
++              yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
+       }
+ 
+       /* Verify it has a parent */
+-      if(obj && !obj->fake &&
+-         (!obj->parent || obj->parent->myDev != dev)){
+-         T(YAFFS_TRACE_VERIFY,
+-         (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
+-         obj->objectId,obj->parent));
++      if (obj && !obj->fake &&
++                      (!obj->parent || obj->parent->myDev != dev)) {
++              T(YAFFS_TRACE_VERIFY,
++                      (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
++                      obj->objectId, obj->parent));
+       }
+ 
+       /* Verify parent is a directory */
+-      if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
+-         T(YAFFS_TRACE_VERIFY,
+-         (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
+-         obj->objectId,obj->parent->variantType));
++      if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
++              T(YAFFS_TRACE_VERIFY,
++                      (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
++                      obj->objectId, obj->parent->variantType));
+       }
+ 
+-      switch(obj->variantType){
++      switch (obj->variantType) {
+       case YAFFS_OBJECT_TYPE_FILE:
+               yaffs_VerifyFile(obj);
+               break;
+@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
+       default:
+               T(YAFFS_TRACE_VERIFY,
+               (TSTR("Obj %d has illegaltype %d"TENDSTR),
+-              obj->objectId,obj->variantType));
++              obj->objectId, obj->variantType));
+               break;
+       }
+-
+-
+ }
+ 
+ static void yaffs_VerifyObjects(yaffs_Device *dev)
+ {
+       yaffs_Object *obj;
+       int i;
+-      struct list_head *lh;
++      struct ylist_head *lh;
+ 
+-      if(yaffs_SkipVerification(dev))
++      if (yaffs_SkipVerification(dev))
+               return;
+ 
+       /* Iterate through the objects in each hash entry */
+ 
+-       for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
+-              list_for_each(lh, &dev->objectBucket[i].list) {
++      for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
++              ylist_for_each(lh, &dev->objectBucket[i].list) {
+                       if (lh) {
+-                              obj = list_entry(lh, yaffs_Object, hashLink);
++                              obj = ylist_entry(lh, yaffs_Object, hashLink);
+                               yaffs_VerifyObject(obj);
+                       }
+               }
+-       }
+-
++      }
+ }
+ 
+ 
+@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
+ static Y_INLINE int yaffs_HashFunction(int n)
+ {
+       n = abs(n);
+-      return (n % YAFFS_NOBJECT_BUCKETS);
++      return n % YAFFS_NOBJECT_BUCKETS;
+ }
+ 
+ /*
+- * Access functions to useful fake objects
++ * Access functions to useful fake objects.
++ * Note that root might have a presence in NAND if permissions are set.
+  */
+ 
+-yaffs_Object *yaffs_Root(yaffs_Device * dev)
++yaffs_Object *yaffs_Root(yaffs_Device *dev)
+ {
+       return dev->rootDir;
+ }
+ 
+-yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
++yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
+ {
+       return dev->lostNFoundDir;
+ }
+@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
+  *  Erased NAND checking functions
+  */
+ 
+-int yaffs_CheckFF(__u8 * buffer, int nBytes)
++int yaffs_CheckFF(__u8 *buffer, int nBytes)
+ {
+       /* Horrible, slow implementation */
+       while (nBytes--) {
+@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
+ }
+ 
+ static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
+-                                int chunkInNAND)
++                              int chunkInNAND)
+ {
+-
+       int retval = YAFFS_OK;
+       __u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
+       yaffs_ExtendedTags tags;
+@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
+ 
+       result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
+ 
+-      if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
++      if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
+               retval = YAFFS_FAIL;
+ 
+-
+       if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
+               T(YAFFS_TRACE_NANDACCESS,
+                 (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
+@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
+ 
+ }
+ 
+-
+ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
+-                                           const __u8 * data,
+-                                           yaffs_ExtendedTags * tags,
+-                                           int useReserve)
++                                      const __u8 *data,
++                                      yaffs_ExtendedTags *tags,
++                                      int useReserve)
+ {
+       int attempts = 0;
+       int writeOk = 0;
+@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
+                       erasedOk = yaffs_CheckChunkErased(dev, chunk);
+                       if (erasedOk != YAFFS_OK) {
+                               T(YAFFS_TRACE_ERROR,
+-                              (TSTR ("**>> yaffs chunk %d was not erased"
++                              (TSTR("**>> yaffs chunk %d was not erased"
+                               TENDSTR), chunk));
+ 
+                               /* try another chunk */
+@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
+               /* Copy the data into the robustification buffer */
+               yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
+ 
+-      } while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
++      } while (writeOk != YAFFS_OK &&
++              (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
++
++      if (!writeOk)
++              chunk = -1;
+ 
+       if (attempts > 1) {
+               T(YAFFS_TRACE_ERROR,
+@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
+  * Block retiring for handling a broken block.
+  */
+ 
+-static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
++static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
+ {
+       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
+ 
+       yaffs_InvalidateCheckpoint(dev);
+ 
+-      yaffs_MarkBlockBad(dev, blockInNAND);
++      if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
++              if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
++                      T(YAFFS_TRACE_ALWAYS, (TSTR(
++                              "yaffs: Failed to mark bad and erase block %d"
++                              TENDSTR), blockInNAND));
++              } else {
++                      yaffs_ExtendedTags tags;
++                      int chunkId = blockInNAND * dev->nChunksPerBlock;
++
++                      __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
++
++                      memset(buffer, 0xff, dev->nDataBytesPerChunk);
++                      yaffs_InitialiseTags(&tags);
++                      tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
++                      if (dev->writeChunkWithTagsToNAND(dev, chunkId -
++                              dev->chunkOffset, buffer, &tags) != YAFFS_OK)
++                              T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
++                                      TCONT("write bad block marker to block %d")
++                                      TENDSTR), blockInNAND));
++
++                      yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
++              }
++      }
+ 
+       bi->blockState = YAFFS_BLOCK_STATE_DEAD;
+       bi->gcPrioritise = 0;
+@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
+  *
+  */
+ 
+-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
+-                                   const __u8 * data,
+-                                   const yaffs_ExtendedTags * tags)
++static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
++                              const __u8 *data,
++                              const yaffs_ExtendedTags *tags)
+ {
+ }
+ 
+-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
+-                                  const yaffs_ExtendedTags * tags)
++static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
++                              const yaffs_ExtendedTags *tags)
+ {
+ }
+ 
+ void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
+ {
+-      if(!bi->gcPrioritise){
++      if (!bi->gcPrioritise) {
+               bi->gcPrioritise = 1;
+               dev->hasPendingPrioritisedGCs = 1;
+-              bi->chunkErrorStrikes ++;
++              bi->chunkErrorStrikes++;
+ 
+-              if(bi->chunkErrorStrikes > 3){
++              if (bi->chunkErrorStrikes > 3) {
+                       bi->needsRetiring = 1; /* Too many stikes, so retire this */
+                       T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
+ 
+               }
+-
+       }
+ }
+ 
+-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
++static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
++              int erasedOk)
+ {
+-
+       int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
+       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
+ 
+-      yaffs_HandleChunkError(dev,bi);
++      yaffs_HandleChunkError(dev, bi);
+ 
+-
+-      if(erasedOk ) {
++      if (erasedOk) {
+               /* Was an actual write failure, so mark the block for retirement  */
+               bi->needsRetiring = 1;
+               T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+                 (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
+-
+-
+       }
+ 
+       /* Delete the chunk */
+@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
+ 
+ /*---------------- Name handling functions ------------*/
+ 
+-static __u16 yaffs_CalcNameSum(const YCHAR * name)
++static __u16 yaffs_CalcNameSum(const YCHAR *name)
+ {
+       __u16 sum = 0;
+       __u16 i = 1;
+ 
+-      YUCHAR *bname = (YUCHAR *) name;
++      const YUCHAR *bname = (const YUCHAR *) name;
+       if (bname) {
+               while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
+ 
+@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
+       return sum;
+ }
+ 
+-static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
++static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
+ {
+ #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
+-      if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
++      memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
++      if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
+               yaffs_strcpy(obj->shortName, name);
+-      } else {
++      else
+               obj->shortName[0] = _Y('\0');
+-      }
+ #endif
+       obj->sum = yaffs_CalcNameSum(name);
+ }
+@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
+  * Don't use this function directly
+  */
+ 
+-static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
++static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
+ {
+       int i;
+       int tnodeSize;
+@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
+        * Must be a multiple of 32-bits  */
+       tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
+ 
++      if (tnodeSize < sizeof(yaffs_Tnode))
++              tnodeSize = sizeof(yaffs_Tnode);
++
+       /* make these things */
+ 
+       newTnodes = YMALLOC(nTnodes * tnodeSize);
+@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
+ 
+       if (!newTnodes) {
+               T(YAFFS_TRACE_ERROR,
+-                (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
++                      (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
+               return YAFFS_FAIL;
+       }
+ 
+@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
+       dev->freeTnodes = newTnodes;
+ #else
+       /* New hookup for wide tnodes */
+-      for(i = 0; i < nTnodes -1; i++) {
++      for (i = 0; i < nTnodes - 1; i++) {
+               curr = (yaffs_Tnode *) &mem[i * tnodeSize];
+               next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
+               curr->internal[0] = next;
+@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
+                 (TSTR
+                  ("yaffs: Could not add tnodes to management list" TENDSTR)));
+                  return YAFFS_FAIL;
+-
+       } else {
+               tnl->tnodes = newTnodes;
+               tnl->next = dev->allocatedTnodeList;
+@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
+ 
+ /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
+ 
+-static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
++static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
+ {
+       yaffs_Tnode *tn = NULL;
+ 
+       /* If there are none left make more */
+-      if (!dev->freeTnodes) {
++      if (!dev->freeTnodes)
+               yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
+-      }
+ 
+       if (dev->freeTnodes) {
+               tn = dev->freeTnodes;
+@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
+               dev->nFreeTnodes--;
+       }
+ 
++      dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
++
+       return tn;
+ }
+ 
+-static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
++static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
+ {
+       yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
++      int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
+ 
+-      if(tn)
+-              memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
++      if (tnodeSize < sizeof(yaffs_Tnode))
++              tnodeSize = sizeof(yaffs_Tnode);
++
++      if (tn)
++              memset(tn, 0, tnodeSize);
+ 
+       return tn;
+ }
+ 
+ /* FreeTnode frees up a tnode and puts it back on the free list */
+-static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
++static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
+ {
+       if (tn) {
+ #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
+@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
+               dev->freeTnodes = tn;
+               dev->nFreeTnodes++;
+       }
++      dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
+ }
+ 
+-static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
++static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
+ {
+       /* Free the list of allocated tnodes */
+       yaffs_TnodeList *tmp;
+@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
+       dev->nFreeTnodes = 0;
+ }
+ 
+-static void yaffs_InitialiseTnodes(yaffs_Device * dev)
++static void yaffs_InitialiseTnodes(yaffs_Device *dev)
+ {
+       dev->allocatedTnodeList = NULL;
+       dev->freeTnodes = NULL;
+       dev->nFreeTnodes = 0;
+       dev->nTnodesCreated = 0;
+-
+ }
+ 
+ 
+-void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
++void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
++              unsigned val)
+ {
+-  __u32 *map = (__u32 *)tn;
+-  __u32 bitInMap;
+-  __u32 bitInWord;
+-  __u32 wordInMap;
+-  __u32 mask;
++      __u32 *map = (__u32 *)tn;
++      __u32 bitInMap;
++      __u32 bitInWord;
++      __u32 wordInMap;
++      __u32 mask;
+ 
+-  pos &= YAFFS_TNODES_LEVEL0_MASK;
+-  val >>= dev->chunkGroupBits;
++      pos &= YAFFS_TNODES_LEVEL0_MASK;
++      val >>= dev->chunkGroupBits;
+ 
+-  bitInMap = pos * dev->tnodeWidth;
+-  wordInMap = bitInMap /32;
+-  bitInWord = bitInMap & (32 -1);
++      bitInMap = pos * dev->tnodeWidth;
++      wordInMap = bitInMap / 32;
++      bitInWord = bitInMap & (32 - 1);
+ 
+-  mask = dev->tnodeMask << bitInWord;
++      mask = dev->tnodeMask << bitInWord;
+ 
+-  map[wordInMap] &= ~mask;
+-  map[wordInMap] |= (mask & (val << bitInWord));
++      map[wordInMap] &= ~mask;
++      map[wordInMap] |= (mask & (val << bitInWord));
+ 
+-  if(dev->tnodeWidth > (32-bitInWord)) {
+-    bitInWord = (32 - bitInWord);
+-    wordInMap++;;
+-    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
+-    map[wordInMap] &= ~mask;
+-    map[wordInMap] |= (mask & (val >> bitInWord));
+-  }
++      if (dev->tnodeWidth > (32 - bitInWord)) {
++              bitInWord = (32 - bitInWord);
++              wordInMap++;;
++              mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
++              map[wordInMap] &= ~mask;
++              map[wordInMap] |= (mask & (val >> bitInWord));
++      }
+ }
+ 
+-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
++static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
++              unsigned pos)
+ {
+-  __u32 *map = (__u32 *)tn;
+-  __u32 bitInMap;
+-  __u32 bitInWord;
+-  __u32 wordInMap;
+-  __u32 val;
++      __u32 *map = (__u32 *)tn;
++      __u32 bitInMap;
++      __u32 bitInWord;
++      __u32 wordInMap;
++      __u32 val;
+ 
+-  pos &= YAFFS_TNODES_LEVEL0_MASK;
++      pos &= YAFFS_TNODES_LEVEL0_MASK;
+ 
+-  bitInMap = pos * dev->tnodeWidth;
+-  wordInMap = bitInMap /32;
+-  bitInWord = bitInMap & (32 -1);
++      bitInMap = pos * dev->tnodeWidth;
++      wordInMap = bitInMap / 32;
++      bitInWord = bitInMap & (32 - 1);
+ 
+-  val = map[wordInMap] >> bitInWord;
++      val = map[wordInMap] >> bitInWord;
+ 
+-  if(dev->tnodeWidth > (32-bitInWord)) {
+-    bitInWord = (32 - bitInWord);
+-    wordInMap++;;
+-    val |= (map[wordInMap] << bitInWord);
+-  }
++      if      (dev->tnodeWidth > (32 - bitInWord)) {
++              bitInWord = (32 - bitInWord);
++              wordInMap++;;
++              val |= (map[wordInMap] << bitInWord);
++      }
+ 
+-  val &= dev->tnodeMask;
+-  val <<= dev->chunkGroupBits;
++      val &= dev->tnodeMask;
++      val <<= dev->chunkGroupBits;
+ 
+-  return val;
++      return val;
+ }
+ 
+ /* ------------------- End of individual tnode manipulation -----------------*/
+@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
+  */
+ 
+ /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
+-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
+-                                        yaffs_FileStructure * fStruct,
+-                                        __u32 chunkId)
++static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
++                                      yaffs_FileStructure *fStruct,
++                                      __u32 chunkId)
+ {
+-
+       yaffs_Tnode *tn = fStruct->top;
+       __u32 i;
+       int requiredTallness;
+       int level = fStruct->topLevel;
+ 
+       /* Check sane level and chunk Id */
+-      if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
++      if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
+               return NULL;
+-      }
+ 
+-      if (chunkId > YAFFS_MAX_CHUNK_ID) {
++      if (chunkId > YAFFS_MAX_CHUNK_ID)
+               return NULL;
+-      }
+ 
+       /* First check we're tall enough (ie enough topLevel) */
+ 
+@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
+               requiredTallness++;
+       }
+ 
+-      if (requiredTallness > fStruct->topLevel) {
+-              /* Not tall enough, so we can't find it, return NULL. */
+-              return NULL;
+-      }
++      if (requiredTallness > fStruct->topLevel)
++              return NULL; /* Not tall enough, so we can't find it */
+ 
+       /* Traverse down to level 0 */
+       while (level > 0 && tn) {
+-              tn = tn->
+-                  internal[(chunkId >>
+-                             ( YAFFS_TNODES_LEVEL0_BITS +
+-                               (level - 1) *
+-                               YAFFS_TNODES_INTERNAL_BITS)
+-                            ) &
+-                           YAFFS_TNODES_INTERNAL_MASK];
++              tn = tn->internal[(chunkId >>
++                      (YAFFS_TNODES_LEVEL0_BITS +
++                              (level - 1) *
++                              YAFFS_TNODES_INTERNAL_BITS)) &
++                      YAFFS_TNODES_INTERNAL_MASK];
+               level--;
+-
+       }
+ 
+       return tn;
+@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
+  *  be plugged into the ttree.
+  */
+ 
+-static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
+-                                             yaffs_FileStructure * fStruct,
+-                                             __u32 chunkId,
+-                                             yaffs_Tnode *passedTn)
++static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
++                                      yaffs_FileStructure *fStruct,
++                                      __u32 chunkId,
++                                      yaffs_Tnode *passedTn)
+ {
+-
+       int requiredTallness;
+       int i;
+       int l;
+@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
+ 
+ 
+       /* Check sane level and page Id */
+-      if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
++      if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
+               return NULL;
+-      }
+ 
+-      if (chunkId > YAFFS_MAX_CHUNK_ID) {
++      if (chunkId > YAFFS_MAX_CHUNK_ID)
+               return NULL;
+-      }
+ 
+       /* First check we're tall enough (ie enough topLevel) */
+ 
+@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
+ 
+ 
+       if (requiredTallness > fStruct->topLevel) {
+-              /* Not tall enough,gotta make the tree taller */
++              /* Not tall enough, gotta make the tree taller */
+               for (i = fStruct->topLevel; i < requiredTallness; i++) {
+ 
+                       tn = yaffs_GetTnode(dev);
+@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
+       l = fStruct->topLevel;
+       tn = fStruct->top;
+ 
+-      if(l > 0) {
++      if (l > 0) {
+               while (l > 0 && tn) {
+                       x = (chunkId >>
+-                           ( YAFFS_TNODES_LEVEL0_BITS +
++                           (YAFFS_TNODES_LEVEL0_BITS +
+                             (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
+                           YAFFS_TNODES_INTERNAL_MASK;
+ 
+ 
+-                      if((l>1) && !tn->internal[x]){
++                      if ((l > 1) && !tn->internal[x]) {
+                               /* Add missing non-level-zero tnode */
+                               tn->internal[x] = yaffs_GetTnode(dev);
+ 
+-                      } else if(l == 1) {
++                      } else if (l == 1) {
+                               /* Looking from level 1 at level 0 */
+-                              if (passedTn) {
++                              if (passedTn) {
+                                       /* If we already have one, then release it.*/
+-                                      if(tn->internal[x])
+-                                              yaffs_FreeTnode(dev,tn->internal[x]);
++                                      if (tn->internal[x])
++                                              yaffs_FreeTnode(dev, tn->internal[x]);
+                                       tn->internal[x] = passedTn;
+ 
+-                              } else if(!tn->internal[x]) {
++                              } else if (!tn->internal[x]) {
+                                       /* Don't have one, none passed in */
+                                       tn->internal[x] = yaffs_GetTnode(dev);
+                               }
+@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
+               }
+       } else {
+               /* top is level 0 */
+-              if(passedTn) {
+-                      memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
+-                      yaffs_FreeTnode(dev,passedTn);
++              if (passedTn) {
++                      memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
++                      yaffs_FreeTnode(dev, passedTn);
+               }
+       }
+ 
+       return tn;
+ }
+ 
+-static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
+-                                yaffs_ExtendedTags * tags, int objectId,
+-                                int chunkInInode)
++static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
++                              yaffs_ExtendedTags *tags, int objectId,
++                              int chunkInInode)
+ {
+       int j;
+ 
+       for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
+-              if (yaffs_CheckChunkBit
+-                  (dev, theChunk / dev->nChunksPerBlock,
+-                   theChunk % dev->nChunksPerBlock)) {
++              if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
++                              theChunk % dev->nChunksPerBlock)) {
+                       yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
+                                                       tags);
+                       if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
+                               /* found it; */
+                               return theChunk;
+-
+                       }
+               }
+               theChunk++;
+@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
+  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
+  */
+ 
+-static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
++static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
+                             int chunkOffset, int *limit)
+ {
+       int i;
+@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
+ 
+       if (tn) {
+               if (level > 0) {
+-
+                       for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
+                            i--) {
+                               if (tn->internal[i]) {
+@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
+                                               allDone = 0;
+                                       } else {
+                                               allDone =
+-                                                  yaffs_DeleteWorker(in,
+-                                                                     tn->
+-                                                                     internal
+-                                                                     [i],
+-                                                                     level -
+-                                                                     1,
+-                                                                     (chunkOffset
++                                                      yaffs_DeleteWorker(in,
++                                                              tn->
++                                                              internal
++                                                              [i],
++                                                              level -
++                                                              1,
++                                                              (chunkOffset
+                                                                       <<
+                                                                       YAFFS_TNODES_INTERNAL_BITS)
+-                                                                     + i,
+-                                                                     limit);
++                                                              + i,
++                                                              limit);
+                                       }
+                                       if (allDone) {
+                                               yaffs_FreeTnode(dev,
+@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
+                                               tn->internal[i] = NULL;
+                                       }
+                               }
+-
+                       }
+                       return (allDone) ? 1 : 0;
+               } else if (level == 0) {
+                       int hitLimit = 0;
+ 
+                       for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
+-                           i--) {
+-                              theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
++                                      i--) {
++                              theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
+                               if (theChunk) {
+ 
+-                                      chunkInInode =
+-                                          (chunkOffset <<
+-                                           YAFFS_TNODES_LEVEL0_BITS) + i;
++                                      chunkInInode = (chunkOffset <<
++                                              YAFFS_TNODES_LEVEL0_BITS) + i;
+ 
+                                       foundChunk =
+-                                          yaffs_FindChunkInGroup(dev,
+-                                                                 theChunk,
+-                                                                 &tags,
+-                                                                 in->objectId,
+-                                                                 chunkInInode);
++                                              yaffs_FindChunkInGroup(dev,
++                                                              theChunk,
++                                                              &tags,
++                                                              in->objectId,
++                                                              chunkInInode);
+ 
+                                       if (foundChunk > 0) {
+                                               yaffs_DeleteChunk(dev,
+@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
+                                               in->nDataChunks--;
+                                               if (limit) {
+                                                       *limit = *limit - 1;
+-                                                      if (*limit <= 0) {
++                                                      if (*limit <= 0)
+                                                               hitLimit = 1;
+-                                                      }
+                                               }
+ 
+                                       }
+ 
+-                                      yaffs_PutLevel0Tnode(dev,tn,i,0);
++                                      yaffs_PutLevel0Tnode(dev, tn, i, 0);
+                               }
+ 
+                       }
+@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
+ 
+ }
+ 
+-static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
++static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
+ {
+-
+       yaffs_BlockInfo *theBlock;
+ 
+       T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
+@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
+  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
+  */
+ 
+-static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
++static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
+                                 __u32 level, int chunkOffset)
+ {
+       int i;
+@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
+               } else if (level == 0) {
+ 
+                       for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
+-                              theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
++                              theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
+                               if (theChunk) {
+                                       /* Note this does not find the real chunk, only the chunk group.
+                                        * We make an assumption that a chunk group is not larger than
+                                        * a block.
+                                        */
+                                       yaffs_SoftDeleteChunk(dev, theChunk);
+-                                      yaffs_PutLevel0Tnode(dev,tn,i,0);
++                                      yaffs_PutLevel0Tnode(dev, tn, i, 0);
+                               }
+ 
+                       }
+@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
+ 
+ }
+ 
+-static void yaffs_SoftDeleteFile(yaffs_Object * obj)
++static void yaffs_SoftDeleteFile(yaffs_Object *obj)
+ {
+       if (obj->deleted &&
+           obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
+@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
+  * by a special case.
+  */
+ 
+-static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
+-                                    __u32 level, int del0)
++static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
++                              __u32 level, int del0)
+ {
+       int i;
+       int hasData;
+@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
+                                                     (i == 0) ? del0 : 1);
+                       }
+ 
+-                      if (tn->internal[i]) {
++                      if (tn->internal[i])
+                               hasData++;
+-                      }
+               }
+ 
+               if (hasData == 0 && del0) {
+@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
+ 
+ }
+ 
+-static int yaffs_PruneFileStructure(yaffs_Device * dev,
+-                                  yaffs_FileStructure * fStruct)
++static int yaffs_PruneFileStructure(yaffs_Device *dev,
++                              yaffs_FileStructure *fStruct)
+ {
+       int i;
+       int hasData;
+@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
+ 
+                       hasData = 0;
+                       for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
+-                              if (tn->internal[i]) {
++                              if (tn->internal[i])
+                                       hasData++;
+-                              }
+                       }
+ 
+                       if (!hasData) {
+@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
+ /* yaffs_CreateFreeObjects creates a bunch more objects and
+  * adds them to the object free list.
+  */
+-static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
++static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
+ {
+       int i;
+       yaffs_Object *newObjects;
+@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
+       list = YMALLOC(sizeof(yaffs_ObjectList));
+ 
+       if (!newObjects || !list) {
+-              if(newObjects)
++              if (newObjects)
+                       YFREE(newObjects);
+-              if(list)
++              if (list)
+                       YFREE(list);
+               T(YAFFS_TRACE_ALLOCATE,
+                 (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
+@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
+       /* Hook them into the free list */
+       for (i = 0; i < nObjects - 1; i++) {
+               newObjects[i].siblings.next =
+-                  (struct list_head *)(&newObjects[i + 1]);
++                              (struct ylist_head *)(&newObjects[i + 1]);
+       }
+ 
+       newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
+@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
+ 
+ 
+ /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
+-static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
++static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
+ {
+       yaffs_Object *tn = NULL;
+ 
++#ifdef VALGRIND_TEST
++      tn = YMALLOC(sizeof(yaffs_Object));
++#else
+       /* If there are none left make more */
+-      if (!dev->freeObjects) {
++      if (!dev->freeObjects)
+               yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
+-      }
+ 
+       if (dev->freeObjects) {
+               tn = dev->freeObjects;
+               dev->freeObjects =
+-                  (yaffs_Object *) (dev->freeObjects->siblings.next);
++                      (yaffs_Object *) (dev->freeObjects->siblings.next);
+               dev->nFreeObjects--;
+-
++      }
++#endif
++      if (tn) {
+               /* Now sweeten it up... */
+ 
+               memset(tn, 0, sizeof(yaffs_Object));
++              tn->beingCreated = 1;
++
+               tn->myDev = dev;
+-              tn->chunkId = -1;
++              tn->hdrChunk = 0;
+               tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
+-              INIT_LIST_HEAD(&(tn->hardLinks));
+-              INIT_LIST_HEAD(&(tn->hashLink));
+-              INIT_LIST_HEAD(&tn->siblings);
++              YINIT_LIST_HEAD(&(tn->hardLinks));
++              YINIT_LIST_HEAD(&(tn->hashLink));
++              YINIT_LIST_HEAD(&tn->siblings);
++
++
++              /* Now make the directory sane */
++              if (dev->rootDir) {
++                      tn->parent = dev->rootDir;
++                      ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
++              }
+ 
+               /* Add it to the lost and found directory.
+                * NB Can't put root or lostNFound in lostNFound so
+                * check if lostNFound exists first
+                */
+-              if (dev->lostNFoundDir) {
++              if (dev->lostNFoundDir)
+                       yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
+-              }
++
++              tn->beingCreated = 0;
+       }
+ 
++      dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
++
+       return tn;
+ }
+ 
+-static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
++static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
+                                              __u32 mode)
+ {
+ 
+       yaffs_Object *obj =
+           yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
+       if (obj) {
+-              obj->fake = 1;          /* it is fake so it has no NAND presence... */
++              obj->fake = 1;          /* it is fake so it might have no NAND presence... */
+               obj->renameAllowed = 0; /* ... and we're not allowed to rename it... */
+               obj->unlinkAllowed = 0; /* ... or unlink it */
+               obj->deleted = 0;
+               obj->unlinked = 0;
+               obj->yst_mode = mode;
+               obj->myDev = dev;
+-              obj->chunkId = 0;       /* Not a valid chunk. */
++              obj->hdrChunk = 0;      /* Not a valid chunk. */
+       }
+ 
+       return obj;
+ 
+ }
+ 
+-static void yaffs_UnhashObject(yaffs_Object * tn)
++static void yaffs_UnhashObject(yaffs_Object *tn)
+ {
+       int bucket;
+       yaffs_Device *dev = tn->myDev;
+ 
+       /* If it is still linked into the bucket list, free from the list */
+-      if (!list_empty(&tn->hashLink)) {
+-              list_del_init(&tn->hashLink);
++      if (!ylist_empty(&tn->hashLink)) {
++              ylist_del_init(&tn->hashLink);
+               bucket = yaffs_HashFunction(tn->objectId);
+               dev->objectBucket[bucket].count--;
+       }
+-
+ }
+ 
+ /*  FreeObject frees up a Object and puts it back on the free list */
+-static void yaffs_FreeObject(yaffs_Object * tn)
++static void yaffs_FreeObject(yaffs_Object *tn)
+ {
+-
+       yaffs_Device *dev = tn->myDev;
+ 
+-#ifdef  __KERNEL__
++#ifdef __KERNEL__
++      T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
++#endif
++
++      if (tn->parent)
++              YBUG();
++      if (!ylist_empty(&tn->siblings))
++              YBUG();
++
++
++#ifdef __KERNEL__
+       if (tn->myInode) {
+               /* We're still hooked up to a cached inode.
+                * Don't delete now, but mark for later deletion
+@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
+ 
+       yaffs_UnhashObject(tn);
+ 
++#ifdef VALGRIND_TEST
++      YFREE(tn);
++#else
+       /* Link into the free list. */
+-      tn->siblings.next = (struct list_head *)(dev->freeObjects);
++      tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
+       dev->freeObjects = tn;
+       dev->nFreeObjects++;
++#endif
++      dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
+ }
+ 
+ #ifdef __KERNEL__
+ 
+-void yaffs_HandleDeferedFree(yaffs_Object * obj)
++void yaffs_HandleDeferedFree(yaffs_Object *obj)
+ {
+-      if (obj->deferedFree) {
++      if (obj->deferedFree)
+               yaffs_FreeObject(obj);
+-      }
+ }
+ 
+ #endif
+ 
+-static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
++static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
+ {
+       /* Free the list of allocated Objects */
+ 
+@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
+       dev->nFreeObjects = 0;
+ }
+ 
+-static void yaffs_InitialiseObjects(yaffs_Device * dev)
++static void yaffs_InitialiseObjects(yaffs_Device *dev)
+ {
+       int i;
+ 
+@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
+       dev->nFreeObjects = 0;
+ 
+       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+-              INIT_LIST_HEAD(&dev->objectBucket[i].list);
++              YINIT_LIST_HEAD(&dev->objectBucket[i].list);
+               dev->objectBucket[i].count = 0;
+       }
+-
+ }
+ 
+-static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
++static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
+ {
+-      static int x = 0;
++      static int x;
+       int i;
+       int l = 999;
+       int lowest = 999999;
+@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
+       return l;
+ }
+ 
+-static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
++static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
+ {
+       int bucket = yaffs_FindNiceObjectBucket(dev);
+ 
+@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
+        */
+ 
+       int found = 0;
+-      struct list_head *i;
++      struct ylist_head *i;
+ 
+       __u32 n = (__u32) bucket;
+ 
+@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
+               found = 1;
+               n += YAFFS_NOBJECT_BUCKETS;
+               if (1 || dev->objectBucket[bucket].count > 0) {
+-                      list_for_each(i, &dev->objectBucket[bucket].list) {
++                      ylist_for_each(i, &dev->objectBucket[bucket].list) {
+                               /* If there is already one in the list */
+-                              if (i
+-                                  && list_entry(i, yaffs_Object,
+-                                                hashLink)->objectId == n) {
++                              if (i && ylist_entry(i, yaffs_Object,
++                                              hashLink)->objectId == n) {
+                                       found = 0;
+                               }
+                       }
+               }
+       }
+ 
+-
+       return n;
+ }
+ 
+-static void yaffs_HashObject(yaffs_Object * in)
++static void yaffs_HashObject(yaffs_Object *in)
+ {
+       int bucket = yaffs_HashFunction(in->objectId);
+       yaffs_Device *dev = in->myDev;
+ 
+-      list_add(&in->hashLink, &dev->objectBucket[bucket].list);
++      ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
+       dev->objectBucket[bucket].count++;
+-
+ }
+ 
+-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
++yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
+ {
+       int bucket = yaffs_HashFunction(number);
+-      struct list_head *i;
++      struct ylist_head *i;
+       yaffs_Object *in;
+ 
+-      list_for_each(i, &dev->objectBucket[bucket].list) {
++      ylist_for_each(i, &dev->objectBucket[bucket].list) {
+               /* Look if it is in the list */
+               if (i) {
+-                      in = list_entry(i, yaffs_Object, hashLink);
++                      in = ylist_entry(i, yaffs_Object, hashLink);
+                       if (in->objectId == number) {
+ #ifdef __KERNEL__
+                               /* Don't tell the VFS about this one if it is defered free */
+@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
+       return NULL;
+ }
+ 
+-yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
++yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
+                                   yaffs_ObjectType type)
+ {
+-
+       yaffs_Object *theObject;
+-      yaffs_Tnode *tn;
++      yaffs_Tnode *tn = NULL;
+ 
+-      if (number < 0) {
++      if (number < 0)
+               number = yaffs_CreateNewObjectNumber(dev);
+-      }
+ 
+       theObject = yaffs_AllocateEmptyObject(dev);
+-      if(!theObject)
++      if (!theObject)
+               return NULL;
+ 
+-      if(type == YAFFS_OBJECT_TYPE_FILE){
++      if (type == YAFFS_OBJECT_TYPE_FILE) {
+               tn = yaffs_GetTnode(dev);
+-              if(!tn){
++              if (!tn) {
+                       yaffs_FreeObject(theObject);
+                       return NULL;
+               }
+       }
+ 
+-
+-
+       if (theObject) {
+               theObject->fake = 0;
+               theObject->renameAllowed = 1;
+@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
+                       theObject->variant.fileVariant.top = tn;
+                       break;
+               case YAFFS_OBJECT_TYPE_DIRECTORY:
+-                      INIT_LIST_HEAD(&theObject->variant.directoryVariant.
+-                                     children);
++                      YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
++                                      children);
+                       break;
+               case YAFFS_OBJECT_TYPE_SYMLINK:
+               case YAFFS_OBJECT_TYPE_HARDLINK:
+@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
+       return theObject;
+ }
+ 
+-static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
++static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
+                                                     int number,
+                                                     yaffs_ObjectType type)
+ {
+       yaffs_Object *theObject = NULL;
+ 
+-      if (number > 0) {
++      if (number > 0)
+               theObject = yaffs_FindObjectByNumber(dev, number);
+-      }
+ 
+-      if (!theObject) {
++      if (!theObject)
+               theObject = yaffs_CreateNewObject(dev, number, type);
+-      }
+ 
+       return theObject;
+ 
+ }
+ 
+ 
+-static YCHAR *yaffs_CloneString(const YCHAR * str)
++static YCHAR *yaffs_CloneString(const YCHAR *str)
+ {
+       YCHAR *newStr = NULL;
+ 
+       if (str && *str) {
+               newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
+-              if(newStr)
++              if (newStr)
+                       yaffs_strcpy(newStr, str);
+       }
+ 
+@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
+  */
+ 
+ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
+-                                     yaffs_Object * parent,
+-                                     const YCHAR * name,
++                                     yaffs_Object *parent,
++                                     const YCHAR *name,
+                                      __u32 mode,
+                                      __u32 uid,
+                                      __u32 gid,
+-                                     yaffs_Object * equivalentObject,
+-                                     const YCHAR * aliasString, __u32 rdev)
++                                     yaffs_Object *equivalentObject,
++                                     const YCHAR *aliasString, __u32 rdev)
+ {
+       yaffs_Object *in;
+-      YCHAR *str;
++      YCHAR *str = NULL;
+ 
+       yaffs_Device *dev = parent->myDev;
+ 
+       /* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
+-      if (yaffs_FindObjectByName(parent, name)) {
++      if (yaffs_FindObjectByName(parent, name))
+               return NULL;
+-      }
+ 
+       in = yaffs_CreateNewObject(dev, -1, type);
+ 
+-      if(type == YAFFS_OBJECT_TYPE_SYMLINK){
++      if (!in)
++              return YAFFS_FAIL;
++
++      if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
+               str = yaffs_CloneString(aliasString);
+-              if(!str){
++              if (!str) {
+                       yaffs_FreeObject(in);
+                       return NULL;
+               }
+@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
+ 
+ 
+       if (in) {
+-              in->chunkId = -1;
++              in->hdrChunk = 0;
+               in->valid = 1;
+               in->variantType = type;
+ 
+@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
+                       break;
+               case YAFFS_OBJECT_TYPE_HARDLINK:
+                       in->variant.hardLinkVariant.equivalentObject =
+-                          equivalentObject;
++                              equivalentObject;
+                       in->variant.hardLinkVariant.equivalentObjectId =
+-                          equivalentObject->objectId;
+-                      list_add(&in->hardLinks, &equivalentObject->hardLinks);
++                              equivalentObject->objectId;
++                      ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
+                       break;
+               case YAFFS_OBJECT_TYPE_FILE:
+               case YAFFS_OBJECT_TYPE_DIRECTORY:
+@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
+ 
+               if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
+                       /* Could not create the object header, fail the creation */
+-                      yaffs_DestroyObject(in);
++                      yaffs_DeleteObject(in);
+                       in = NULL;
+               }
+ 
+@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
+       return in;
+ }
+ 
+-yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
+-                            __u32 mode, __u32 uid, __u32 gid)
++yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
++                      __u32 mode, __u32 uid, __u32 gid)
+ {
+       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
+-                               uid, gid, NULL, NULL, 0);
++                              uid, gid, NULL, NULL, 0);
+ }
+ 
+-yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
+-                                 __u32 mode, __u32 uid, __u32 gid)
++yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
++                              __u32 mode, __u32 uid, __u32 gid)
+ {
+       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
+                                mode, uid, gid, NULL, NULL, 0);
+ }
+ 
+-yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
+-                               __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
++yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
++                              __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
+ {
+       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
+                                uid, gid, NULL, NULL, rdev);
+ }
+ 
+-yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
+-                               __u32 mode, __u32 uid, __u32 gid,
+-                               const YCHAR * alias)
++yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
++                              __u32 mode, __u32 uid, __u32 gid,
++                              const YCHAR *alias)
+ {
+       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
+-                               uid, gid, NULL, alias, 0);
++                              uid, gid, NULL, alias, 0);
+ }
+ 
+ /* yaffs_Link returns the object id of the equivalent object.*/
+-yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
+-                       yaffs_Object * equivalentObject)
++yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
++                      yaffs_Object *equivalentObject)
+ {
+       /* Get the real object in case we were fed a hard link as an equivalent object */
+       equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
+@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
+ 
+ }
+ 
+-static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
+-                                const YCHAR * newName, int force, int shadows)
++static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
++                              const YCHAR *newName, int force, int shadows)
+ {
+       int unlinkOp;
+       int deleteOp;
+ 
+       yaffs_Object *existingTarget;
+ 
+-      if (newDir == NULL) {
++      if (newDir == NULL)
+               newDir = obj->parent;   /* use the old directory */
+-      }
+ 
+       if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_ALWAYS,
+                 (TSTR
+-                 ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
++                 ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
+                   TENDSTR)));
+               YBUG();
+       }
+ 
+       /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
+-      if (obj->myDev->isYaffs2) {
++      if (obj->myDev->isYaffs2)
+               unlinkOp = (newDir == obj->myDev->unlinkedDir);
+-      } else {
++      else
+               unlinkOp = (newDir == obj->myDev->unlinkedDir
+                           && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
+-      }
+ 
+       deleteOp = (newDir == obj->myDev->deletedDir);
+ 
+@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
+                       obj->unlinked = 1;
+ 
+               /* If it is a deletion then we mark it as a shrink for gc purposes. */
+-              if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
++              if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
+                       return YAFFS_OK;
+       }
+ 
+       return YAFFS_FAIL;
+ }
+ 
+-int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
+-                     yaffs_Object * newDir, const YCHAR * newName)
++int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
++              yaffs_Object *newDir, const YCHAR *newName)
+ {
+-      yaffs_Object *obj;
+-      yaffs_Object *existingTarget;
++      yaffs_Object *obj = NULL;
++      yaffs_Object *existingTarget = NULL;
+       int force = 0;
+ 
++
++      if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
++              YBUG();
++      if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
++              YBUG();
++
+ #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
+       /* Special case for case insemsitive systems (eg. WinCE).
+        * While look-up is case insensitive, the name isn't.
+        * Therefore we might want to change x.txt to X.txt
+       */
+-      if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
++      if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
+               force = 1;
+-      }
+ #endif
+ 
++      else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
++              /* ENAMETOOLONG */
++              return YAFFS_FAIL;
++
+       obj = yaffs_FindObjectByName(oldDir, oldName);
+-      /* Check new name to long. */
+-      if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
+-          yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
+-        /* ENAMETOOLONG */
+-        return YAFFS_FAIL;
+-      else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
+-               yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
+-        /* ENAMETOOLONG */
+-        return YAFFS_FAIL;
+ 
+       if (obj && obj->renameAllowed) {
+ 
+@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
+ 
+               existingTarget = yaffs_FindObjectByName(newDir, newName);
+               if (existingTarget &&
+-                  existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
+-                  !list_empty(&existingTarget->variant.directoryVariant.children)) {
++                      existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
++                      !ylist_empty(&existingTarget->variant.directoryVariant.children)) {
+                       /* There is a target that is a non-empty directory, so we fail */
+                       return YAFFS_FAIL;      /* EEXIST or ENOTEMPTY */
+               } else if (existingTarget && existingTarget != obj) {
+@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
+                        * but only if it isn't the same object
+                        */
+                       yaffs_ChangeObjectName(obj, newDir, newName, force,
+-                                             existingTarget->objectId);
++                                              existingTarget->objectId);
+                       yaffs_UnlinkObject(existingTarget);
+               }
+ 
+@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
+ 
+ /*------------------------- Block Management and Page Allocation ----------------*/
+ 
+-static int yaffs_InitialiseBlocks(yaffs_Device * dev)
++static int yaffs_InitialiseBlocks(yaffs_Device *dev)
+ {
+       int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
+ 
+@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
+ 
+       /* If the first allocation strategy fails, thry the alternate one */
+       dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
+-      if(!dev->blockInfo){
++      if (!dev->blockInfo) {
+               dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
+               dev->blockInfoAlt = 1;
+-      }
+-      else
++      } else
+               dev->blockInfoAlt = 0;
+ 
+-      if(dev->blockInfo){
+-
++      if (dev->blockInfo) {
+               /* Set up dynamic blockinfo stuff. */
+               dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
+               dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
+-              if(!dev->chunkBits){
++              if (!dev->chunkBits) {
+                       dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
+                       dev->chunkBitsAlt = 1;
+-              }
+-              else
++              } else
+                       dev->chunkBitsAlt = 0;
+       }
+ 
+@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
+       }
+ 
+       return YAFFS_FAIL;
+-
+ }
+ 
+-static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
++static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
+ {
+-      if(dev->blockInfoAlt && dev->blockInfo)
++      if (dev->blockInfoAlt && dev->blockInfo)
+               YFREE_ALT(dev->blockInfo);
+-      else if(dev->blockInfo)
++      else if (dev->blockInfo)
+               YFREE(dev->blockInfo);
+ 
+       dev->blockInfoAlt = 0;
+ 
+       dev->blockInfo = NULL;
+ 
+-      if(dev->chunkBitsAlt && dev->chunkBits)
++      if (dev->chunkBitsAlt && dev->chunkBits)
+               YFREE_ALT(dev->chunkBits);
+-      else if(dev->chunkBits)
++      else if (dev->chunkBits)
+               YFREE(dev->chunkBits);
+       dev->chunkBitsAlt = 0;
+       dev->chunkBits = NULL;
+ }
+ 
+-static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
+-                                          yaffs_BlockInfo * bi)
++static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
++                                      yaffs_BlockInfo *bi)
+ {
+       int i;
+       __u32 seq;
+@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
+               seq = dev->sequenceNumber;
+ 
+               for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
+-                   i++) {
++                              i++) {
+                       b = yaffs_GetBlockInfo(dev, i);
+                       if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
+                           (b->pagesInUse - b->softDeletions) <
+@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
+        * discarded pages.
+        */
+       return (bi->sequenceNumber <= dev->oldestDirtySequence);
+-
+ }
+ 
+ /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
+  * for garbage collection.
+  */
+ 
+-static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
+-                                             int aggressive)
++static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
++                                      int aggressive)
+ {
+-
+       int b = dev->currentDirtyChecker;
+ 
+       int i;
+       int iterations;
+       int dirtiest = -1;
+       int pagesInUse = 0;
+-      int prioritised=0;
++      int prioritised = 0;
+       yaffs_BlockInfo *bi;
+       int pendingPrioritisedExist = 0;
+ 
+       /* First let's see if we need to grab a prioritised block */
+-      if(dev->hasPendingPrioritisedGCs){
+-              for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
++      if (dev->hasPendingPrioritisedGCs) {
++              for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
+ 
+                       bi = yaffs_GetBlockInfo(dev, i);
+-                      //yaffs_VerifyBlock(dev,bi,i);
++                      /* yaffs_VerifyBlock(dev,bi,i); */
+ 
+-                      if(bi->gcPrioritise) {
++                      if (bi->gcPrioritise) {
+                               pendingPrioritisedExist = 1;
+-                              if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
+-                                 yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
++                              if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
++                                 yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
+                                       pagesInUse = (bi->pagesInUse - bi->softDeletions);
+                                       dirtiest = i;
+                                       prioritised = 1;
+@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
+                       }
+               }
+ 
+-              if(!pendingPrioritisedExist) /* None found, so we can clear this */
++              if (!pendingPrioritisedExist) /* None found, so we can clear this */
+                       dev->hasPendingPrioritisedGCs = 0;
+       }
+ 
+@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
+ 
+       dev->nonAggressiveSkip--;
+ 
+-      if (!aggressive && (dev->nonAggressiveSkip > 0)) {
++      if (!aggressive && (dev->nonAggressiveSkip > 0))
+               return -1;
+-      }
+ 
+-      if(!prioritised)
++      if (!prioritised)
+               pagesInUse =
+-                      (aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
++                      (aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
+ 
+-      if (aggressive) {
++      if (aggressive)
+               iterations =
+                   dev->internalEndBlock - dev->internalStartBlock + 1;
+-      } else {
++      else {
+               iterations =
+                   dev->internalEndBlock - dev->internalStartBlock + 1;
+               iterations = iterations / 16;
+-              if (iterations > 200) {
++              if (iterations > 200)
+                       iterations = 200;
+-              }
+       }
+ 
+       for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
+               b++;
+-              if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
++              if (b < dev->internalStartBlock || b > dev->internalEndBlock)
+                       b = dev->internalStartBlock;
+-              }
+ 
+               if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
+                       T(YAFFS_TRACE_ERROR,
+@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
+ 
+               bi = yaffs_GetBlockInfo(dev, b);
+ 
+-#if 0
+-              if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
+-                      dirtiest = b;
+-                      pagesInUse = 0;
+-              }
+-              else
+-#endif
+-
+               if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
+-                     (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
+-                      yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
++                      (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
++                              yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
+                       dirtiest = b;
+                       pagesInUse = (bi->pagesInUse - bi->softDeletions);
+               }
+@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
+       if (dirtiest > 0) {
+               T(YAFFS_TRACE_GC,
+                 (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
+-                 dev->nChunksPerBlock - pagesInUse,prioritised));
++                 dev->nChunksPerBlock - pagesInUse, prioritised));
+       }
+ 
+       dev->oldestDirtySequence = 0;
+ 
+-      if (dirtiest > 0) {
++      if (dirtiest > 0)
+               dev->nonAggressiveSkip = 4;
+-      }
+ 
+       return dirtiest;
+ }
+ 
+-static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
++static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
+ {
+       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
+ 
+@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
+       }
+ }
+ 
+-static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
++static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
+ {
+       int i;
+ 
+@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
+                * Can't get space to gc
+                */
+               T(YAFFS_TRACE_ERROR,
+-                (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
++                (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
+ 
+               return -1;
+       }
+@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
+ 
+       T(YAFFS_TRACE_ALWAYS,
+         (TSTR
+-         ("yaffs tragedy: no more eraased blocks, but there should have been %d"
++         ("yaffs tragedy: no more erased blocks, but there should have been %d"
+           TENDSTR), dev->nErasedBlocks));
+ 
+       return -1;
+ }
+ 
+ 
+-// Check if there's space to allocate...
+-// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
+-static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
++
++static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
++{
++      if (!dev->nCheckpointBlocksRequired &&
++         dev->isYaffs2) {
++              /* Not a valid value so recalculate */
++              int nBytes = 0;
++              int nBlocks;
++              int devBlocks = (dev->endBlock - dev->startBlock + 1);
++              int tnodeSize;
++
++              tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
++
++              if (tnodeSize < sizeof(yaffs_Tnode))
++                      tnodeSize = sizeof(yaffs_Tnode);
++
++              nBytes += sizeof(yaffs_CheckpointValidity);
++              nBytes += sizeof(yaffs_CheckpointDevice);
++              nBytes += devBlocks * sizeof(yaffs_BlockInfo);
++              nBytes += devBlocks * dev->chunkBitmapStride;
++              nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
++              nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
++              nBytes += sizeof(yaffs_CheckpointValidity);
++              nBytes += sizeof(__u32); /* checksum*/
++
++              /* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
++
++              nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
++
++              dev->nCheckpointBlocksRequired = nBlocks;
++      }
++
++      return dev->nCheckpointBlocksRequired;
++}
++
++/*
++ * Check if there's space to allocate...
++ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
++ */
++static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
+ {
+       int reservedChunks;
+       int reservedBlocks = dev->nReservedBlocks;
+       int checkpointBlocks;
+ 
+-      checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
+-      if(checkpointBlocks < 0)
++      if (dev->isYaffs2) {
++              checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
++                                  dev->blocksInCheckpoint;
++              if (checkpointBlocks < 0)
++                      checkpointBlocks = 0;
++      } else {
+               checkpointBlocks = 0;
++      }
+ 
+       reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
+ 
+       return (dev->nFreeChunks > reservedChunks);
+ }
+ 
+-static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
++static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
++              yaffs_BlockInfo **blockUsedPtr)
+ {
+       int retVal;
+       yaffs_BlockInfo *bi;
+@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
+       }
+ 
+       if (dev->nErasedBlocks < dev->nReservedBlocks
+-          && dev->allocationPage == 0) {
++                      && dev->allocationPage == 0) {
+               T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
+       }
+ 
+@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
+               bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
+ 
+               retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
+-                  dev->allocationPage;
++                      dev->allocationPage;
+               bi->pagesInUse++;
+               yaffs_SetChunkBit(dev, dev->allocationBlock,
+-                                dev->allocationPage);
++                              dev->allocationPage);
+ 
+               dev->allocationPage++;
+ 
+@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
+                       dev->allocationBlock = -1;
+               }
+ 
+-              if(blockUsedPtr)
++              if (blockUsedPtr)
+                       *blockUsedPtr = bi;
+ 
+               return retVal;
+       }
+ 
+       T(YAFFS_TRACE_ERROR,
+-        (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
++                      (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
+ 
+       return -1;
+ }
+ 
+-static int yaffs_GetErasedChunks(yaffs_Device * dev)
++static int yaffs_GetErasedChunks(yaffs_Device *dev)
+ {
+       int n;
+ 
+       n = dev->nErasedBlocks * dev->nChunksPerBlock;
+ 
+-      if (dev->allocationBlock > 0) {
++      if (dev->allocationBlock > 0)
+               n += (dev->nChunksPerBlock - dev->allocationPage);
+-      }
+ 
+       return n;
+ 
+ }
+ 
+-static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
++static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
++              int wholeBlock)
+ {
+       int oldChunk;
+       int newChunk;
+-      int chunkInBlock;
+       int markNAND;
+       int retVal = YAFFS_OK;
+       int cleanups = 0;
+       int i;
+       int isCheckpointBlock;
+       int matchingChunk;
++      int maxCopies;
+ 
+       int chunksBefore = yaffs_GetErasedChunks(dev);
+       int chunksAfter;
+@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
+       bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
+ 
+       T(YAFFS_TRACE_TRACING,
+-        (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
+-         bi->pagesInUse, bi->hasShrinkHeader));
++                      (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
++                       block,
++                       bi->pagesInUse,
++                       bi->hasShrinkHeader,
++                       wholeBlock));
+ 
+       /*yaffs_VerifyFreeChunks(dev); */
+ 
+@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
+       dev->isDoingGC = 1;
+ 
+       if (isCheckpointBlock ||
+-          !yaffs_StillSomeChunkBits(dev, block)) {
++                      !yaffs_StillSomeChunkBits(dev, block)) {
+               T(YAFFS_TRACE_TRACING,
+-                (TSTR
+-                 ("Collecting block %d that has no chunks in use" TENDSTR),
+-                 block));
++                              (TSTR
++                               ("Collecting block %d that has no chunks in use" TENDSTR),
++                               block));
+               yaffs_BlockBecameDirty(dev, block);
+       } else {
+ 
+               __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
+ 
+-              yaffs_VerifyBlock(dev,bi,block);
++              yaffs_VerifyBlock(dev, bi, block);
+ 
+-              for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
+-                   chunkInBlock < dev->nChunksPerBlock
+-                   && yaffs_StillSomeChunkBits(dev, block);
+-                   chunkInBlock++, oldChunk++) {
+-                      if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
++              maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
++              oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
++
++              for (/* init already done */;
++                   retVal == YAFFS_OK &&
++                   dev->gcChunk < dev->nChunksPerBlock &&
++                   (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
++                   maxCopies > 0;
++                   dev->gcChunk++, oldChunk++) {
++                      if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
+ 
+                               /* This page is in use and might need to be copied off */
+ 
++                              maxCopies--;
++
+                               markNAND = 1;
+ 
+                               yaffs_InitialiseTags(&tags);
+@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
+ 
+                               T(YAFFS_TRACE_GC_DETAIL,
+                                 (TSTR
+-                                 ("Collecting page %d, %d %d %d " TENDSTR),
+-                                 chunkInBlock, tags.objectId, tags.chunkId,
++                                 ("Collecting chunk in block %d, %d %d %d " TENDSTR),
++                                 dev->gcChunk, tags.objectId, tags.chunkId,
+                                  tags.byteCount));
+ 
+-                              if(object && !yaffs_SkipVerification(dev)){
+-                                      if(tags.chunkId == 0)
+-                                              matchingChunk = object->chunkId;
+-                                      else if(object->softDeleted)
++                              if (object && !yaffs_SkipVerification(dev)) {
++                                      if (tags.chunkId == 0)
++                                              matchingChunk = object->hdrChunk;
++                                      else if (object->softDeleted)
+                                               matchingChunk = oldChunk; /* Defeat the test */
+                                       else
+-                                              matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
++                                              matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
+ 
+-                                      if(oldChunk != matchingChunk)
++                                      if (oldChunk != matchingChunk)
+                                               T(YAFFS_TRACE_ERROR,
+                                                 (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
+-                                                oldChunk,matchingChunk,tags.objectId, tags.chunkId));
++                                                oldChunk, matchingChunk, tags.objectId, tags.chunkId));
+ 
+                               }
+ 
+@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
+                                           tags.objectId, tags.chunkId, tags.byteCount));
+                               }
+ 
+-                              if (object && object->deleted
+-                                  && tags.chunkId != 0) {
+-                                      /* Data chunk in a deleted file, throw it away
++                              if (object &&
++                                  object->deleted &&
++                                  object->softDeleted &&
++                                  tags.chunkId != 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.
+@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
+                                               cleanups++;
+                                       }
+                                       markNAND = 0;
+-                              } else if (0
+-                                         /* Todo object && object->deleted && object->nDataChunks == 0 */
+-                                         ) {
++                              } else if (0) {
++                                      /* Todo object && object->deleted && object->nDataChunks == 0 */
+                                       /* Deleted object header with no data chunks.
+                                        * Can be discarded and the file deleted.
+                                        */
+-                                      object->chunkId = 0;
++                                      object->hdrChunk = 0;
+                                       yaffs_FreeTnode(object->myDev,
+                                                       object->variant.
+                                                       fileVariant.top);
+@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
+                                                * We need to nuke the shrinkheader flags first
+                                                * We no longer want the shrinkHeader flag since its work is done
+                                                * and if it is left in place it will mess up scanning.
+-                                               * Also, clear out any shadowing stuff
+                                                */
+ 
+                                               yaffs_ObjectHeader *oh;
+                                               oh = (yaffs_ObjectHeader *)buffer;
+                                               oh->isShrink = 0;
+-                                              oh->shadowsObject = -1;
+-                                              tags.extraShadows = 0;
+                                               tags.extraIsShrinkHeader = 0;
+ 
+-                                              yaffs_VerifyObjectHeader(object,oh,&tags,1);
++                                              yaffs_VerifyObjectHeader(object, oh, &tags, 1);
+                                       }
+ 
+                                       newChunk =
+@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
+ 
+                                               if (tags.chunkId == 0) {
+                                                       /* It's a header */
+-                                                      object->chunkId =  newChunk;
++                                                      object->hdrChunk =  newChunk;
+                                                       object->serial =   tags.serialNumber;
+                                               } else {
+                                                       /* It's a data chunk */
+@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
+                                       }
+                               }
+ 
+-                              yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
++                              if (retVal == YAFFS_OK)
++                                      yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
+ 
+                       }
+               }
+@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
+ 
+       }
+ 
+-      yaffs_VerifyCollectedBlock(dev,bi,block);
++      yaffs_VerifyCollectedBlock(dev, bi, block);
+ 
+-      if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
++      chunksAfter = yaffs_GetErasedChunks(dev);
++      if (chunksBefore >= chunksAfter) {
+               T(YAFFS_TRACE_GC,
+                 (TSTR
+                  ("gc did not increase free chunks before %d after %d"
+                   TENDSTR), chunksBefore, chunksAfter));
+       }
+ 
++      /* If the gc completed then clear the current gcBlock so that we find another. */
++      if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
++              dev->gcBlock = -1;
++              dev->gcChunk = 0;
++      }
++
+       dev->isDoingGC = 0;
+ 
+-      return YAFFS_OK;
++      return retVal;
+ }
+ 
+ /* New garbage collector
+@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
+  * The idea is to help clear out space in a more spread-out manner.
+  * Dunno if it really does anything useful.
+  */
+-static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
++static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
+ {
+       int block;
+       int aggressive;
+@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
+       do {
+               maxTries++;
+ 
+-              checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
+-              if(checkpointBlockAdjust < 0)
++              checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
++              if (checkpointBlockAdjust < 0)
+                       checkpointBlockAdjust = 0;
+ 
+               if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
+@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
+                       aggressive = 0;
+               }
+ 
+-              block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
++              if (dev->gcBlock <= 0) {
++                      dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
++                      dev->gcChunk = 0;
++              }
++
++              block = dev->gcBlock;
+ 
+               if (block > 0) {
+                       dev->garbageCollections++;
+-                      if (!aggressive) {
++                      if (!aggressive)
+                               dev->passiveGarbageCollections++;
+-                      }
+ 
+                       T(YAFFS_TRACE_GC,
+                         (TSTR
+                          ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
+                          dev->nErasedBlocks, aggressive));
+ 
+-                      gcOk = yaffs_GarbageCollectBlock(dev, block);
++                      gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
+               }
+ 
+               if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
+@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
+                          ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
+                           TENDSTR), dev->nErasedBlocks, maxTries, block));
+               }
+-      } while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
+-               && (maxTries < 2));
++      } while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
++               (block > 0) &&
++               (maxTries < 2));
+ 
+       return aggressive ? gcOk : YAFFS_OK;
+ }
+ 
+ /*-------------------------  TAGS --------------------------------*/
+ 
+-static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
++static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
+                          int chunkInObject)
+ {
+       return (tags->chunkId == chunkInObject &&
+@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
+ 
+ /*-------------------- Data file manipulation -----------------*/
+ 
+-static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
+-                               yaffs_ExtendedTags * tags)
++static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
++                               yaffs_ExtendedTags *tags)
+ {
+       /*Get the Tnode, then get the level 0 offset chunk offset */
+       yaffs_Tnode *tn;
+@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
+       tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
+ 
+       if (tn) {
+-              theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
++              theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
+ 
+               retVal =
+                   yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
+@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
+       return retVal;
+ }
+ 
+-static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
+-                                        yaffs_ExtendedTags * tags)
++static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
++                                        yaffs_ExtendedTags *tags)
+ {
+       /* Get the Tnode, then get the level 0 offset chunk offset */
+       yaffs_Tnode *tn;
+@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
+ 
+       if (tn) {
+ 
+-              theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
++              theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
+ 
+               retVal =
+                   yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
+                                          chunkInInode);
+ 
+               /* Delete the entry in the filestructure (if found) */
+-              if (retVal != -1) {
+-                      yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
+-              }
+-      } else {
+-              /*T(("No level 0 found for %d\n", chunkInInode)); */
++              if (retVal != -1)
++                      yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
+       }
+ 
+-      if (retVal == -1) {
+-              /* T(("Could not find %d to delete\n",chunkInInode)); */
+-      }
+       return retVal;
+ }
+ 
+ #ifdef YAFFS_PARANOID
+ 
+-static int yaffs_CheckFileSanity(yaffs_Object * in)
++static int yaffs_CheckFileSanity(yaffs_Object *in)
+ {
+       int chunk;
+       int nChunks;
+@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
+       int theChunk;
+       int chunkDeleted;
+ 
+-      if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
+-              /* T(("Object not a file\n")); */
++      if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
+               return YAFFS_FAIL;
+-      }
+ 
+       objId = in->objectId;
+       fSize = in->variant.fileVariant.fileSize;
+@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
+ 
+               if (tn) {
+ 
+-                      theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
++                      theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
+ 
+                       if (yaffs_CheckChunkBits
+                           (dev, theChunk / dev->nChunksPerBlock,
+@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
+ 
+ #endif
+ 
+-static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
++static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
+                                 int chunkInNAND, int inScan)
+ {
+       /* NB inScan is zero unless scanning.
+@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
+                                       &in->variant.fileVariant,
+                                       chunkInInode,
+                                       NULL);
+-      if (!tn) {
++      if (!tn)
+               return YAFFS_FAIL;
+-      }
+ 
+-      existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
++      existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
+ 
+       if (inScan != 0) {
+               /* If we're scanning then we need to test for duplicates
+@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
+                * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
+                */
+ 
+-              if (existingChunk != 0) {
++              if (existingChunk > 0) {
+                       /* NB Right now existing chunk will not be real chunkId if the device >= 32MB
+                        *    thus we have to do a FindChunkInFile to get the real chunk id.
+                        *
+@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
+                        * not be loaded during a scan
+                        */
+ 
+-                      newSerial = newTags.serialNumber;
+-                      existingSerial = existingTags.serialNumber;
++                      if (inScan > 0) {
++                              newSerial = newTags.serialNumber;
++                              existingSerial = existingTags.serialNumber;
++                      }
+ 
+                       if ((inScan > 0) &&
+                           (in->myDev->isYaffs2 ||
+@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
+ 
+       }
+ 
+-      if (existingChunk == 0) {
++      if (existingChunk == 0)
+               in->nDataChunks++;
+-      }
+ 
+-      yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
++      yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
+ 
+       return YAFFS_OK;
+ }
+ 
+-static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
+-                                       __u8 * buffer)
++static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
++                                      __u8 *buffer)
+ {
+       int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
+ 
+-      if (chunkInNAND >= 0) {
++      if (chunkInNAND >= 0)
+               return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
+-                                                     buffer,NULL);
+-      } else {
++                                              buffer, NULL);
++      else {
+               T(YAFFS_TRACE_NANDACCESS,
+                 (TSTR("Chunk %d not found zero instead" TENDSTR),
+                  chunkInNAND));
+@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
+ 
+ }
+ 
+-void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
++void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
+ {
+       int block;
+       int page;
+@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
+       if (chunkId <= 0)
+               return;
+ 
+-
+       dev->nDeletions++;
+       block = chunkId / dev->nChunksPerBlock;
+       page = chunkId % dev->nChunksPerBlock;
+ 
+ 
+-      if(!yaffs_CheckChunkBit(dev,block,page))
++      if (!yaffs_CheckChunkBit(dev, block, page))
+               T(YAFFS_TRACE_VERIFY,
+-                      (TSTR("Deleting invalid chunk %d"TENDSTR),
+-                       chunkId));
++                      (TSTR("Deleting invalid chunk %d"TENDSTR),
++                       chunkId));
+ 
+       bi = yaffs_GetBlockInfo(dev, block);
+ 
+@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
+                       yaffs_BlockBecameDirty(dev, block);
+               }
+ 
+-      } else {
+-              /* T(("Bad news deleting chunk %d\n",chunkId)); */
+       }
+ 
+ }
+ 
+-static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
+-                                      const __u8 * buffer, int nBytes,
++static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
++                                      const __u8 *buffer, int nBytes,
+                                       int useReserve)
+ {
+       /* Find old chunk Need to do this to get serial number
+@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
+           (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
+       newTags.byteCount = nBytes;
+ 
++      if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
++              T(YAFFS_TRACE_ERROR,
++              (TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
++              YBUG();
++      }
++
+       newChunkId =
+           yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
+                                             useReserve);
+@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
+       if (newChunkId >= 0) {
+               yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
+ 
+-              if (prevChunkId >= 0) {
++              if (prevChunkId >= 0)
+                       yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
+ 
+-              }
+-
+               yaffs_CheckFileSanity(in);
+       }
+       return newChunkId;
+@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
+ /* UpdateObjectHeader updates the header on NAND for an object.
+  * If name is not NULL, then that new name is used.
+  */
+-int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
++int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
+                            int isShrink, int shadows)
+ {
+ 
+@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
+ 
+       yaffs_ObjectHeader *oh = NULL;
+ 
+-      yaffs_strcpy(oldName,"silly old name");
++      yaffs_strcpy(oldName, _Y("silly old name"));
+ 
+-      if (!in->fake || force) {
++
++      if (!in->fake ||
++              in == dev->rootDir || /* The rootDir should also be saved */
++              force) {
+ 
+               yaffs_CheckGarbageCollection(dev);
+               yaffs_CheckObjectDetailsLoaded(in);
+@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
+               buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
+               oh = (yaffs_ObjectHeader *) buffer;
+ 
+-              prevChunkId = in->chunkId;
++              prevChunkId = in->hdrChunk;
+ 
+-              if (prevChunkId >= 0) {
++              if (prevChunkId > 0) {
+                       result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
+                                                       buffer, &oldTags);
+ 
+-                      yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
++                      yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
+ 
+                       memcpy(oldName, oh->name, sizeof(oh->name));
+               }
+@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
+ 
+               oh->type = in->variantType;
+               oh->yst_mode = in->yst_mode;
+-              oh->shadowsObject = shadows;
++              oh->shadowsObject = oh->inbandShadowsObject = shadows;
+ 
+ #ifdef CONFIG_YAFFS_WINCE
+               oh->win_atime[0] = in->win_atime[0];
+@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
+               oh->yst_ctime = in->yst_ctime;
+               oh->yst_rdev = in->yst_rdev;
+ #endif
+-              if (in->parent) {
++              if (in->parent)
+                       oh->parentObjectId = in->parent->objectId;
+-              } else {
++              else
+                       oh->parentObjectId = 0;
+-              }
+ 
+               if (name && *name) {
+                       memset(oh->name, 0, sizeof(oh->name));
+                       yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
+-              } else if (prevChunkId>=0) {
++              } else if (prevChunkId >= 0)
+                       memcpy(oh->name, oldName, sizeof(oh->name));
+-              } else {
++              else
+                       memset(oh->name, 0, sizeof(oh->name));
+-              }
+ 
+               oh->isShrink = isShrink;
+ 
+@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
+               newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
+               newTags.extraObjectType = in->variantType;
+ 
+-              yaffs_VerifyObjectHeader(in,oh,&newTags,1);
++              yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
+ 
+               /* Create new chunk in NAND */
+               newChunkId =
+@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
+ 
+               if (newChunkId >= 0) {
+ 
+-                      in->chunkId = newChunkId;
++                      in->hdrChunk = newChunkId;
+ 
+                       if (prevChunkId >= 0) {
+                               yaffs_DeleteChunk(dev, prevChunkId, 1,
+                                                 __LINE__);
+                       }
+ 
+-                      if(!yaffs_ObjectHasCachedWriteData(in))
++                      if (!yaffs_ObjectHasCachedWriteData(in))
+                               in->dirty = 0;
+ 
+                       /* If this was a shrink, then mark the block that the chunk lives on */
+                       if (isShrink) {
+                               bi = yaffs_GetBlockInfo(in->myDev,
+-                                                      newChunkId /in->myDev-> nChunksPerBlock);
++                                      newChunkId / in->myDev->nChunksPerBlock);
+                               bi->hasShrinkHeader = 1;
+                       }
+ 
+@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
+       yaffs_ChunkCache *cache;
+       int nCaches = obj->myDev->nShortOpCaches;
+ 
+-      for(i = 0; i < nCaches; i++){
++      for (i = 0; i < nCaches; i++) {
+               cache = &dev->srCache[i];
+               if (cache->object == obj &&
+                   cache->dirty)
+@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
+ }
+ 
+ 
+-static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
++static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
+ {
+       yaffs_Device *dev = obj->myDev;
+       int lowest = -99;       /* Stop compiler whining. */
+@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
+        */
+       do {
+               obj = NULL;
+-              for( i = 0; i < nCaches && !obj; i++) {
++              for (i = 0; i < nCaches && !obj; i++) {
+                       if (dev->srCache[i].object &&
+                           dev->srCache[i].dirty)
+                               obj = dev->srCache[i].object;
+ 
+               }
+-              if(obj)
++              if (obj)
+                       yaffs_FlushFilesChunkCache(obj);
+ 
+-      } while(obj);
++      } while (obj);
+ 
+ }
+ 
+@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
+  * Then look for the least recently used non-dirty one.
+  * Then look for the least recently used dirty one...., flush and look again.
+  */
+-static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
++static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
+ {
+       int i;
+-      int usage;
+-      int theOne;
+ 
+       if (dev->nShortOpCaches > 0) {
+               for (i = 0; i < dev->nShortOpCaches; i++) {
+                       if (!dev->srCache[i].object)
+                               return &dev->srCache[i];
+               }
++      }
+ 
+-              return NULL;
++      return NULL;
++}
+ 
+-              theOne = -1;
+-              usage = 0;      /* just to stop the compiler grizzling */
+-
+-              for (i = 0; i < dev->nShortOpCaches; i++) {
+-                      if (!dev->srCache[i].dirty &&
+-                          ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
+-                           theOne < 0)) {
+-                              usage = dev->srCache[i].lastUse;
+-                              theOne = i;
+-                      }
+-              }
+-
+-
+-              return theOne >= 0 ? &dev->srCache[theOne] : NULL;
+-      } else {
+-              return NULL;
+-      }
+-
+-}
+-
+-static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
++static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
+ {
+       yaffs_ChunkCache *cache;
+       yaffs_Object *theObj;
+@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
+                       for (i = 0; i < dev->nShortOpCaches; i++) {
+                               if (dev->srCache[i].object &&
+                                   !dev->srCache[i].locked &&
+-                                  (dev->srCache[i].lastUse < usage || !cache))
+-                              {
++                                  (dev->srCache[i].lastUse < usage || !cache)) {
+                                       usage = dev->srCache[i].lastUse;
+                                       theObj = dev->srCache[i].object;
+                                       cache = &dev->srCache[i];
+@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
+ }
+ 
+ /* Find a cached chunk */
+-static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
++static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
+                                             int chunkId)
+ {
+       yaffs_Device *dev = obj->myDev;
+@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
+ }
+ 
+ /* Mark the chunk for the least recently used algorithym */
+-static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
++static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
+                               int isAWrite)
+ {
+ 
+@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
+               if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
+                       /* Reset the cache usages */
+                       int i;
+-                      for (i = 1; i < dev->nShortOpCaches; i++) {
++                      for (i = 1; i < dev->nShortOpCaches; i++)
+                               dev->srCache[i].lastUse = 0;
+-                      }
++
+                       dev->srLastUse = 0;
+               }
+ 
+@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
+ 
+               cache->lastUse = dev->srLastUse;
+ 
+-              if (isAWrite) {
++              if (isAWrite)
+                       cache->dirty = 1;
+-              }
+       }
+ }
+ 
+@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
+  * Do this when a whole page gets written,
+  * ie the short cache for this page is no longer valid.
+  */
+-static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
++static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
+ {
+       if (object->myDev->nShortOpCaches > 0) {
+               yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
+ 
+-              if (cache) {
++              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_InvalidateWholeChunkCache(yaffs_Object * in)
++static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
+ {
+       int i;
+       yaffs_Device *dev = in->myDev;
+@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
+       if (dev->nShortOpCaches > 0) {
+               /* Invalidate it. */
+               for (i = 0; i < dev->nShortOpCaches; i++) {
+-                      if (dev->srCache[i].object == in) {
++                      if (dev->srCache[i].object == in)
+                               dev->srCache[i].object = NULL;
+-                      }
+               }
+       }
+ }
+@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
+ /*--------------------- Checkpointing --------------------*/
+ 
+ 
+-static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
++static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
+ {
+       yaffs_CheckpointValidity cp;
+ 
+-      memset(&cp,0,sizeof(cp));
++      memset(&cp, 0, sizeof(cp));
+ 
+       cp.structType = sizeof(cp);
+       cp.magic = YAFFS_MAGIC;
+       cp.version = YAFFS_CHECKPOINT_VERSION;
+       cp.head = (head) ? 1 : 0;
+ 
+-      return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
++      return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
+               1 : 0;
+ }
+ 
+@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
+       yaffs_CheckpointValidity cp;
+       int ok;
+ 
+-      ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
++      ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
+ 
+-      if(ok)
++      if (ok)
+               ok = (cp.structType == sizeof(cp)) &&
+                    (cp.magic == YAFFS_MAGIC) &&
+                    (cp.version == YAFFS_CHECKPOINT_VERSION) &&
+@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
+       int ok;
+ 
+       /* Write device runtime values*/
+-      yaffs_DeviceToCheckpointDevice(&cp,dev);
++      yaffs_DeviceToCheckpointDevice(&cp, dev);
+       cp.structType = sizeof(cp);
+ 
+-      ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
++      ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
+ 
+       /* Write block info */
+-      if(ok) {
++      if (ok) {
+               nBytes = nBlocks * sizeof(yaffs_BlockInfo);
+-              ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
++              ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
+       }
+ 
+       /* Write chunk bits */
+-      if(ok) {
++      if (ok) {
+               nBytes = nBlocks * dev->chunkBitmapStride;
+-              ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
++              ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
+       }
+       return   ok ? 1 : 0;
+ 
+@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
+ 
+       int ok;
+ 
+-      ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
+-      if(!ok)
++      ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
++      if (!ok)
+               return 0;
+ 
+-      if(cp.structType != sizeof(cp))
++      if (cp.structType != sizeof(cp))
+               return 0;
+ 
+ 
+-      yaffs_CheckpointDeviceToDevice(dev,&cp);
++      yaffs_CheckpointDeviceToDevice(dev, &cp);
+ 
+       nBytes = nBlocks * sizeof(yaffs_BlockInfo);
+ 
+-      ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
++      ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
+ 
+-      if(!ok)
++      if (!ok)
+               return 0;
+       nBytes = nBlocks * dev->chunkBitmapStride;
+ 
+-      ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
++      ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
+ 
+       return ok ? 1 : 0;
+ }
+@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
+ 
+       cp->objectId = obj->objectId;
+       cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
+-      cp->chunkId = obj->chunkId;
++      cp->hdrChunk = obj->hdrChunk;
+       cp->variantType = obj->variantType;
+       cp->deleted = obj->deleted;
+       cp->softDeleted = obj->softDeleted;
+@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
+       cp->serial = obj->serial;
+       cp->nDataChunks = obj->nDataChunks;
+ 
+-      if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
++      if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+               cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
+-      else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
++      else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
+               cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
+ }
+ 
+-static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
++static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
+ {
+ 
+       yaffs_Object *parent;
+ 
++      if (obj->variantType != cp->variantType) {
++              T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
++                      TCONT("chunk %d does not match existing object type %d")
++                      TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
++                      obj->variantType));
++              return 0;
++      }
++
+       obj->objectId = cp->objectId;
+ 
+-      if(cp->parentId)
++      if (cp->parentId)
+               parent = yaffs_FindOrCreateObjectByNumber(
+                                       obj->myDev,
+                                       cp->parentId,
+@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
+       else
+               parent = NULL;
+ 
+-      if(parent)
++      if (parent) {
++              if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
++                      T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
++                              TCONT(" chunk %d Parent type, %d, not directory")
++                              TENDSTR),
++                              cp->objectId, cp->parentId, cp->variantType,
++                              cp->hdrChunk, parent->variantType));
++                      return 0;
++              }
+               yaffs_AddObjectToDirectory(parent, obj);
++      }
+ 
+-      obj->chunkId = cp->chunkId;
++      obj->hdrChunk = cp->hdrChunk;
+       obj->variantType = cp->variantType;
+       obj->deleted = cp->deleted;
+       obj->softDeleted = cp->softDeleted;
+@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
+       obj->serial = cp->serial;
+       obj->nDataChunks = cp->nDataChunks;
+ 
+-      if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
++      if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+               obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
+-      else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
++      else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
+               obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
+ 
+-      if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
++      if (obj->hdrChunk > 0)
+               obj->lazyLoaded = 1;
++      return 1;
+ }
+ 
+ 
+ 
+-static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
+-                                      __u32 level, int chunkOffset)
++static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
++                                      __u32 level, int chunkOffset)
+ {
+       int i;
+       yaffs_Device *dev = in->myDev;
+       int ok = 1;
+-      int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
++      int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
++
++      if (tnodeSize < sizeof(yaffs_Tnode))
++              tnodeSize = sizeof(yaffs_Tnode);
++
+ 
+       if (tn) {
+               if (level > 0) {
+ 
+-                      for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
++                      for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
+                               if (tn->internal[i]) {
+                                       ok = yaffs_CheckpointTnodeWorker(in,
+                                                       tn->internal[i],
+@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
+                       }
+               } else if (level == 0) {
+                       __u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
+-                      /* printf("write tnode at %d\n",baseOffset); */
+-                      ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
+-                      if(ok)
+-                              ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
++                      ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
++                      if (ok)
++                              ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
+               }
+       }
+ 
+@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
+       __u32 endMarker = ~0;
+       int ok = 1;
+ 
+-      if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
++      if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
+               ok = yaffs_CheckpointTnodeWorker(obj,
+                                           obj->variant.fileVariant.top,
+                                           obj->variant.fileVariant.topLevel,
+                                           0);
+-              if(ok)
+-                      ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
++              if (ok)
++                      ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
+                               sizeof(endMarker));
+       }
+ 
+@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
+       yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
+       yaffs_Tnode *tn;
+       int nread = 0;
++      int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
+ 
+-      ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
++      if (tnodeSize < sizeof(yaffs_Tnode))
++              tnodeSize = sizeof(yaffs_Tnode);
+ 
+-      while(ok && (~baseChunk)){
++      ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
++
++      while (ok && (~baseChunk)) {
+               nread++;
+               /* Read level 0 tnode */
+ 
+ 
+-              /* printf("read  tnode at %d\n",baseChunk); */
+               tn = yaffs_GetTnodeRaw(dev);
+-              if(tn)
+-                      ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
+-                            (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
++              if (tn)
++                      ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
+               else
+                       ok = 0;
+ 
+-              if(tn && ok){
++              if (tn && ok)
+                       ok = yaffs_AddOrFindLevel0Tnode(dev,
+-                                                      fileStructPtr,
+-                                                      baseChunk,
+-                                                      tn) ? 1 : 0;
++                                                      fileStructPtr,
++                                                      baseChunk,
++                                                      tn) ? 1 : 0;
+ 
+-              }
+-
+-              if(ok)
+-                      ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
++              if (ok)
++                      ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
+ 
+       }
+ 
+-      T(YAFFS_TRACE_CHECKPOINT,(
++      T(YAFFS_TRACE_CHECKPOINT, (
+               TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
+-              nread,baseChunk,ok));
++              nread, baseChunk, ok));
+ 
+       return ok ? 1 : 0;
+ }
+@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
+       yaffs_CheckpointObject cp;
+       int i;
+       int ok = 1;
+-      struct list_head *lh;
++      struct ylist_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->objectBucket[i].list) {
++      for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
++              ylist_for_each(lh, &dev->objectBucket[i].list) {
+                       if (lh) {
+-                              obj = list_entry(lh, yaffs_Object, hashLink);
++                              obj = ylist_entry(lh, yaffs_Object, hashLink);
+                               if (!obj->deferedFree) {
+-                                      yaffs_ObjectToCheckpointObject(&cp,obj);
++                                      yaffs_ObjectToCheckpointObject(&cp, obj);
+                                       cp.structType = sizeof(cp);
+ 
+-                                      T(YAFFS_TRACE_CHECKPOINT,(
++                                      T(YAFFS_TRACE_CHECKPOINT, (
+                                               TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
+-                                              cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
++                                              cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
+ 
+-                                      ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
++                                      ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
+ 
+-                                      if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
++                                      if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+                                               ok = yaffs_WriteCheckpointTnodes(obj);
+-                                      }
+                               }
+                       }
+               }
+-       }
++      }
+ 
+-       /* Dump end of list */
+-      memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
++      /* Dump end of list */
++      memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
+       cp.structType = sizeof(cp);
+ 
+-      if(ok)
+-              ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
++      if (ok)
++              ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
+ 
+       return ok ? 1 : 0;
+ }
+@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
+       int done = 0;
+       yaffs_Object *hardList = NULL;
+ 
+-      while(ok && !done) {
+-              ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
+-              if(cp.structType != sizeof(cp)) {
+-                      T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
+-                              cp.structType,sizeof(cp),ok));
++      while (ok && !done) {
++              ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
++              if (cp.structType != sizeof(cp)) {
++                      T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
++                              cp.structType, sizeof(cp), ok));
+                       ok = 0;
+               }
+ 
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
+-                      cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
++                      cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
+ 
+-              if(ok && cp.objectId == ~0)
++              if (ok && cp.objectId == ~0)
+                       done = 1;
+-              else if(ok){
+-                      obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
+-                      if(obj) {
+-                              yaffs_CheckpointObjectToObject(obj,&cp);
+-                              if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
++              else if (ok) {
++                      obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
++                      if (obj) {
++                              ok = yaffs_CheckpointObjectToObject(obj, &cp);
++                              if (!ok)
++                                      break;
++                              if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
+                                       ok = yaffs_ReadCheckpointTnodes(obj);
+-                              } else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
++                              } else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
+                                       obj->hardLinks.next =
+-                                                  (struct list_head *)
+-                                                  hardList;
++                                              (struct ylist_head *) hardList;
+                                       hardList = obj;
+                               }
+-
+-                      }
++                      } else
++                              ok = 0;
+               }
+       }
+ 
+-      if(ok)
+-              yaffs_HardlinkFixup(dev,hardList);
++      if (ok)
++              yaffs_HardlinkFixup(dev, hardList);
+ 
+       return ok ? 1 : 0;
+ }
+@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
+       __u32 checkpointSum;
+       int ok;
+ 
+-      yaffs_GetCheckpointSum(dev,&checkpointSum);
++      yaffs_GetCheckpointSum(dev, &checkpointSum);
+ 
+-      ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
++      ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
+ 
+-      if(!ok)
++      if (!ok)
+               return 0;
+ 
+       return 1;
+@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
+       __u32 checkpointSum1;
+       int ok;
+ 
+-      yaffs_GetCheckpointSum(dev,&checkpointSum0);
++      yaffs_GetCheckpointSum(dev, &checkpointSum0);
+ 
+-      ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
++      ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
+ 
+-      if(!ok)
++      if (!ok)
+               return 0;
+ 
+-      if(checkpointSum0 != checkpointSum1)
++      if (checkpointSum0 != checkpointSum1)
+               return 0;
+ 
+       return 1;
+@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
+ 
+ static int yaffs_WriteCheckpointData(yaffs_Device *dev)
+ {
+-
+       int ok = 1;
+ 
+-      if(dev->skipCheckpointWrite || !dev->isYaffs2){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
++      if (dev->skipCheckpointWrite || !dev->isYaffs2) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
+               ok = 0;
+       }
+ 
+-      if(ok)
+-              ok = yaffs_CheckpointOpen(dev,1);
++      if (ok)
++              ok = yaffs_CheckpointOpen(dev, 1);
+ 
+-      if(ok){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
+-              ok = yaffs_WriteCheckpointValidityMarker(dev,1);
++      if (ok) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
++              ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
+       }
+-      if(ok){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
++      if (ok) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
+               ok = yaffs_WriteCheckpointDevice(dev);
+       }
+-      if(ok){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
++      if (ok) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
+               ok = yaffs_WriteCheckpointObjects(dev);
+       }
+-      if(ok){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
+-              ok = yaffs_WriteCheckpointValidityMarker(dev,0);
++      if (ok) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
++              ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
+       }
+ 
+-      if(ok){
++      if (ok)
+               ok = yaffs_WriteCheckpointSum(dev);
+-      }
+-
+ 
+-      if(!yaffs_CheckpointClose(dev))
+-               ok = 0;
++      if (!yaffs_CheckpointClose(dev))
++              ok = 0;
+ 
+-      if(ok)
+-              dev->isCheckpointed = 1;
+-       else
+-              dev->isCheckpointed = 0;
++      if (ok)
++              dev->isCheckpointed = 1;
++      else
++              dev->isCheckpointed = 0;
+ 
+       return dev->isCheckpointed;
+ }
+@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
+ {
+       int ok = 1;
+ 
+-      if(dev->skipCheckpointRead || !dev->isYaffs2){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
++      if (dev->skipCheckpointRead || !dev->isYaffs2) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
+               ok = 0;
+       }
+ 
+-      if(ok)
+-              ok = yaffs_CheckpointOpen(dev,0); /* open for read */
++      if (ok)
++              ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
+ 
+-      if(ok){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
+-              ok = yaffs_ReadCheckpointValidityMarker(dev,1);
++      if (ok) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
++              ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
+       }
+-      if(ok){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
++      if (ok) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
+               ok = yaffs_ReadCheckpointDevice(dev);
+       }
+-      if(ok){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
++      if (ok) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
+               ok = yaffs_ReadCheckpointObjects(dev);
+       }
+-      if(ok){
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
+-              ok = yaffs_ReadCheckpointValidityMarker(dev,0);
++      if (ok) {
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
++              ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
+       }
+ 
+-      if(ok){
++      if (ok) {
+               ok = yaffs_ReadCheckpointSum(dev);
+-              T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
++              T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
+       }
+ 
+-      if(!yaffs_CheckpointClose(dev))
++      if (!yaffs_CheckpointClose(dev))
+               ok = 0;
+ 
+-      if(ok)
+-              dev->isCheckpointed = 1;
+-       else
+-              dev->isCheckpointed = 0;
++      if (ok)
++              dev->isCheckpointed = 1;
++      else
++              dev->isCheckpointed = 0;
+ 
+       return ok ? 1 : 0;
+ 
+@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
+ 
+ static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
+ {
+-      if(dev->isCheckpointed ||
+-         dev->blocksInCheckpoint > 0){
++      if (dev->isCheckpointed ||
++                      dev->blocksInCheckpoint > 0) {
+               dev->isCheckpointed = 0;
+               yaffs_CheckpointInvalidateStream(dev);
+-              if(dev->superBlock && dev->markSuperBlockDirty)
++              if (dev->superBlock && dev->markSuperBlockDirty)
+                       dev->markSuperBlockDirty(dev->superBlock);
+       }
+ }
+@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
+ int yaffs_CheckpointSave(yaffs_Device *dev)
+ {
+ 
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
+ 
+       yaffs_VerifyObjects(dev);
+       yaffs_VerifyBlocks(dev);
+       yaffs_VerifyFreeChunks(dev);
+ 
+-      if(!dev->isCheckpointed) {
++      if (!dev->isCheckpointed) {
+               yaffs_InvalidateCheckpoint(dev);
+               yaffs_WriteCheckpointData(dev);
+       }
+ 
+-      T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
++      T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
+ 
+       return dev->isCheckpointed;
+ }
+@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
+ int yaffs_CheckpointRestore(yaffs_Device *dev)
+ {
+       int retval;
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
+ 
+       retval = yaffs_ReadCheckpointData(dev);
+ 
+-      if(dev->isCheckpointed){
++      if (dev->isCheckpointed) {
+               yaffs_VerifyObjects(dev);
+               yaffs_VerifyBlocks(dev);
+               yaffs_VerifyFreeChunks(dev);
+       }
+ 
+-      T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
++      T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
+ 
+       return retval;
+ }
+@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
+  * Curve-balls: the first chunk might also be the last chunk.
+  */
+ 
+-int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
+-                         int nBytes)
++int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
++                      int nBytes)
+ {
+ 
+       int chunk;
+-      int start;
++      __u32 start;
+       int nToCopy;
+       int n = nBytes;
+       int nDone = 0;
+@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
+       dev = in->myDev;
+ 
+       while (n > 0) {
+-              //chunk = offset / dev->nDataBytesPerChunk + 1;
+-              //start = offset % dev->nDataBytesPerChunk;
+-              yaffs_AddrToChunk(dev,offset,&chunk,&start);
++              /* chunk = offset / dev->nDataBytesPerChunk + 1; */
++              /* start = offset % dev->nDataBytesPerChunk; */
++              yaffs_AddrToChunk(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->nDataBytesPerChunk) {
++              if ((start + n) < dev->nDataBytesPerChunk)
+                       nToCopy = n;
+-              } else {
++              else
+                       nToCopy = dev->nDataBytesPerChunk - start;
+-              }
+ 
+               cache = yaffs_FindChunkCache(in, chunk);
+ 
+               /* If the chunk is already in the cache or it is less than a whole chunk
+-               * then use the cache (if there is caching)
++               * or we're using inband tags then use the cache (if there is caching)
+                * else bypass the cache.
+                */
+-              if (cache || nToCopy != dev->nDataBytesPerChunk) {
++              if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
+                       if (dev->nShortOpCaches > 0) {
+ 
+                               /* If we can't find the data in the cache, then load it up. */
+@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
+ 
+                               cache->locked = 1;
+ 
+-#ifdef CONFIG_YAFFS_WINCE
+-                              yfsd_UnlockYAFFS(TRUE);
+-#endif
++
+                               memcpy(buffer, &cache->data[start], nToCopy);
+ 
+-#ifdef CONFIG_YAFFS_WINCE
+-                              yfsd_LockYAFFS(TRUE);
+-#endif
+                               cache->locked = 0;
+                       } else {
+                               /* Read into the local buffer then copy..*/
+@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
+                                   yaffs_GetTempBuffer(dev, __LINE__);
+                               yaffs_ReadChunkDataFromObject(in, chunk,
+                                                             localBuffer);
+-#ifdef CONFIG_YAFFS_WINCE
+-                              yfsd_UnlockYAFFS(TRUE);
+-#endif
++
+                               memcpy(buffer, &localBuffer[start], nToCopy);
+ 
+-#ifdef CONFIG_YAFFS_WINCE
+-                              yfsd_LockYAFFS(TRUE);
+-#endif
++
+                               yaffs_ReleaseTempBuffer(dev, localBuffer,
+                                                       __LINE__);
+                       }
+ 
+               } else {
+-#ifdef CONFIG_YAFFS_WINCE
+-                      __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
+-
+-                      /* Under WinCE can't do direct transfer. Need to use a local buffer.
+-                       * This is because we otherwise screw up WinCE's memory mapper
+-                       */
+-                      yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
+-
+-#ifdef CONFIG_YAFFS_WINCE
+-                      yfsd_UnlockYAFFS(TRUE);
+-#endif
+-                      memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
+ 
+-#ifdef CONFIG_YAFFS_WINCE
+-                      yfsd_LockYAFFS(TRUE);
+-                      yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
+-#endif
+-
+-#else
+                       /* A full chunk. Read directly into the supplied buffer. */
+                       yaffs_ReadChunkDataFromObject(in, chunk, buffer);
+-#endif
++
+               }
+ 
+               n -= nToCopy;
+@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
+       return nDone;
+ }
+ 
+-int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
+-                        int nBytes, int writeThrough)
++int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
++                      int nBytes, int writeThrough)
+ {
+ 
+       int chunk;
+-      int start;
++      __u32 start;
+       int nToCopy;
+       int n = nBytes;
+       int nDone = 0;
+       int nToWriteBack;
+       int startOfWrite = offset;
+       int chunkWritten = 0;
+-      int nBytesRead;
++      __u32 nBytesRead;
++      __u32 chunkStart;
+ 
+       yaffs_Device *dev;
+ 
+       dev = in->myDev;
+ 
+       while (n > 0 && chunkWritten >= 0) {
+-              //chunk = offset / dev->nDataBytesPerChunk + 1;
+-              //start = offset % dev->nDataBytesPerChunk;
+-              yaffs_AddrToChunk(dev,offset,&chunk,&start);
++              /* chunk = offset / dev->nDataBytesPerChunk + 1; */
++              /* start = offset % dev->nDataBytesPerChunk; */
++              yaffs_AddrToChunk(dev, offset, &chunk, &start);
++
++              if (chunk * dev->nDataBytesPerChunk + start != offset ||
++                              start >= dev->nDataBytesPerChunk) {
++                      T(YAFFS_TRACE_ERROR, (
++                         TSTR("AddrToChunk of offset %d gives chunk %d start %d"
++                         TENDSTR),
++                         (int)offset, chunk, start));
++              }
+               chunk++;
+ 
+               /* OK now check for the curveball where the start and end are in
+@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
+                        * we need to write back as much as was there before.
+                        */
+ 
+-                      nBytesRead =
+-                          in->variant.fileVariant.fileSize -
+-                          ((chunk - 1) * dev->nDataBytesPerChunk);
++                      chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
++
++                      if (chunkStart > in->variant.fileVariant.fileSize)
++                              nBytesRead = 0; /* Past end of file */
++                      else
++                              nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
+ 
+-                      if (nBytesRead > dev->nDataBytesPerChunk) {
++                      if (nBytesRead > dev->nDataBytesPerChunk)
+                               nBytesRead = dev->nDataBytesPerChunk;
+-                      }
+ 
+                       nToWriteBack =
+                           (nBytesRead >
+                            (start + n)) ? nBytesRead : (start + n);
+ 
++                      if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
++                              YBUG();
++
+               } else {
+                       nToCopy = dev->nDataBytesPerChunk - start;
+                       nToWriteBack = dev->nDataBytesPerChunk;
+               }
+ 
+-              if (nToCopy != dev->nDataBytesPerChunk) {
+-                      /* An incomplete start or end chunk (or maybe both start and end chunk) */
++              if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
++                      /* An incomplete start or end chunk (or maybe both start and end chunk),
++                       * or we're using inband tags, so we want to use the cache buffers.
++                       */
+                       if (dev->nShortOpCaches > 0) {
+                               yaffs_ChunkCache *cache;
+                               /* If we can't find the data in the cache, then load the cache */
+@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
+                                       yaffs_ReadChunkDataFromObject(in, chunk,
+                                                                     cache->
+                                                                     data);
+-                              }
+-                              else if(cache &&
+-                                      !cache->dirty &&
+-                                      !yaffs_CheckSpaceForAllocation(in->myDev)){
++                              } else if (cache &&
++                                      !cache->dirty &&
++                                      !yaffs_CheckSpaceForAllocation(in->myDev)) {
+                                       /* Drop the cache if it was a read cache item and
+                                        * no space check has been made for it.
+                                        */
+@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
+                               if (cache) {
+                                       yaffs_UseChunkCache(dev, cache, 1);
+                                       cache->locked = 1;
+-#ifdef CONFIG_YAFFS_WINCE
+-                                      yfsd_UnlockYAFFS(TRUE);
+-#endif
++
+ 
+                                       memcpy(&cache->data[start], buffer,
+                                              nToCopy);
+ 
+-#ifdef CONFIG_YAFFS_WINCE
+-                                      yfsd_LockYAFFS(TRUE);
+-#endif
++
+                                       cache->locked = 0;
+                                       cache->nBytes = nToWriteBack;
+ 
+@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
+                               yaffs_ReadChunkDataFromObject(in, chunk,
+                                                             localBuffer);
+ 
+-#ifdef CONFIG_YAFFS_WINCE
+-                              yfsd_UnlockYAFFS(TRUE);
+-#endif
++
+ 
+                               memcpy(&localBuffer[start], buffer, nToCopy);
+ 
+-#ifdef CONFIG_YAFFS_WINCE
+-                              yfsd_LockYAFFS(TRUE);
+-#endif
+                               chunkWritten =
+                                   yaffs_WriteChunkDataToObject(in, chunk,
+                                                                localBuffer,
+@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
+                       }
+ 
+               } else {
+-
+-#ifdef CONFIG_YAFFS_WINCE
+-                      /* Under WinCE can't do direct transfer. Need to use a local buffer.
+-                       * This is because we otherwise screw up WinCE's memory mapper
+-                       */
+-                      __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
+-#ifdef CONFIG_YAFFS_WINCE
+-                      yfsd_UnlockYAFFS(TRUE);
+-#endif
+-                      memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
+-#ifdef CONFIG_YAFFS_WINCE
+-                      yfsd_LockYAFFS(TRUE);
+-#endif
+-                      chunkWritten =
+-                          yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
+-                                                       dev->nDataBytesPerChunk,
+-                                                       0);
+-                      yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
+-#else
+                       /* A full chunk. Write directly from the supplied buffer. */
++
++
++
+                       chunkWritten =
+                           yaffs_WriteChunkDataToObject(in, chunk, buffer,
+                                                        dev->nDataBytesPerChunk,
+                                                        0);
+-#endif
++
+                       /* Since we've overwritten the cached data, we better invalidate it. */
+                       yaffs_InvalidateChunkCache(in, chunk);
+               }
+@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
+ 
+       /* Update file object */
+ 
+-      if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
++      if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
+               in->variant.fileVariant.fileSize = (startOfWrite + nDone);
+-      }
+ 
+       in->dirty = 1;
+ 
+@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
+ 
+ /* ---------------------- File resizing stuff ------------------ */
+ 
+-static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
++static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
+ {
+ 
+       yaffs_Device *dev = in->myDev;
+@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
+ 
+ }
+ 
+-int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
++int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
+ {
+ 
+       int oldFileSize = in->variant.fileVariant.fileSize;
+-      int newSizeOfPartialChunk;
++      __u32 newSizeOfPartialChunk;
+       int newFullChunks;
+ 
+       yaffs_Device *dev = in->myDev;
+@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
+ 
+       yaffs_CheckGarbageCollection(dev);
+ 
+-      if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
+-              return yaffs_GetFileSize(in);
+-      }
++      if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
++              return YAFFS_FAIL;
+ 
+-      if (newSize == oldFileSize) {
+-              return oldFileSize;
+-      }
++      if (newSize == oldFileSize)
++              return YAFFS_OK;
+ 
+       if (newSize < oldFileSize) {
+ 
+@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
+       }
+ 
+ 
+-
+       /* Write a new object header.
+        * show we've shrunk the file, if need be
+        * Do this only if the file is not in the deleted directories.
+        */
+-      if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
+-          in->parent->objectId != YAFFS_OBJECTID_DELETED) {
++      if (in->parent &&
++          in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
++          in->parent->objectId != YAFFS_OBJECTID_DELETED)
+               yaffs_UpdateObjectHeader(in, NULL, 0,
+                                        (newSize < oldFileSize) ? 1 : 0, 0);
+-      }
+ 
+-      return newSize;
++      return YAFFS_OK;
+ }
+ 
+-loff_t yaffs_GetFileSize(yaffs_Object * obj)
++loff_t yaffs_GetFileSize(yaffs_Object *obj)
+ {
+       obj = yaffs_GetEquivalentObject(obj);
+ 
+@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
+ 
+ 
+ 
+-int yaffs_FlushFile(yaffs_Object * in, int updateTime)
++int yaffs_FlushFile(yaffs_Object *in, int updateTime)
+ {
+       int retVal;
+       if (in->dirty) {
+@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
+ #endif
+               }
+ 
+-              retVal =
+-                  (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
+-                   0) ? YAFFS_OK : YAFFS_FAIL;
++              retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
++                      0) ? YAFFS_OK : YAFFS_FAIL;
+       } else {
+               retVal = YAFFS_OK;
+       }
+@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
+ 
+ }
+ 
+-static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
++static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
+ {
+ 
+       /* First off, invalidate the file's data in the cache, without flushing. */
+@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
+ 
+       if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
+               /* Move to the unlinked directory so we have a record that it was deleted. */
+-              yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
++              yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
+ 
+       }
+ 
+       yaffs_RemoveObjectFromDirectory(in);
+-      yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
+-      in->chunkId = -1;
++      yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
++      in->hdrChunk = 0;
+ 
+       yaffs_FreeObject(in);
+       return YAFFS_OK;
+@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
+  * and the inode associated with the file.
+  * It does not delete the links associated with the file.
+  */
+-static int yaffs_UnlinkFile(yaffs_Object * in)
++static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
+ {
+ 
+       int retVal;
+       int immediateDeletion = 0;
+ 
+-      if (1) {
+ #ifdef __KERNEL__
+-              if (!in->myInode) {
+-                      immediateDeletion = 1;
+-
+-              }
++      if (!in->myInode)
++              immediateDeletion = 1;
+ #else
+-              if (in->inUse <= 0) {
+-                      immediateDeletion = 1;
+-
+-              }
++      if (in->inUse <= 0)
++              immediateDeletion = 1;
+ #endif
+-              if (immediateDeletion) {
+-                      retVal =
+-                          yaffs_ChangeObjectName(in, in->myDev->deletedDir,
+-                                                 "deleted", 0, 0);
+-                      T(YAFFS_TRACE_TRACING,
+-                        (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
+-                         in->objectId));
+-                      in->deleted = 1;
+-                      in->myDev->nDeletedFiles++;
+-                      if (0 && in->myDev->isYaffs2) {
+-                              yaffs_ResizeFile(in, 0);
+-                      }
+-                      yaffs_SoftDeleteFile(in);
+-              } else {
+-                      retVal =
+-                          yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
+-                                                 "unlinked", 0, 0);
+-              }
+ 
++      if (immediateDeletion) {
++              retVal =
++                  yaffs_ChangeObjectName(in, in->myDev->deletedDir,
++                                         _Y("deleted"), 0, 0);
++              T(YAFFS_TRACE_TRACING,
++                (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
++                 in->objectId));
++              in->deleted = 1;
++              in->myDev->nDeletedFiles++;
++              if (1 || in->myDev->isYaffs2)
++                      yaffs_ResizeFile(in, 0);
++              yaffs_SoftDeleteFile(in);
++      } else {
++              retVal =
++                  yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
++                                         _Y("unlinked"), 0, 0);
+       }
++
++
+       return retVal;
+ }
+ 
+-int yaffs_DeleteFile(yaffs_Object * in)
++int yaffs_DeleteFile(yaffs_Object *in)
+ {
+       int retVal = YAFFS_OK;
++      int deleted = in->deleted;
++
++      yaffs_ResizeFile(in, 0);
+ 
+       if (in->nDataChunks > 0) {
+-              /* Use soft deletion if there is data in the file */
+-              if (!in->unlinked) {
+-                      retVal = yaffs_UnlinkFile(in);
+-              }
++              /* 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)
++                      retVal = yaffs_UnlinkFileIfNeeded(in);
++
+               if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
+                       in->deleted = 1;
++                      deleted = 1;
+                       in->myDev->nDeletedFiles++;
+                       yaffs_SoftDeleteFile(in);
+               }
+-              return in->deleted ? YAFFS_OK : YAFFS_FAIL;
++              return deleted ? YAFFS_OK : YAFFS_FAIL;
+       } else {
+               /* The file has no data chunks so we toss it immediately */
+               yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
+@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
+       }
+ }
+ 
+-static int yaffs_DeleteDirectory(yaffs_Object * in)
++static int yaffs_DeleteDirectory(yaffs_Object *in)
+ {
+       /* First check that the directory is empty. */
+-      if (list_empty(&in->variant.directoryVariant.children)) {
++      if (ylist_empty(&in->variant.directoryVariant.children))
+               return yaffs_DoGenericObjectDeletion(in);
+-      }
+ 
+       return YAFFS_FAIL;
+ 
+ }
+ 
+-static int yaffs_DeleteSymLink(yaffs_Object * in)
++static int yaffs_DeleteSymLink(yaffs_Object *in)
+ {
+       YFREE(in->variant.symLinkVariant.alias);
+ 
+       return yaffs_DoGenericObjectDeletion(in);
+ }
+ 
+-static int yaffs_DeleteHardLink(yaffs_Object * in)
++static int yaffs_DeleteHardLink(yaffs_Object *in)
+ {
+       /* remove this hardlink from the list assocaited with the equivalent
+        * object
+        */
+-      list_del(&in->hardLinks);
++      ylist_del_init(&in->hardLinks);
+       return yaffs_DoGenericObjectDeletion(in);
+ }
+ 
+-static void yaffs_DestroyObject(yaffs_Object * obj)
++int yaffs_DeleteObject(yaffs_Object *obj)
+ {
++int retVal = -1;
+       switch (obj->variantType) {
+       case YAFFS_OBJECT_TYPE_FILE:
+-              yaffs_DeleteFile(obj);
++              retVal = yaffs_DeleteFile(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_DIRECTORY:
+-              yaffs_DeleteDirectory(obj);
++              return yaffs_DeleteDirectory(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+-              yaffs_DeleteSymLink(obj);
++              retVal = yaffs_DeleteSymLink(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_HARDLINK:
+-              yaffs_DeleteHardLink(obj);
++              retVal = yaffs_DeleteHardLink(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_SPECIAL:
+-              yaffs_DoGenericObjectDeletion(obj);
++              retVal = yaffs_DoGenericObjectDeletion(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_UNKNOWN:
++              retVal = 0;
+               break;          /* should not happen. */
+       }
++
++      return retVal;
+ }
+ 
+-static int yaffs_UnlinkWorker(yaffs_Object * obj)
++static int yaffs_UnlinkWorker(yaffs_Object *obj)
+ {
+ 
++      int immediateDeletion = 0;
++
++#ifdef __KERNEL__
++      if (!obj->myInode)
++              immediateDeletion = 1;
++#else
++      if (obj->inUse <= 0)
++              immediateDeletion = 1;
++#endif
++
+       if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
+               return yaffs_DeleteHardLink(obj);
+-      } else if (!list_empty(&obj->hardLinks)) {
++      } else if (!ylist_empty(&obj->hardLinks)) {
+               /* Curve ball: We're unlinking an object that has a hardlink.
+                *
+                * This problem arises because we are not strictly following
+@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
+               int retVal;
+               YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
+ 
+-              hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
++              hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
+ 
+-              list_del_init(&hl->hardLinks);
+-              list_del_init(&hl->siblings);
++              ylist_del_init(&hl->hardLinks);
++              ylist_del_init(&hl->siblings);
+ 
+               yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
+ 
+               retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
+ 
+-              if (retVal == YAFFS_OK) {
++              if (retVal == YAFFS_OK)
+                       retVal = yaffs_DoGenericObjectDeletion(hl);
+-              }
++
+               return retVal;
+ 
+-      } else {
++      } else if (immediateDeletion) {
+               switch (obj->variantType) {
+               case YAFFS_OBJECT_TYPE_FILE:
+-                      return yaffs_UnlinkFile(obj);
++                      return yaffs_DeleteFile(obj);
+                       break;
+               case YAFFS_OBJECT_TYPE_DIRECTORY:
+                       return yaffs_DeleteDirectory(obj);
+@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
+               default:
+                       return YAFFS_FAIL;
+               }
+-      }
++      } else
++              return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
++                                         _Y("unlinked"), 0, 0);
+ }
+ 
+ 
+-static int yaffs_UnlinkObject( yaffs_Object *obj)
++static int yaffs_UnlinkObject(yaffs_Object *obj)
+ {
+ 
+-      if (obj && obj->unlinkAllowed) {
++      if (obj && obj->unlinkAllowed)
+               return yaffs_UnlinkWorker(obj);
+-      }
+ 
+       return YAFFS_FAIL;
+ 
+ }
+-int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
++int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
+ {
+       yaffs_Object *obj;
+ 
+@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
+ 
+ /*----------------------- Initialisation Scanning ---------------------- */
+ 
+-static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
+-                                     int backwardScanning)
++static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
++                              int backwardScanning)
+ {
+       yaffs_Object *obj;
+ 
+@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
+               /* Handle YAFFS2 case (backward scanning)
+                * If the shadowed object exists then ignore.
+                */
+-              if (yaffs_FindObjectByNumber(dev, objId)) {
++              if (yaffs_FindObjectByNumber(dev, objId))
+                       return;
+-              }
+       }
+ 
+       /* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
+@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
+       obj =
+           yaffs_FindOrCreateObjectByNumber(dev, objId,
+                                            YAFFS_OBJECT_TYPE_FILE);
++      if (!obj)
++              return;
+       yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
+       obj->variant.fileVariant.shrinkSize = 0;
+       obj->valid = 1;         /* So that we don't read any other info for this file */
+@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
+               if (in) {
+                       /* Add the hardlink pointers */
+                       hl->variant.hardLinkVariant.equivalentObject = in;
+-                      list_add(&hl->hardLinks, &in->hardLinks);
++                      ylist_add(&hl->hardLinks, &in->hardLinks);
+               } else {
+                       /* Todo Need to report/handle this better.
+                        * Got a problem... hardlink to a non-existant object
+                        */
+                       hl->variant.hardLinkVariant.equivalentObject = NULL;
+-                      INIT_LIST_HEAD(&hl->hardLinks);
++                      YINIT_LIST_HEAD(&hl->hardLinks);
+ 
+               }
+-
+       }
++}
++
++
+ 
++
++
++static int ybicmp(const void *a, const void *b)
++{
++      register int aseq = ((yaffs_BlockIndex *)a)->seq;
++      register int bseq = ((yaffs_BlockIndex *)b)->seq;
++      register int ablock = ((yaffs_BlockIndex *)a)->block;
++      register int bblock = ((yaffs_BlockIndex *)b)->block;
++      if (aseq == bseq)
++              return ablock - bblock;
++      else
++              return aseq - bseq;
+ }
+ 
+ 
++struct yaffs_ShadowFixerStruct {
++      int objectId;
++      int shadowedId;
++      struct yaffs_ShadowFixerStruct *next;
++};
++
+ 
++static void yaffs_StripDeletedObjects(yaffs_Device *dev)
++{
++      /*
++      *  Sort out state of unlinked and deleted objects after scanning.
++      */
++      struct ylist_head *i;
++      struct ylist_head *n;
++      yaffs_Object *l;
+ 
++      /* Soft delete all the unlinked files */
++      ylist_for_each_safe(i, n,
++              &dev->unlinkedDir->variant.directoryVariant.children) {
++              if (i) {
++                      l = ylist_entry(i, yaffs_Object, siblings);
++                      yaffs_DeleteObject(l);
++              }
++      }
+ 
+-static int ybicmp(const void *a, const void *b){
+-    register int aseq = ((yaffs_BlockIndex *)a)->seq;
+-    register int bseq = ((yaffs_BlockIndex *)b)->seq;
+-    register int ablock = ((yaffs_BlockIndex *)a)->block;
+-    register int bblock = ((yaffs_BlockIndex *)b)->block;
+-    if( aseq == bseq )
+-        return ablock - bblock;
+-    else
+-        return aseq - bseq;
++      ylist_for_each_safe(i, n,
++              &dev->deletedDir->variant.directoryVariant.children) {
++              if (i) {
++                      l = ylist_entry(i, yaffs_Object, siblings);
++                      yaffs_DeleteObject(l);
++              }
++      }
+ 
+ }
+ 
+-static int yaffs_Scan(yaffs_Device * dev)
++static int yaffs_Scan(yaffs_Device *dev)
+ {
+       yaffs_ExtendedTags tags;
+       int blk;
+       int blockIterator;
+       int startIterator;
+       int endIterator;
+-      int nBlocksToScan = 0;
+       int result;
+ 
+       int chunk;
+@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
+       yaffs_BlockState state;
+       yaffs_Object *hardList = NULL;
+       yaffs_BlockInfo *bi;
+-      int sequenceNumber;
++      __u32 sequenceNumber;
+       yaffs_ObjectHeader *oh;
+       yaffs_Object *in;
+       yaffs_Object *parent;
+-      int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
+ 
+       int alloc_failed = 0;
+ 
++      struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
++
+ 
+       __u8 *chunkData;
+ 
+-      yaffs_BlockIndex *blockIndex = NULL;
+ 
+-      if (dev->isYaffs2) {
+-              T(YAFFS_TRACE_SCAN,
+-                (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
+-              return YAFFS_FAIL;
+-      }
+-
+-      //TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
+ 
+       T(YAFFS_TRACE_SCAN,
+         (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
+@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
+ 
+       dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
+ 
+-      if (dev->isYaffs2) {
+-              blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
+-              if(!blockIndex)
+-                      return YAFFS_FAIL;
+-      }
+-
+       /* Scan all the blocks to determine their state */
+       for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
+               bi = yaffs_GetBlockInfo(dev, blk);
+@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
+               bi->blockState = state;
+               bi->sequenceNumber = sequenceNumber;
+ 
++              if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
++                      bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
++
+               T(YAFFS_TRACE_SCAN_DEBUG,
+                 (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
+                  state, sequenceNumber));
+@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
+                         (TSTR("Block empty " TENDSTR)));
+                       dev->nErasedBlocks++;
+                       dev->nFreeChunks += dev->nChunksPerBlock;
+-              } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
+-
+-                      /* Determine the highest sequence number */
+-                      if (dev->isYaffs2 &&
+-                          sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
+-                          sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
+-
+-                              blockIndex[nBlocksToScan].seq = sequenceNumber;
+-                              blockIndex[nBlocksToScan].block = blk;
+-
+-                              nBlocksToScan++;
+-
+-                              if (sequenceNumber >= dev->sequenceNumber) {
+-                                      dev->sequenceNumber = sequenceNumber;
+-                              }
+-                      } else if (dev->isYaffs2) {
+-                              /* TODO: Nasty sequence number! */
+-                              T(YAFFS_TRACE_SCAN,
+-                                (TSTR
+-                                 ("Block scanning block %d has bad sequence number %d"
+-                                  TENDSTR), blk, sequenceNumber));
+-
+-                      }
+               }
+       }
+ 
+-      /* Sort the blocks
+-       * Dungy old bubble sort for now...
+-       */
+-      if (dev->isYaffs2) {
+-              yaffs_BlockIndex temp;
+-              int i;
+-              int j;
+-
+-              for (i = 0; i < nBlocksToScan; i++)
+-                      for (j = i + 1; j < nBlocksToScan; j++)
+-                              if (blockIndex[i].seq > blockIndex[j].seq) {
+-                                      temp = blockIndex[j];
+-                                      blockIndex[j] = blockIndex[i];
+-                                      blockIndex[i] = temp;
+-                              }
+-      }
+-
+-      /* Now scan the blocks looking at the data. */
+-      if (dev->isYaffs2) {
+-              startIterator = 0;
+-              endIterator = nBlocksToScan - 1;
+-              T(YAFFS_TRACE_SCAN_DEBUG,
+-                (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
+-      } else {
+-              startIterator = dev->internalStartBlock;
+-              endIterator = dev->internalEndBlock;
+-      }
++      startIterator = dev->internalStartBlock;
++      endIterator = dev->internalEndBlock;
+ 
+       /* For each block.... */
+       for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
+            blockIterator++) {
+ 
+-              if (dev->isYaffs2) {
+-                      /* get the block to scan in the correct order */
+-                      blk = blockIndex[blockIterator].block;
+-              } else {
+-                      blk = blockIterator;
+-              }
++              YYIELD();
++
++              YYIELD();
++
++              blk = blockIterator;
+ 
+               bi = yaffs_GetBlockInfo(dev, blk);
+               state = bi->blockState;
+@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
+ 
+                       /* Let's have a good look at this chunk... */
+ 
+-                      if (!dev->isYaffs2 && tags.chunkDeleted) {
++                      if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
+                               /* YAFFS1 only...
+                                * A deleted chunk
+                                */
+@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
+                                       dev->allocationBlockFinder = blk;
+                                       /* Set it to here to encourage the allocator to go forth from here. */
+ 
+-                                      /* Yaffs2 sanity check:
+-                                       * This should be the one with the highest sequence number
+-                                       */
+-                                      if (dev->isYaffs2
+-                                          && (dev->sequenceNumber !=
+-                                              bi->sequenceNumber)) {
+-                                              T(YAFFS_TRACE_ALWAYS,
+-                                                (TSTR
+-                                                 ("yaffs: Allocation block %d was not highest sequence id:"
+-                                                  " block seq = %d, dev seq = %d"
+-                                                  TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
+-                                      }
+                               }
+ 
+                               dev->nFreeChunks += (dev->nChunksPerBlock - c);
+@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
+                                * the same chunkId).
+                                */
+ 
+-                              if(!in)
++                              if (!in)
+                                       alloc_failed = 1;
+ 
+-                              if(in){
+-                                      if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
++                              if (in) {
++                                      if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
+                                               alloc_failed = 1;
+                               }
+ 
+@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
+                                        * deleted, and worse still it has changed type. Delete the old object.
+                                        */
+ 
+-                                      yaffs_DestroyObject(in);
++                                      yaffs_DeleteObject(in);
+ 
+                                       in = 0;
+                               }
+@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
+                                                                     objectId,
+                                                                     oh->type);
+ 
+-                              if(!in)
++                              if (!in)
+                                       alloc_failed = 1;
+ 
+                               if (in && oh->shadowsObject > 0) {
+-                                      yaffs_HandleShadowedObject(dev,
+-                                                                 oh->
+-                                                                 shadowsObject,
+-                                                                 0);
++
++                                      struct yaffs_ShadowFixerStruct *fixer;
++                                      fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
++                                      if (fixer) {
++                                              fixer->next = shadowFixerList;
++                                              shadowFixerList = fixer;
++                                              fixer->objectId = tags.objectId;
++                                              fixer->shadowedId = oh->shadowsObject;
++                                      }
++
+                               }
+ 
+                               if (in && in->valid) {
+@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
+                                       unsigned existingSerial = in->serial;
+                                       unsigned newSerial = tags.serialNumber;
+ 
+-                                      if (dev->isYaffs2 ||
+-                                          ((existingSerial + 1) & 3) ==
+-                                          newSerial) {
++                                      if (((existingSerial + 1) & 3) == newSerial) {
+                                               /* Use new one - destroy the exisiting one */
+                                               yaffs_DeleteChunk(dev,
+-                                                                in->chunkId,
++                                                                in->hdrChunk,
+                                                                 1, __LINE__);
+                                               in->valid = 0;
+                                       } else {
+@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
+                                       in->yst_ctime = oh->yst_ctime;
+                                       in->yst_rdev = oh->yst_rdev;
+ #endif
+-                                      in->chunkId = chunk;
++                                      in->hdrChunk = chunk;
++                                      in->serial = tags.serialNumber;
+ 
+                               } else if (in && !in->valid) {
+                                       /* we need to load this info */
+@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
+                                       in->yst_ctime = oh->yst_ctime;
+                                       in->yst_rdev = oh->yst_rdev;
+ #endif
+-                                      in->chunkId = chunk;
++                                      in->hdrChunk = chunk;
++                                      in->serial = tags.serialNumber;
+ 
+                                       yaffs_SetObjectName(in, oh->name);
+                                       in->dirty = 0;
+@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
+                                           yaffs_FindOrCreateObjectByNumber
+                                           (dev, oh->parentObjectId,
+                                            YAFFS_OBJECT_TYPE_DIRECTORY);
+-                                      if (parent->variantType ==
++                                      if (!parent)
++                                              alloc_failed = 1;
++                                      if (parent && parent->variantType ==
+                                           YAFFS_OBJECT_TYPE_UNKNOWN) {
+                                               /* Set up as a directory */
+                                               parent->variantType =
+-                                                  YAFFS_OBJECT_TYPE_DIRECTORY;
+-                                              INIT_LIST_HEAD(&parent->variant.
+-                                                             directoryVariant.
+-                                                             children);
+-                                      } else if (parent->variantType !=
+-                                                 YAFFS_OBJECT_TYPE_DIRECTORY)
+-                                      {
++                                                      YAFFS_OBJECT_TYPE_DIRECTORY;
++                                              YINIT_LIST_HEAD(&parent->variant.
++                                                              directoryVariant.
++                                                              children);
++                                      } else if (!parent || parent->variantType !=
++                                                 YAFFS_OBJECT_TYPE_DIRECTORY) {
+                                               /* Hoosterman, another problem....
+                                                * We're trying to use a non-directory as a directory
+                                                */
+ 
+                                               T(YAFFS_TRACE_ERROR,
+                                                 (TSTR
+-                                                 ("yaffs tragedy: attempting to use non-directory as"
+-                                                  " a directory in scan. Put in lost+found."
++                                                 ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
+                                                   TENDSTR)));
+                                               parent = dev->lostNFoundDir;
+                                       }
+@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
+                                               /* Todo got a problem */
+                                               break;
+                                       case YAFFS_OBJECT_TYPE_FILE:
+-                                              if (dev->isYaffs2
+-                                                  && oh->isShrink) {
+-                                                      /* Prune back the shrunken chunks */
+-                                                      yaffs_PruneResizedChunks
+-                                                          (in, oh->fileSize);
+-                                                      /* Mark the block as having a shrinkHeader */
+-                                                      bi->hasShrinkHeader = 1;
+-                                              }
+-
+                                               if (dev->useHeaderFileSize)
+ 
+                                                       in->variant.fileVariant.
+@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
+                                               break;
+                                       case YAFFS_OBJECT_TYPE_HARDLINK:
+                                               in->variant.hardLinkVariant.
+-                                                  equivalentObjectId =
+-                                                  oh->equivalentObjectId;
++                                                      equivalentObjectId =
++                                                      oh->equivalentObjectId;
+                                               in->hardLinks.next =
+-                                                  (struct list_head *)
+-                                                  hardList;
++                                                      (struct ylist_head *)
++                                                      hardList;
+                                               hardList = in;
+                                               break;
+                                       case YAFFS_OBJECT_TYPE_DIRECTORY:
+@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
+                                       case YAFFS_OBJECT_TYPE_SYMLINK:
+                                               in->variant.symLinkVariant.alias =
+                                                   yaffs_CloneString(oh->alias);
+-                                              if(!in->variant.symLinkVariant.alias)
++                                              if (!in->variant.symLinkVariant.alias)
+                                                       alloc_failed = 1;
+                                               break;
+                                       }
+ 
++/*
+                                       if (parent == dev->deletedDir) {
+                                               yaffs_DestroyObject(in);
+                                               bi->hasShrinkHeader = 1;
+                                       }
++*/
+                               }
+                       }
+               }
+@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
+ 
+       }
+ 
+-      if (blockIndex) {
+-              YFREE(blockIndex);
+-      }
+-
+ 
+       /* Ok, we've done all the scanning.
+        * Fix up the hard link chains.
+@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
+        * hardlinks.
+        */
+ 
+-      yaffs_HardlinkFixup(dev,hardList);
++      yaffs_HardlinkFixup(dev, hardList);
+ 
+-      /* Handle the unlinked files. Since they were left in an unlinked state we should
+-       * just delete them.
+-       */
++      /* Fix up any shadowed objects */
+       {
+-              struct list_head *i;
+-              struct list_head *n;
++              struct yaffs_ShadowFixerStruct *fixer;
++              yaffs_Object *obj;
+ 
+-              yaffs_Object *l;
+-              /* Soft delete all the unlinked files */
+-              list_for_each_safe(i, n,
+-                                 &dev->unlinkedDir->variant.directoryVariant.
+-                                 children) {
+-                      if (i) {
+-                              l = list_entry(i, yaffs_Object, siblings);
+-                              yaffs_DestroyObject(l);
+-                      }
++              while (shadowFixerList) {
++                      fixer = shadowFixerList;
++                      shadowFixerList = fixer->next;
++                      /* Complete the rename transaction by deleting the shadowed object
++                       * then setting the object header to unshadowed.
++                       */
++                      obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
++                      if (obj)
++                              yaffs_DeleteObject(obj);
++
++                      obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
++
++                      if (obj)
++                              yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
++
++                      YFREE(fixer);
+               }
+       }
+ 
+       yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
+ 
+-      if(alloc_failed){
++      if (alloc_failed)
+               return YAFFS_FAIL;
+-      }
+ 
+       T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
+ 
+@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
+ {
+       __u8 *chunkData;
+       yaffs_ObjectHeader *oh;
+-      yaffs_Device *dev = in->myDev;
++      yaffs_Device *dev;
+       yaffs_ExtendedTags tags;
+       int result;
+       int alloc_failed = 0;
+ 
+-      if(!in)
++      if (!in)
+               return;
+ 
++      dev = in->myDev;
++
+ #if 0
+-      T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
++      T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
+               in->objectId,
+               in->lazyLoaded ? "not yet" : "already"));
+ #endif
+ 
+-      if(in->lazyLoaded){
++      if (in->lazyLoaded && in->hdrChunk > 0) {
+               in->lazyLoaded = 0;
+               chunkData = yaffs_GetTempBuffer(dev, __LINE__);
+ 
+-              result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
++              result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
+               oh = (yaffs_ObjectHeader *) chunkData;
+ 
+               in->yst_mode = oh->yst_mode;
+@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
+ #endif
+               yaffs_SetObjectName(in, oh->name);
+ 
+-              if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
+-                       in->variant.symLinkVariant.alias =
++              if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
++                      in->variant.symLinkVariant.alias =
+                                                   yaffs_CloneString(oh->alias);
+-                      if(!in->variant.symLinkVariant.alias)
++                      if (!in->variant.symLinkVariant.alias)
+                               alloc_failed = 1; /* Not returned to caller */
+               }
+ 
+-              yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
++              yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
+       }
+ }
+ 
+-static int yaffs_ScanBackwards(yaffs_Device * dev)
++static int yaffs_ScanBackwards(yaffs_Device *dev)
+ {
+       yaffs_ExtendedTags tags;
+       int blk;
+@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
+       yaffs_BlockState state;
+       yaffs_Object *hardList = NULL;
+       yaffs_BlockInfo *bi;
+-      int sequenceNumber;
++      __u32 sequenceNumber;
+       yaffs_ObjectHeader *oh;
+       yaffs_Object *in;
+       yaffs_Object *parent;
+@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+       blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
+ 
+-      if(!blockIndex) {
++      if (!blockIndex) {
+               blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
+               altBlockIndex = 1;
+       }
+ 
+-      if(!blockIndex) {
++      if (!blockIndex) {
+               T(YAFFS_TRACE_SCAN,
+                 (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
+               return YAFFS_FAIL;
+@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
+               bi->blockState = state;
+               bi->sequenceNumber = sequenceNumber;
+ 
+-              if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
++              if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
+                       bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
++              if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
++                      bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
+ 
+               T(YAFFS_TRACE_SCAN_DEBUG,
+                 (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
+                  state, sequenceNumber));
+ 
+ 
+-              if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
++              if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
+                       dev->blocksInCheckpoint++;
+ 
+               } else if (state == YAFFS_BLOCK_STATE_DEAD) {
+@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
+               } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
+ 
+                       /* Determine the highest sequence number */
+-                      if (dev->isYaffs2 &&
+-                          sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
++                      if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
+                           sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
+ 
+                               blockIndex[nBlocksToScan].seq = sequenceNumber;
+@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+                               nBlocksToScan++;
+ 
+-                              if (sequenceNumber >= dev->sequenceNumber) {
++                              if (sequenceNumber >= dev->sequenceNumber)
+                                       dev->sequenceNumber = sequenceNumber;
+-                              }
+-                      } else if (dev->isYaffs2) {
++                      } else {
+                               /* TODO: Nasty sequence number! */
+                               T(YAFFS_TRACE_SCAN,
+                                 (TSTR
+@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+       /* Sort the blocks */
+ #ifndef CONFIG_YAFFS_USE_OWN_SORT
+-      yaffs_qsort(blockIndex, nBlocksToScan,
+-              sizeof(yaffs_BlockIndex), ybicmp);
++      {
++              /* Use qsort now. */
++              yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
++      }
+ #else
+       {
+-              /* Dungy old bubble sort... */
++              /* Dungy old bubble sort... */
+ 
+               yaffs_BlockIndex temp;
+               int i;
+@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+       YYIELD();
+ 
+-      T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
++      T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
+ 
+       /* Now scan the blocks looking at the data. */
+       startIterator = 0;
+@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+       /* For each block.... backwards */
+       for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
+-           blockIterator--) {
+-              /* Cooperative multitasking! This loop can run for so
++                      blockIterator--) {
++              /* Cooperative multitasking! This loop can run for so
+                  long that watchdog timers expire. */
+-              YYIELD();
++              YYIELD();
+ 
+               /* get the block to scan in the correct order */
+               blk = blockIndex[blockIterator].block;
+@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                * this is the one being allocated from
+                                */
+ 
+-                              if(foundChunksInBlock)
+-                              {
++                              if (foundChunksInBlock) {
+                                       /* This is a chunk that was skipped due to failing the erased check */
+-
+                               } else if (c == 0) {
+                                       /* We're looking at the first chunk in the block so the block is unused */
+                                       state = YAFFS_BLOCK_STATE_EMPTY;
+@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                               } else {
+                                       if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
+                                           state == YAFFS_BLOCK_STATE_ALLOCATING) {
+-                                              if(dev->sequenceNumber == bi->sequenceNumber) {
++                                              if (dev->sequenceNumber == bi->sequenceNumber) {
+                                                       /* this is the block being allocated from */
+ 
+                                                       T(YAFFS_TRACE_SCAN,
+@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                                       dev->allocationBlock = blk;
+                                                       dev->allocationPage = c;
+                                                       dev->allocationBlockFinder = blk;
+-                                              }
+-                                              else {
++                                              } else {
+                                                       /* This is a partially written block that is not
+                                                        * the current allocation block. This block must have
+                                                        * had a write failure, so set up for retirement.
+                                                        */
+ 
+-                                                       bi->needsRetiring = 1;
++                                                       /* bi->needsRetiring = 1; ??? TODO */
+                                                        bi->gcPrioritise = 1;
+ 
+                                                        T(YAFFS_TRACE_ALWAYS,
+-                                                       (TSTR("Partially written block %d being set for retirement" TENDSTR),
++                                                       (TSTR("Partially written block %d detected" TENDSTR),
+                                                        blk));
+                                               }
+-
+                                       }
+-
+                               }
+ 
+                               dev->nFreeChunks++;
+ 
++                      } else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
++                              T(YAFFS_TRACE_SCAN,
++                                (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
++                                blk, c));
++
++                                dev->nFreeChunks++;
++
+                       } else if (tags.chunkId > 0) {
+                               /* chunkId > 0 so it is a data chunk... */
+                               unsigned int endpos;
+@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                                                     tags.
+                                                                     objectId,
+                                                                     YAFFS_OBJECT_TYPE_FILE);
+-                              if(!in){
++                              if (!in) {
+                                       /* Out of memory */
+                                       alloc_failed = 1;
+                               }
+@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                   && chunkBase <
+                                   in->variant.fileVariant.shrinkSize) {
+                                       /* This has not been invalidated by a resize */
+-                                      if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
+-                                                             chunk, -1)){
++                                      if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
++                                                             chunk, -1)) {
+                                               alloc_failed = 1;
+                                       }
+ 
+@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                                   scannedFileSize;
+                                       }
+ 
+-                              } else if(in) {
++                              } else if (in) {
+                                       /* This chunk has been invalidated by a resize, so delete */
+                                       yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
+ 
+@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                       in = yaffs_FindOrCreateObjectByNumber
+                                           (dev, tags.objectId,
+                                            tags.extraObjectType);
++                                      if (!in)
++                                              alloc_failed = 1;
+                               }
+ 
+                               if (!in ||
+@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                   tags.extraShadows ||
+                                   (!in->valid &&
+                                   (tags.objectId == YAFFS_OBJECTID_ROOT ||
+-                                   tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
+-                                  ) {
++                                   tags.objectId == 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
+@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+                                       oh = (yaffs_ObjectHeader *) chunkData;
+ 
+-                                      if (!in)
++                                      if (dev->inbandTags) {
++                                              /* Fix up the header if they got corrupted by inband tags */
++                                              oh->shadowsObject = oh->inbandShadowsObject;
++                                              oh->isShrink = oh->inbandIsShrink;
++                                      }
++
++                                      if (!in) {
+                                               in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
++                                              if (!in)
++                                                      alloc_failed = 1;
++                                      }
+ 
+                               }
+ 
+@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                       /* TODO Hoosterman we have a problem! */
+                                       T(YAFFS_TRACE_ERROR,
+                                         (TSTR
+-                                         ("yaffs tragedy: Could not make object for object  %d  "
+-                                          "at chunk %d during scan"
++                                         ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
+                                           TENDSTR), tags.objectId, chunk));
+-
++                                      continue;
+                               }
+ 
+                               if (in->valid) {
+@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+                                       if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
+                                            ((oh &&
+-                                             oh-> type == YAFFS_OBJECT_TYPE_FILE)||
++                                             oh->type == YAFFS_OBJECT_TYPE_FILE) ||
+                                             (tags.extraHeaderInfoAvailable  &&
+-                                             tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
+-                                          ) {
++                                             tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
+                                               __u32 thisSize =
+                                                   (oh) ? oh->fileSize : tags.
+                                                   extraFileLength;
+@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                                   (oh) ? oh->
+                                                   parentObjectId : tags.
+                                                   extraParentObjectId;
+-                                              unsigned isShrink =
++
++
++                                              isShrink =
+                                                   (oh) ? oh->isShrink : tags.
+                                                   extraIsShrinkHeader;
+ 
+@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                                           thisSize;
+                                               }
+ 
+-                                              if (isShrink) {
++                                              if (isShrink)
+                                                       bi->hasShrinkHeader = 1;
+-                                              }
+ 
+                                       }
+                                       /* Use existing - destroy this one. */
+@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+                               }
+ 
++                              if (!in->valid && in->variantType !=
++                                  (oh ? oh->type : tags.extraObjectType))
++                                      T(YAFFS_TRACE_ERROR, (
++                                              TSTR("yaffs tragedy: Bad object type, "
++                                          TCONT("%d != %d, for object %d at chunk ")
++                                          TCONT("%d during scan")
++                                              TENDSTR), oh ?
++                                          oh->type : tags.extraObjectType,
++                                          in->variantType, tags.objectId,
++                                          chunk));
++
+                               if (!in->valid &&
+                                   (tags.objectId == YAFFS_OBJECTID_ROOT ||
+                                    tags.objectId ==
+@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                       /* We only load some info, don't fiddle with directory structure */
+                                       in->valid = 1;
+ 
+-                                      if(oh) {
++                                      if (oh) {
+                                               in->variantType = oh->type;
+ 
+                                               in->yst_mode = oh->yst_mode;
+@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                               in->lazyLoaded = 1;
+                                       }
+ 
+-                                      in->chunkId = chunk;
++                                      in->hdrChunk = chunk;
+ 
+                               } else if (!in->valid) {
+                                       /* we need to load this info */
+ 
+                                       in->valid = 1;
+-                                      in->chunkId = chunk;
++                                      in->hdrChunk = chunk;
+ 
+-                                      if(oh) {
++                                      if (oh) {
+                                               in->variantType = oh->type;
+ 
+                                               in->yst_mode = oh->yst_mode;
+@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                               yaffs_SetObjectName(in, oh->name);
+                                               parent =
+                                                   yaffs_FindOrCreateObjectByNumber
+-                                                      (dev, oh->parentObjectId,
+-                                                       YAFFS_OBJECT_TYPE_DIRECTORY);
++                                                      (dev, oh->parentObjectId,
++                                                       YAFFS_OBJECT_TYPE_DIRECTORY);
+ 
+                                                fileSize = oh->fileSize;
+-                                               isShrink = oh->isShrink;
++                                               isShrink = oh->isShrink;
+                                                equivalentObjectId = oh->equivalentObjectId;
+ 
+-                                      }
+-                                      else {
++                                      } else {
+                                               in->variantType = tags.extraObjectType;
+                                               parent =
+                                                   yaffs_FindOrCreateObjectByNumber
+-                                                      (dev, tags.extraParentObjectId,
+-                                                       YAFFS_OBJECT_TYPE_DIRECTORY);
++                                                      (dev, tags.extraParentObjectId,
++                                                       YAFFS_OBJECT_TYPE_DIRECTORY);
+                                                fileSize = tags.extraFileLength;
+                                                isShrink = tags.extraIsShrinkHeader;
+                                                equivalentObjectId = tags.extraEquivalentObjectId;
+@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                       }
+                                       in->dirty = 0;
+ 
++                                      if (!parent)
++                                              alloc_failed = 1;
++
+                                       /* directory stuff...
+                                        * hook up to parent
+                                        */
+ 
+-                                      if (parent->variantType ==
++                                      if (parent && parent->variantType ==
+                                           YAFFS_OBJECT_TYPE_UNKNOWN) {
+                                               /* Set up as a directory */
+                                               parent->variantType =
+-                                                  YAFFS_OBJECT_TYPE_DIRECTORY;
+-                                              INIT_LIST_HEAD(&parent->variant.
+-                                                             directoryVariant.
+-                                                             children);
+-                                      } else if (parent->variantType !=
+-                                                 YAFFS_OBJECT_TYPE_DIRECTORY)
+-                                      {
++                                                      YAFFS_OBJECT_TYPE_DIRECTORY;
++                                              YINIT_LIST_HEAD(&parent->variant.
++                                                      directoryVariant.
++                                                      children);
++                                      } else if (!parent || parent->variantType !=
++                                                 YAFFS_OBJECT_TYPE_DIRECTORY) {
+                                               /* Hoosterman, another problem....
+                                                * We're trying to use a non-directory as a directory
+                                                */
+ 
+                                               T(YAFFS_TRACE_ERROR,
+                                                 (TSTR
+-                                                 ("yaffs tragedy: attempting to use non-directory as"
+-                                                  " a directory in scan. Put in lost+found."
++                                                 ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
+                                                   TENDSTR)));
+                                               parent = dev->lostNFoundDir;
+                                       }
+@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
+ 
+                                               break;
+                                       case YAFFS_OBJECT_TYPE_HARDLINK:
+-                                              if(!itsUnlinked) {
+-                                                in->variant.hardLinkVariant.equivalentObjectId =
+-                                                  equivalentObjectId;
+-                                                in->hardLinks.next =
+-                                                  (struct list_head *) hardList;
+-                                                hardList = in;
++                                              if (!itsUnlinked) {
++                                                      in->variant.hardLinkVariant.equivalentObjectId =
++                                                              equivalentObjectId;
++                                                      in->hardLinks.next =
++                                                              (struct ylist_head *) hardList;
++                                                      hardList = in;
+                                               }
+                                               break;
+                                       case YAFFS_OBJECT_TYPE_DIRECTORY:
+@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
+                                               /* Do nothing */
+                                               break;
+                                       case YAFFS_OBJECT_TYPE_SYMLINK:
+-                                              if(oh){
+-                                                 in->variant.symLinkVariant.alias =
+-                                                  yaffs_CloneString(oh->
+-                                                                    alias);
+-                                                 if(!in->variant.symLinkVariant.alias)
+-                                                      alloc_failed = 1;
++                                              if (oh) {
++                                                      in->variant.symLinkVariant.alias =
++                                                              yaffs_CloneString(oh->alias);
++                                                      if (!in->variant.symLinkVariant.alias)
++                                                              alloc_failed = 1;
+                                               }
+                                               break;
+                                       }
+@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
+        * We should now have scanned all the objects, now it's time to add these
+        * hardlinks.
+        */
+-      yaffs_HardlinkFixup(dev,hardList);
++      yaffs_HardlinkFixup(dev, hardList);
+ 
+ 
+-      /*
+-      *  Sort out state of unlinked and deleted objects.
+-      */
+-      {
+-              struct list_head *i;
+-              struct list_head *n;
++      yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
+ 
+-              yaffs_Object *l;
++      if (alloc_failed)
++              return YAFFS_FAIL;
+ 
+-              /* Soft delete all the unlinked files */
+-              list_for_each_safe(i, n,
+-                                 &dev->unlinkedDir->variant.directoryVariant.
+-                                 children) {
+-                      if (i) {
+-                              l = list_entry(i, yaffs_Object, siblings);
+-                              yaffs_DestroyObject(l);
+-                      }
+-              }
++      T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
+ 
+-              /* Soft delete all the deletedDir files */
+-              list_for_each_safe(i, n,
+-                                 &dev->deletedDir->variant.directoryVariant.
+-                                 children) {
+-                      if (i) {
+-                              l = list_entry(i, yaffs_Object, siblings);
+-                              yaffs_DestroyObject(l);
++      return YAFFS_OK;
++}
+ 
+-                      }
++/*------------------------------  Directory Functions ----------------------------- */
++
++static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
++{
++      struct ylist_head *lh;
++      yaffs_Object *listObj;
++
++      int count = 0;
++
++      if (!obj) {
++              T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
++              YBUG();
++              return;
++      }
++
++      if (yaffs_SkipVerification(obj->myDev))
++              return;
++
++      if (!obj->parent) {
++              T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
++              YBUG();
++              return;
++      }
++
++      if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
++              T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
++              YBUG();
++      }
++
++      /* Iterate through the objects in each hash entry */
++
++      ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
++              if (lh) {
++                      listObj = ylist_entry(lh, yaffs_Object, siblings);
++                      yaffs_VerifyObject(listObj);
++                      if (obj == listObj)
++                              count++;
+               }
++       }
++
++      if (count != 1) {
++              T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
++              YBUG();
+       }
++}
+ 
+-      yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
++static void yaffs_VerifyDirectory(yaffs_Object *directory)
++{
++      struct ylist_head *lh;
++      yaffs_Object *listObj;
+ 
+-      if(alloc_failed){
+-              return YAFFS_FAIL;
++      if (!directory) {
++              YBUG();
++              return;
+       }
+ 
+-      T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
++      if (yaffs_SkipFullVerification(directory->myDev))
++              return;
+ 
+-      return YAFFS_OK;
++      if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
++              T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
++              YBUG();
++      }
++
++      /* Iterate through the objects in each hash entry */
++
++      ylist_for_each(lh, &directory->variant.directoryVariant.children) {
++              if (lh) {
++                      listObj = ylist_entry(lh, yaffs_Object, siblings);
++                      if (listObj->parent != directory) {
++                              T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
++                              YBUG();
++                      }
++                      yaffs_VerifyObjectInDirectory(listObj);
++              }
++      }
+ }
+ 
+-/*------------------------------  Directory Functions ----------------------------- */
+ 
+-static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
++static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
+ {
+       yaffs_Device *dev = obj->myDev;
++      yaffs_Object *parent;
++
++      yaffs_VerifyObjectInDirectory(obj);
++      parent = obj->parent;
++
++      yaffs_VerifyDirectory(parent);
+ 
+-      if(dev && dev->removeObjectCallback)
++      if (dev && dev->removeObjectCallback)
+               dev->removeObjectCallback(obj);
+ 
+-      list_del_init(&obj->siblings);
++
++      ylist_del_init(&obj->siblings);
+       obj->parent = NULL;
++
++      yaffs_VerifyDirectory(parent);
+ }
+ 
+ 
+-static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
+-                                     yaffs_Object * obj)
++static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
++                                      yaffs_Object *obj)
+ {
+-
+       if (!directory) {
+               T(YAFFS_TRACE_ALWAYS,
+                 (TSTR
+                  ("tragedy: Trying to add an object to a null pointer directory"
+                   TENDSTR)));
+               YBUG();
++              return;
+       }
+       if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_ALWAYS,
+@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
+ 
+       if (obj->siblings.prev == NULL) {
+               /* Not initialised */
+-              INIT_LIST_HEAD(&obj->siblings);
+-
+-      } else if (!list_empty(&obj->siblings)) {
+-              /* If it is holed up somewhere else, un hook it */
+-              yaffs_RemoveObjectFromDirectory(obj);
++              YBUG();
+       }
++
++
++      yaffs_VerifyDirectory(directory);
++
++      yaffs_RemoveObjectFromDirectory(obj);
++
++
+       /* Now add it */
+-      list_add(&obj->siblings, &directory->variant.directoryVariant.children);
++      ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
+       obj->parent = directory;
+ 
+       if (directory == obj->myDev->unlinkedDir
+-          || directory == obj->myDev->deletedDir) {
++                      || directory == obj->myDev->deletedDir) {
+               obj->unlinked = 1;
+               obj->myDev->nUnlinkedFiles++;
+               obj->renameAllowed = 0;
+       }
++
++      yaffs_VerifyDirectory(directory);
++      yaffs_VerifyObjectInDirectory(obj);
+ }
+ 
+-yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
+-                                   const YCHAR * name)
++yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
++                                   const YCHAR *name)
+ {
+       int sum;
+ 
+-      struct list_head *i;
++      struct ylist_head *i;
+       YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
+ 
+       yaffs_Object *l;
+ 
+-      if (!name) {
++      if (!name)
+               return NULL;
+-      }
+ 
+       if (!directory) {
+               T(YAFFS_TRACE_ALWAYS,
+@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
+                  ("tragedy: yaffs_FindObjectByName: null pointer directory"
+                   TENDSTR)));
+               YBUG();
++              return NULL;
+       }
+       if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_ALWAYS,
+@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
+ 
+       sum = yaffs_CalcNameSum(name);
+ 
+-      list_for_each(i, &directory->variant.directoryVariant.children) {
++      ylist_for_each(i, &directory->variant.directoryVariant.children) {
+               if (i) {
+-                      l = list_entry(i, yaffs_Object, siblings);
++                      l = ylist_entry(i, yaffs_Object, siblings);
++
++                      if (l->parent != directory)
++                              YBUG();
+ 
+                       yaffs_CheckObjectDetailsLoaded(l);
+ 
+                       /* Special case for lost-n-found */
+                       if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
+-                              if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
++                              if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
+                                       return l;
+-                              }
+-                      } else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
+-                      {
+-                              /* LostnFound cunk called Objxxx
++                      } else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
++                              /* LostnFound chunk called Objxxx
+                                * Do a real check
+                                */
+                               yaffs_GetObjectName(l, buffer,
+                                                   YAFFS_MAX_NAME_LENGTH);
+-                              if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
++                              if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
+                                       return l;
+-                              }
+-
+                       }
+               }
+       }
+@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
+ 
+ 
+ #if 0
+-int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
+-                                 int (*fn) (yaffs_Object *))
++int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
++                                      int (*fn) (yaffs_Object *))
+ {
+-      struct list_head *i;
++      struct ylist_head *i;
+       yaffs_Object *l;
+ 
+       if (!theDir) {
+@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
+                  ("tragedy: yaffs_FindObjectByName: null pointer directory"
+                   TENDSTR)));
+               YBUG();
++              return YAFFS_FAIL;
+       }
+       if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_ALWAYS,
+                 (TSTR
+                  ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
+               YBUG();
++              return YAFFS_FAIL;
+       }
+ 
+-      list_for_each(i, &theDir->variant.directoryVariant.children) {
++      ylist_for_each(i, &theDir->variant.directoryVariant.children) {
+               if (i) {
+-                      l = list_entry(i, yaffs_Object, siblings);
+-                      if (l && !fn(l)) {
++                      l = ylist_entry(i, yaffs_Object, siblings);
++                      if (l && !fn(l))
+                               return YAFFS_FAIL;
+-                      }
+               }
+       }
+ 
+@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
+  * actual object.
+  */
+ 
+-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
++yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
+ {
+       if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
+               /* We want the object id of the equivalent object, not this one */
+@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
+               yaffs_CheckObjectDetailsLoaded(obj);
+       }
+       return obj;
+-
+ }
+ 
+-int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
++int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
+ {
+       memset(name, 0, buffSize * sizeof(YCHAR));
+ 
+@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
+ 
+       if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
+               yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
+-      } else if (obj->chunkId <= 0) {
++      } else if (obj->hdrChunk <= 0) {
+               YCHAR locName[20];
++              YCHAR numString[20];
++              YCHAR *x = &numString[19];
++              unsigned v = obj->objectId;
++              numString[19] = 0;
++              while (v > 0) {
++                      x--;
++                      *x = '0' + (v % 10);
++                      v /= 10;
++              }
+               /* make up a name */
+-              yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
+-                            obj->objectId);
++              yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
++              yaffs_strcat(locName, x);
+               yaffs_strncpy(name, locName, buffSize - 1);
+ 
+       }
+ #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
+-      else if (obj->shortName[0]) {
++      else if (obj->shortName[0])
+               yaffs_strcpy(name, obj->shortName);
+-      }
+ #endif
+       else {
+               int result;
+@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
+ 
+               memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
+ 
+-              if (obj->chunkId >= 0) {
++              if (obj->hdrChunk > 0) {
+                       result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
+-                                                      obj->chunkId, buffer,
++                                                      obj->hdrChunk, buffer,
+                                                       NULL);
+               }
+               yaffs_strncpy(name, oh->name, buffSize - 1);
+@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
+       return yaffs_strlen(name);
+ }
+ 
+-int yaffs_GetObjectFileLength(yaffs_Object * obj)
++int yaffs_GetObjectFileLength(yaffs_Object *obj)
+ {
+-
+       /* Dereference any hard linking */
+       obj = yaffs_GetEquivalentObject(obj);
+ 
+-      if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
++      if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+               return obj->variant.fileVariant.fileSize;
+-      }
+-      if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
++      if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
+               return yaffs_strlen(obj->variant.symLinkVariant.alias);
+-      } else {
++      else {
+               /* Only a directory should drop through to here */
+               return obj->myDev->nDataBytesPerChunk;
+       }
+ }
+ 
+-int yaffs_GetObjectLinkCount(yaffs_Object * obj)
++int yaffs_GetObjectLinkCount(yaffs_Object *obj)
+ {
+       int count = 0;
+-      struct list_head *i;
++      struct ylist_head *i;
+ 
+-      if (!obj->unlinked) {
+-              count++;        /* the object itself */
+-      }
+-      list_for_each(i, &obj->hardLinks) {
+-              count++;        /* add the hard links; */
+-      }
+-      return count;
++      if (!obj->unlinked)
++              count++;                /* the object itself */
++
++      ylist_for_each(i, &obj->hardLinks)
++              count++;                /* add the hard links; */
+ 
++      return count;
+ }
+ 
+-int yaffs_GetObjectInode(yaffs_Object * obj)
++int yaffs_GetObjectInode(yaffs_Object *obj)
+ {
+       obj = yaffs_GetEquivalentObject(obj);
+ 
+       return obj->objectId;
+ }
+ 
+-unsigned yaffs_GetObjectType(yaffs_Object * obj)
++unsigned yaffs_GetObjectType(yaffs_Object *obj)
+ {
+       obj = yaffs_GetEquivalentObject(obj);
+ 
+@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
+       }
+ }
+ 
+-YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
++YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
+ {
+       obj = yaffs_GetEquivalentObject(obj);
+-      if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
++      if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
+               return yaffs_CloneString(obj->variant.symLinkVariant.alias);
+-      } else {
++      else
+               return yaffs_CloneString(_Y(""));
+-      }
+ }
+ 
+ #ifndef CONFIG_YAFFS_WINCE
+ 
+-int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
++int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
+ {
+       unsigned int valid = attr->ia_valid;
+ 
+@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
+       return YAFFS_OK;
+ 
+ }
+-int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
++int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
+ {
+       unsigned int valid = 0;
+ 
+@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
+       attr->ia_valid = valid;
+ 
+       return YAFFS_OK;
+-
+ }
+ 
+ #endif
+ 
+ #if 0
+-int yaffs_DumpObject(yaffs_Object * obj)
++int yaffs_DumpObject(yaffs_Object *obj)
+ {
+       YCHAR name[257];
+ 
+@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
+          ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
+           " chunk %d type %d size %d\n"
+           TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
+-         obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
++         obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
+          yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
+ 
+       return YAFFS_OK;
+@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
+ 
+ /*---------------------------- Initialisation code -------------------------------------- */
+ 
+-static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
++static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
+ {
+ 
+       /* Common functions, gotta have */
+@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
+           yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
+                                     YAFFS_LOSTNFOUND_MODE | S_IFDIR);
+ 
+-      if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
++      if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
+               yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
+               return YAFFS_OK;
+       }
+@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
+       return YAFFS_FAIL;
+ }
+ 
+-int yaffs_GutsInitialise(yaffs_Device * dev)
++int yaffs_GutsInitialise(yaffs_Device *dev)
+ {
+       int init_failed = 0;
+       unsigned x;
+@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
+       dev->chunkOffset = 0;
+       dev->nFreeChunks = 0;
+ 
++      dev->gcBlock = -1;
++
+       if (dev->startBlock == 0) {
+               dev->internalStartBlock = dev->startBlock + 1;
+               dev->internalEndBlock = dev->endBlock + 1;
+@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+ 
+       /* Check geometry parameters. */
+ 
+-      if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
+-          (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
++      if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
++          (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
++          (dev->inbandTags && !dev->isYaffs2) ||
+            dev->nChunksPerBlock < 2 ||
+            dev->nReservedBlocks < 2 ||
+            dev->internalStartBlock <= 0 ||
+            dev->internalEndBlock <= 0 ||
+-           dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)      // otherwise it is too small
+-          ) {
++           dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {   /* otherwise it is too small */
+               T(YAFFS_TRACE_ALWAYS,
+                 (TSTR
+-                 ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
+-                  TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
++                 ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
++                  TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
+               return YAFFS_FAIL;
+       }
+ 
+@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
+               return YAFFS_FAIL;
+       }
+ 
++      /* Sort out space for inband tags, if required */
++      if (dev->inbandTags)
++              dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
++      else
++              dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
++
+       /* Got the right mix of functions? */
+       if (!yaffs_CheckDevFunctions(dev)) {
+               /* Function missing */
+@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+ 
+       dev->isMounted = 1;
+ 
+-
+-
+       /* OK now calculate a few things for the device */
+ 
+       /*
+        *  Calculate all the chunk size manipulation numbers:
+        */
+-       /* Start off assuming it is a power of 2 */
+-       dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
+-       dev->chunkMask = (1<<dev->chunkShift) - 1;
+-
+-       if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
+-              /* Yes it is a power of 2, disable crumbs */
+-              dev->crumbMask = 0;
+-              dev->crumbShift = 0;
+-              dev->crumbsPerChunk = 0;
+-       } else {
+-              /* Not a power of 2, use crumbs instead */
+-              dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
+-              dev->crumbMask = (1<<dev->crumbShift)-1;
+-              dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
+-              dev->chunkShift = 0;
+-              dev->chunkMask = 0;
+-      }
+-
++      x = dev->nDataBytesPerChunk;
++      /* We always use dev->chunkShift and dev->chunkDiv */
++      dev->chunkShift = Shifts(x);
++      x >>= dev->chunkShift;
++      dev->chunkDiv = x;
++      /* We only use chunk mask if chunkDiv is 1 */
++      dev->chunkMask = (1<<dev->chunkShift) - 1;
+ 
+       /*
+        * Calculate chunkGroupBits.
+@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
+       bits = ShiftsGE(x);
+ 
+       /* Set up tnode width if wide tnodes are enabled. */
+-      if(!dev->wideTnodesDisabled){
++      if (!dev->wideTnodesDisabled) {
+               /* bits must be even so that we end up with 32-bit words */
+-              if(bits & 1)
++              if (bits & 1)
+                       bits++;
+-              if(bits < 16)
++              if (bits < 16)
+                       dev->tnodeWidth = 16;
+               else
+                       dev->tnodeWidth = bits;
+-      }
+-      else
++      } else
+               dev->tnodeWidth = 16;
+ 
+       dev->tnodeMask = (1<<dev->tnodeWidth)-1;
+@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+       dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
+ 
+       /* Initialise temporary buffers and caches. */
+-      if(!yaffs_InitialiseTempBuffers(dev))
++      if (!yaffs_InitialiseTempBuffers(dev))
+               init_failed = 1;
+ 
+       dev->srCache = NULL;
+@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
+       if (!init_failed &&
+           dev->nShortOpCaches > 0) {
+               int i;
+-              __u8 *buf;
++              void *buf;
+               int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
+ 
+-              if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
++              if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
+                       dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
+-              }
+ 
+-              buf = dev->srCache =  YMALLOC(srCacheBytes);
++              dev->srCache =  YMALLOC(srCacheBytes);
+ 
+-              if(dev->srCache)
+-                      memset(dev->srCache,0,srCacheBytes);
++              buf = (__u8 *) dev->srCache;
++
++              if (dev->srCache)
++                      memset(dev->srCache, 0, srCacheBytes);
+ 
+               for (i = 0; i < dev->nShortOpCaches && buf; i++) {
+                       dev->srCache[i].object = NULL;
+                       dev->srCache[i].lastUse = 0;
+                       dev->srCache[i].dirty = 0;
+-                      dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
++                      dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
+               }
+-              if(!buf)
++              if (!buf)
+                       init_failed = 1;
+ 
+               dev->srLastUse = 0;
+@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
+ 
+       dev->cacheHits = 0;
+ 
+-      if(!init_failed){
++      if (!init_failed) {
+               dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
+-              if(!dev->gcCleanupList)
++              if (!dev->gcCleanupList)
+                       init_failed = 1;
+       }
+ 
+-      if (dev->isYaffs2) {
++      if (dev->isYaffs2)
+               dev->useHeaderFileSize = 1;
+-      }
+-      if(!init_failed && !yaffs_InitialiseBlocks(dev))
++
++      if (!init_failed && !yaffs_InitialiseBlocks(dev))
+               init_failed = 1;
+ 
+       yaffs_InitialiseTnodes(dev);
+       yaffs_InitialiseObjects(dev);
+ 
+-      if(!init_failed && !yaffs_CreateInitialDirectories(dev))
++      if (!init_failed && !yaffs_CreateInitialDirectories(dev))
+               init_failed = 1;
+ 
+ 
+-      if(!init_failed){
++      if (!init_failed) {
+               /* Now scan the flash. */
+               if (dev->isYaffs2) {
+-                      if(yaffs_CheckpointRestore(dev)) {
++                      if (yaffs_CheckpointRestore(dev)) {
++                              yaffs_CheckObjectDetailsLoaded(dev->rootDir);
+                               T(YAFFS_TRACE_ALWAYS,
+                                 (TSTR("yaffs: restored from checkpoint" TENDSTR)));
+                       } else {
+@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
+                               dev->nBackgroundDeletions = 0;
+                               dev->oldestDirtySequence = 0;
+ 
+-                              if(!init_failed && !yaffs_InitialiseBlocks(dev))
++                              if (!init_failed && !yaffs_InitialiseBlocks(dev))
+                                       init_failed = 1;
+ 
+                               yaffs_InitialiseTnodes(dev);
+                               yaffs_InitialiseObjects(dev);
+ 
+-                              if(!init_failed && !yaffs_CreateInitialDirectories(dev))
++                              if (!init_failed && !yaffs_CreateInitialDirectories(dev))
+                                       init_failed = 1;
+ 
+-                              if(!init_failed && !yaffs_ScanBackwards(dev))
++                              if (!init_failed && !yaffs_ScanBackwards(dev))
+                                       init_failed = 1;
+                       }
+-              }else
+-                      if(!yaffs_Scan(dev))
++              } else if (!yaffs_Scan(dev))
+                               init_failed = 1;
++
++              yaffs_StripDeletedObjects(dev);
+       }
+ 
+-      if(init_failed){
++      if (init_failed) {
+               /* Clean up the mess */
+               T(YAFFS_TRACE_TRACING,
+                 (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
+@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+ 
+ }
+ 
+-void yaffs_Deinitialise(yaffs_Device * dev)
++void yaffs_Deinitialise(yaffs_Device *dev)
+ {
+       if (dev->isMounted) {
+               int i;
+@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
+                   dev->srCache) {
+ 
+                       for (i = 0; i < dev->nShortOpCaches; i++) {
+-                              if(dev->srCache[i].data)
++                              if (dev->srCache[i].data)
+                                       YFREE(dev->srCache[i].data);
+                               dev->srCache[i].data = NULL;
+                       }
+@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
+ 
+               YFREE(dev->gcCleanupList);
+ 
+-              for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
++              for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
+                       YFREE(dev->tempBuffer[i].buffer);
+-              }
+ 
+               dev->isMounted = 0;
+-      }
+ 
++              if (dev->deinitialiseNAND)
++                      dev->deinitialiseNAND(dev);
++      }
+ }
+ 
+-static int yaffs_CountFreeChunks(yaffs_Device * dev)
++static int yaffs_CountFreeChunks(yaffs_Device *dev)
+ {
+       int nFree;
+       int b;
+@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
+       yaffs_BlockInfo *blk;
+ 
+       for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
+-           b++) {
++                      b++) {
+               blk = yaffs_GetBlockInfo(dev, b);
+ 
+               switch (blk->blockState) {
+@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
+               default:
+                       break;
+               }
+-
+       }
+ 
+       return nFree;
+ }
+ 
+-int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
++int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
+ {
+       /* This is what we report to the outside world */
+ 
+       int nFree;
+       int nDirtyCacheChunks;
+       int blocksForCheckpoint;
++      int i;
+ 
+ #if 1
+       nFree = dev->nFreeChunks;
+@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
+ 
+       /* Now count the number of dirty chunks in the cache and subtract those */
+ 
+-      {
+-              int i;
+-              for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
+-                      if (dev->srCache[i].dirty)
+-                              nDirtyCacheChunks++;
+-              }
++      for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
++              if (dev->srCache[i].dirty)
++                      nDirtyCacheChunks++;
+       }
+ 
+       nFree -= nDirtyCacheChunks;
+@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
+       nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
+ 
+       /* Now we figure out how much to reserve for the checkpoint and report that... */
+-      blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
+-      if(blocksForCheckpoint < 0)
++      blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
++      if (blocksForCheckpoint < 0)
+               blocksForCheckpoint = 0;
+ 
+       nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
+@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
+ 
+ static int yaffs_freeVerificationFailures;
+ 
+-static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
++static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
+ {
+       int counted;
+       int difference;
+ 
+-      if(yaffs_SkipVerification(dev))
++      if (yaffs_SkipVerification(dev))
+               return;
+ 
+       counted = yaffs_CountFreeChunks(dev);
+@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
+ 
+ /*---------------------------------------- YAFFS test code ----------------------*/
+ 
+-#define yaffs_CheckStruct(structure,syze, name) \
+-           if(sizeof(structure) != syze) \
+-             { \
+-               T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
+-               name,syze,sizeof(structure))); \
+-               return YAFFS_FAIL; \
+-              }
++#define yaffs_CheckStruct(structure, syze, name) \
++      do { \
++              if (sizeof(structure) != syze) { \
++                      T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
++                              name, syze, sizeof(structure))); \
++                      return YAFFS_FAIL; \
++              } \
++      } while (0)
+ 
+ static int yaffs_CheckStructures(void)
+ {
+-/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
+-/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
+-/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
++/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
++/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
++/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
+ #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
+-      yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
++      yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
+ #endif
+-          yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
+-
+-          return YAFFS_OK;
++#ifndef CONFIG_YAFFS_WINCE
++      yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
++#endif
++      return YAFFS_OK;
+ }
+--- a/fs/yaffs2/yaffs_guts.h
++++ b/fs/yaffs2/yaffs_guts.h
+@@ -90,7 +90,7 @@
+ 
+ #define YAFFS_MAX_SHORT_OP_CACHES     20
+ 
+-#define YAFFS_N_TEMP_BUFFERS          4
++#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.
+@@ -108,6 +108,9 @@
+ #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.*/
+ typedef struct {
+       struct yaffs_ObjectStruct *object;
+@@ -134,11 +137,10 @@ typedef struct {
+ typedef struct {
+       unsigned chunkId:20;
+       unsigned serialNumber:2;
+-      unsigned byteCount:10;
++      unsigned byteCountLSB:10;
+       unsigned objectId:18;
+       unsigned ecc:12;
+-      unsigned unusedStuff:2;
+-
++      unsigned byteCountMSB:2;
+ } yaffs_Tags;
+ 
+ typedef union {
+@@ -277,13 +279,13 @@ typedef struct {
+ 
+       int softDeletions:10;   /* number of soft deleted pages */
+       int pagesInUse:10;      /* number of pages in use */
+-      yaffs_BlockState blockState:4;  /* One of the above block states */
++      unsigned blockState:4;  /* One of the above block states. NB use unsigned because enum is sometimes an int */
+       __u32 needsRetiring:1;  /* Data has failed on this block, need to get valid data off */
+-                              /* and retire the block. */
+-      __u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
+-      __u32 gcPrioritise: 1;  /* An ECC check or blank check has failed on this block.
++                              /* and retire the block. */
++      __u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
++      __u32 gcPrioritise:1;   /* An ECC check or blank check has failed on this block.
+                                  It should be prioritised for GC */
+-        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
++      __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
+ 
+ #ifdef CONFIG_YAFFS_YAFFS2
+       __u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
+@@ -300,11 +302,11 @@ typedef struct {
+ 
+       /* Apply to everything  */
+       int parentObjectId;
+-      __u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
++      __u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
+       YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
+ 
+-      /* Thes following apply to directories, files, symlinks - not hard links */
+-      __u32 yst_mode;         /* protection */
++      /* The following apply to directories, files, symlinks - not hard links */
++      __u32 yst_mode;         /* protection */
+ 
+ #ifdef CONFIG_YAFFS_WINCE
+       __u32 notForWinCE[5];
+@@ -331,11 +333,14 @@ typedef struct {
+       __u32 win_ctime[2];
+       __u32 win_atime[2];
+       __u32 win_mtime[2];
+-      __u32 roomToGrow[4];
+ #else
+-      __u32 roomToGrow[10];
++      __u32 roomToGrow[6];
++
+ #endif
++      __u32 inbandShadowsObject;
++      __u32 inbandIsShrink;
+ 
++      __u32 reservedSpace[2];
+       int shadowsObject;      /* This object header shadows the specified object if > 0 */
+ 
+       /* isShrink applies to object headers written when we shrink the file (ie resize) */
+@@ -381,7 +386,7 @@ typedef struct {
+ } yaffs_FileStructure;
+ 
+ typedef struct {
+-      struct list_head children;      /* list of child links */
++      struct ylist_head children;     /* list of child links */
+ } yaffs_DirectoryStructure;
+ 
+ typedef struct {
+@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
+                                * still in the inode cache. Free of object is defered.
+                                * until the inode is released.
+                                */
++      __u8 beingCreated:1;    /* This object is still being created so skip some checks. */
+ 
+       __u8 serial;            /* serial number of chunk in NAND. Cached here */
+       __u16 sum;              /* sum of the name to speed searching */
+ 
+-      struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
++      struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
+ 
+-      struct list_head hashLink;      /* list of objects in this hash bucket */
++      struct ylist_head hashLink;     /* list of objects in this hash bucket */
+ 
+-      struct list_head hardLinks;     /* all the equivalent hard linked objects */
++      struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
+ 
+       /* directory structure stuff */
+       /* also used for linking up the free list */
+       struct yaffs_ObjectStruct *parent;
+-      struct list_head siblings;
++      struct ylist_head siblings;
+ 
+       /* Where's my object header in NAND? */
+-      int chunkId;
++      int hdrChunk;
+ 
+       int nDataChunks;        /* Number of data chunks attached to the file. */
+ 
+@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
+ typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
+ 
+ typedef struct {
+-      struct list_head list;
++      struct ylist_head list;
+       int count;
+ } yaffs_ObjectBucket;
+ 
+@@ -495,11 +501,10 @@ typedef struct {
+  */
+ 
+ typedef struct {
+-        int structType;
++      int structType;
+       __u32 objectId;
+       __u32 parentId;
+-      int chunkId;
+-
++      int hdrChunk;
+       yaffs_ObjectType variantType:3;
+       __u8 deleted:1;
+       __u8 softDeleted:1;
+@@ -511,8 +516,7 @@ typedef struct {
+ 
+       int nDataChunks;
+       __u32 fileSizeOrEquivalentObjectId;
+-
+-}yaffs_CheckpointObject;
++} yaffs_CheckpointObject;
+ 
+ /*--------------------- Temporary buffers ----------------
+  *
+@@ -528,13 +532,13 @@ typedef struct {
+ /*----------------- Device ---------------------------------*/
+ 
+ struct yaffs_DeviceStruct {
+-      struct list_head devList;
++      struct ylist_head devList;
+       const char *name;
+ 
+       /* Entry parameters set up way early. Yaffs sets up the rest.*/
+       int nDataBytesPerChunk; /* Should be a power of 2 >= 512 */
+       int nChunksPerBlock;    /* does not need to be a power of 2 */
+-      int nBytesPerSpare;     /* spare area size */
++      int spareBytesPerChunk; /* spare area size */
+       int startBlock;         /* Start block we're allowed to use */
+       int endBlock;           /* End block we're allowed to use */
+       int nReservedBlocks;    /* We want this tuneable so that we can reduce */
+@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
+       /* Stuff used by the shared space checkpointing mechanism */
+       /* If this value is zero, then this mechanism is disabled */
+ 
+-      int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
+-
+-
++/*    int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
+ 
+ 
+       int nShortOpCaches;     /* If <= 0, then short op caching is disabled, else
+@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
+       void *genericDevice;    /* Pointer to device context
+                                * On an mtd this holds the mtd pointer.
+                                */
+-        void *superBlock;
++      void *superBlock;
+ 
+       /* NAND access functions (Must be set before calling YAFFS)*/
+ 
+-      int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
+-                               int chunkInNAND, const __u8 * data,
+-                               const yaffs_Spare * spare);
+-      int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
+-                                int chunkInNAND, __u8 * data,
+-                                yaffs_Spare * spare);
+-      int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
+-                               int blockInNAND);
+-      int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
++      int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
++                                      int chunkInNAND, const __u8 *data,
++                                      const yaffs_Spare *spare);
++      int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
++                                      int chunkInNAND, __u8 *data,
++                                      yaffs_Spare *spare);
++      int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
++                                      int blockInNAND);
++      int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
++      int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
+ 
+ #ifdef CONFIG_YAFFS_YAFFS2
+-      int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
+-                                       int chunkInNAND, const __u8 * data,
+-                                       const yaffs_ExtendedTags * tags);
+-      int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
+-                                        int chunkInNAND, __u8 * data,
+-                                        yaffs_ExtendedTags * tags);
+-      int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
+-      int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
+-                             yaffs_BlockState * state, int *sequenceNumber);
++      int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
++                                       int chunkInNAND, const __u8 *data,
++                                       const yaffs_ExtendedTags *tags);
++      int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
++                                        int chunkInNAND, __u8 *data,
++                                        yaffs_ExtendedTags *tags);
++      int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
++      int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
++                             yaffs_BlockState *state, __u32 *sequenceNumber);
+ #endif
+ 
+       int isYaffs2;
+@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
+       void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
+ 
+       /* Callback to mark the superblock dirsty */
+-      void (*markSuperBlockDirty)(void * superblock);
++      void (*markSuperBlockDirty)(void *superblock);
+ 
+       int wideTnodesDisabled; /* Set to disable wide tnodes */
+ 
++      YCHAR *pathDividers;    /* String of legal path dividers */
++
+ 
+       /* End of stuff that must be set before initialisation. */
+ 
+@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
+       __u32 tnodeWidth;
+       __u32 tnodeMask;
+ 
+-      /* Stuff to support various file offses to chunk/offset translations */
+-      /* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
+-      __u32 crumbMask;
+-      __u32 crumbShift;
+-      __u32 crumbsPerChunk;
+-
+-      /* Straight shifting for nDataBytesPerChunk being a power of 2 */
+-      __u32 chunkShift;
+-      __u32 chunkMask;
+-
++      /* Stuff for figuring out file offset to chunk conversions */
++      __u32 chunkShift; /* Shift value */
++      __u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
++      __u32 chunkMask;  /* Mask to use for power-of-2 case */
++
++      /* Stuff to handle inband tags */
++      int inbandTags;
++      __u32 totalBytesPerChunk;
+ 
+ #ifdef __KERNEL__
+ 
+@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
+       __u8 *spareBuffer;      /* For mtdif2 use. Don't know the size of the buffer
+                                * at compile time so we have to allocate it.
+                                */
+-      void (*putSuperFunc) (struct super_block * sb);
++      void (*putSuperFunc) (struct super_block *sb);
+ #endif
+ 
+       int isMounted;
+@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
+       __u32 checkpointSum;
+       __u32 checkpointXor;
+ 
++      int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
++
+       /* Block Info */
+       yaffs_BlockInfo *blockInfo;
+       __u8 *chunkBits;        /* bitmap of chunks in use */
+@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
+       yaffs_TnodeList *allocatedTnodeList;
+ 
+       int isDoingGC;
++      int gcBlock;
++      int gcChunk;
+ 
+       int nObjectsCreated;
+       yaffs_Object *freeObjects;
+       int nFreeObjects;
+ 
++      int nHardLinks;
++
+       yaffs_ObjectList *allocatedObjectList;
+ 
+       yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
+@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
+       int nBackgroundDeletions;       /* Count of background deletions. */
+ 
+ 
++      /* Temporary buffer management */
+       yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
+       int maxTemp;
++      int tempInUse;
+       int unmanagedTempAllocations;
+       int unmanagedTempDeallocations;
+ 
+@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
+ 
+ typedef struct yaffs_DeviceStruct yaffs_Device;
+ 
+-/* The static layout of bllock usage etc is stored in the super block header */
++/* The static layout of block usage etc is stored in the super block header */
+ typedef struct {
+-        int StructType;
++      int StructType;
+       int version;
+       int checkpointStartBlock;
+       int checkpointEndBlock;
+@@ -773,7 +784,7 @@ typedef struct {
+  * must be preserved over unmount/mount cycles.
+  */
+ typedef struct {
+-        int structType;
++      int structType;
+       int nErasedBlocks;
+       int allocationBlock;    /* Current block being allocated off */
+       __u32 allocationPage;
+@@ -791,57 +802,45 @@ typedef struct {
+ 
+ 
+ typedef struct {
+-    int structType;
+-    __u32 magic;
+-    __u32 version;
+-    __u32 head;
++      int structType;
++      __u32 magic;
++      __u32 version;
++      __u32 head;
+ } yaffs_CheckpointValidity;
+ 
+-/* Function to manipulate block info */
+-static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
+-{
+-      if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
+-              T(YAFFS_TRACE_ERROR,
+-                (TSTR
+-                 ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
+-                 blk));
+-              YBUG();
+-      }
+-      return &dev->blockInfo[blk - dev->internalStartBlock];
+-}
+ 
+ /*----------------------- YAFFS Functions -----------------------*/
+ 
+-int yaffs_GutsInitialise(yaffs_Device * dev);
+-void yaffs_Deinitialise(yaffs_Device * dev);
++int yaffs_GutsInitialise(yaffs_Device *dev);
++void yaffs_Deinitialise(yaffs_Device *dev);
+ 
+-int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
++int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
+ 
+-int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
+-                     yaffs_Object * newDir, const YCHAR * newName);
++int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
++                     yaffs_Object *newDir, const YCHAR *newName);
+ 
+-int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
+-int yaffs_DeleteFile(yaffs_Object * obj);
++int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
++int yaffs_DeleteObject(yaffs_Object *obj);
+ 
+-int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
+-int yaffs_GetObjectFileLength(yaffs_Object * obj);
+-int yaffs_GetObjectInode(yaffs_Object * obj);
+-unsigned yaffs_GetObjectType(yaffs_Object * obj);
+-int yaffs_GetObjectLinkCount(yaffs_Object * obj);
++int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
++int yaffs_GetObjectFileLength(yaffs_Object *obj);
++int yaffs_GetObjectInode(yaffs_Object *obj);
++unsigned yaffs_GetObjectType(yaffs_Object *obj);
++int yaffs_GetObjectLinkCount(yaffs_Object *obj);
+ 
+-int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
+-int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
++int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
++int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
+ 
+ /* File operations */
+-int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
+-                         int nBytes);
+-int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
+-                        int nBytes, int writeThrough);
+-int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
+-
+-yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
+-                            __u32 mode, __u32 uid, __u32 gid);
+-int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
++int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
++                              int nBytes);
++int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
++                              int nBytes, int writeThrough);
++int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
++
++yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
++                              __u32 mode, __u32 uid, __u32 gid);
++int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
+ 
+ /* Flushing and checkpointing */
+ void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
+@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
+ int yaffs_CheckpointRestore(yaffs_Device *dev);
+ 
+ /* Directory operations */
+-yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
+-                                 __u32 mode, __u32 uid, __u32 gid);
+-yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
+-int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
++yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
++                              __u32 mode, __u32 uid, __u32 gid);
++yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
++int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
+                                  int (*fn) (yaffs_Object *));
+ 
+-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
++yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
+ 
+ /* Link operations */
+-yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
+-                       yaffs_Object * equivalentObject);
++yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
++                       yaffs_Object *equivalentObject);
+ 
+-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
++yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
+ 
+ /* Symlink operations */
+-yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
++yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
+                                __u32 mode, __u32 uid, __u32 gid,
+-                               const YCHAR * alias);
+-YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
++                               const YCHAR *alias);
++YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
+ 
+ /* Special inodes (fifos, sockets and devices) */
+-yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
++yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
+                                __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
+ 
+ /* Special directories */
+-yaffs_Object *yaffs_Root(yaffs_Device * dev);
+-yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
++yaffs_Object *yaffs_Root(yaffs_Device *dev);
++yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
+ 
+ #ifdef CONFIG_YAFFS_WINCE
+ /* CONFIG_YAFFS_WINCE special stuff */
+@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
+ 
+ #ifdef __KERNEL__
+ 
+-void yaffs_HandleDeferedFree(yaffs_Object * obj);
++void yaffs_HandleDeferedFree(yaffs_Object *obj);
+ #endif
+ 
+ /* Debug dump  */
+-int yaffs_DumpObject(yaffs_Object * obj);
++int yaffs_DumpObject(yaffs_Object *obj);
+ 
+-void yaffs_GutsTest(yaffs_Device * dev);
++void yaffs_GutsTest(yaffs_Device *dev);
+ 
+ /* A few useful functions */
+-void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
+-void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
+-int yaffs_CheckFF(__u8 * buffer, int nBytes);
++void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
++void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
++int yaffs_CheckFF(__u8 *buffer, int nBytes);
+ void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
+ 
++__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
++void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
++
+ #endif
+--- a/fs/yaffs2/yaffs_mtdif1.c
++++ b/fs/yaffs2/yaffs_mtdif1.c
+@@ -26,7 +26,7 @@
+ #include "yportenv.h"
+ #include "yaffs_guts.h"
+ #include "yaffs_packedtags1.h"
+-#include "yaffs_tagscompat.h" // for yaffs_CalcTagsECC
++#include "yaffs_tagscompat.h" /* for yaffs_CalcTagsECC */
+ 
+ #include "linux/kernel.h"
+ #include "linux/version.h"
+@@ -34,9 +34,9 @@
+ #include "linux/mtd/mtd.h"
+ 
+ /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+ 
+-const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
++const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
+ 
+ #ifndef CONFIG_YAFFS_9BYTE_TAGS
+ # define YTAG1_SIZE 8
+@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
+  * Returns YAFFS_OK or YAFFS_FAIL.
+  */
+ int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
+-      int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
++      int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
+ {
+-      struct mtd_info * mtd = dev->genericDevice;
++      struct mtd_info *mtd = dev->genericDevice;
+       int chunkBytes = dev->nDataBytesPerChunk;
+       loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
+       struct mtd_oob_ops ops;
+@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
+ 
+ /* Return with empty ExtendedTags but add eccResult.
+  */
+-static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
++static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
+ {
+       if (etags) {
+               memset(etags, 0, sizeof(*etags));
+@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
+  * Returns YAFFS_OK or YAFFS_FAIL.
+  */
+ int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
+-      int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
++      int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
+ {
+-      struct mtd_info * mtd = dev->genericDevice;
++      struct mtd_info *mtd = dev->genericDevice;
+       int chunkBytes = dev->nDataBytesPerChunk;
+       loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
+       int eccres = YAFFS_ECC_RESULT_NO_ERROR;
+@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
+       ops.datbuf = data;
+       ops.oobbuf = (__u8 *)&pt1;
+ 
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
++#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.
+        */
+@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
+  */
+ int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
+ {
+-      struct mtd_info * mtd = dev->genericDevice;
++      struct mtd_info *mtd = dev->genericDevice;
+       int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
+       int retval;
+ 
+-      yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
++      yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
+ 
+       retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
+       return (retval) ? YAFFS_FAIL : YAFFS_OK;
+@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
+  *
+  * Returns YAFFS_OK or YAFFS_FAIL.
+  */
+-static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
++static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
+ {
+       /* 2.6.18 has mtd->ecclayout->oobavail */
+       /* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
+@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
+  * Always returns YAFFS_OK.
+  */
+ int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
+-      yaffs_BlockState * pState, int *pSequenceNumber)
++      yaffs_BlockState *pState, __u32 *pSequenceNumber)
+ {
+-      struct mtd_info * mtd = dev->genericDevice;
++      struct mtd_info *mtd = dev->genericDevice;
+       int chunkNo = blockNo * dev->nChunksPerBlock;
++      loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
+       yaffs_ExtendedTags etags;
+       int state = YAFFS_BLOCK_STATE_DEAD;
+       int seqnum = 0;
+@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
+       /* We don't yet have a good place to test for MTD config prerequists.
+        * Do it here as we are called during the initial scan.
+        */
+-      if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
++      if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
+               return YAFFS_FAIL;
+-      }
+ 
+       retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
++      etags.blockBad = (mtd->block_isbad)(mtd, addr);
+       if (etags.blockBad) {
+               yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
+-                      "block %d is marked bad", blockNo);
++                      "block %d is marked bad\n", blockNo);
+               state = YAFFS_BLOCK_STATE_DEAD;
+-      }
+-      else if (etags.chunkUsed) {
++      } else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
++              /* bad tags, need to look more closely */
++              state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
++      } else if (etags.chunkUsed) {
+               state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
+               seqnum = etags.sequenceNumber;
+-      }
+-      else {
++      } else {
+               state = YAFFS_BLOCK_STATE_EMPTY;
+       }
+ 
+@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
+       return YAFFS_OK;
+ }
+ 
+-#endif /*KERNEL_VERSION*/
++#endif /*MTD_VERSION*/
+--- a/fs/yaffs2/yaffs_mtdif1.h
++++ b/fs/yaffs2/yaffs_mtdif1.h
+@@ -14,15 +14,15 @@
+ #ifndef __YAFFS_MTDIF1_H__
+ #define __YAFFS_MTDIF1_H__
+ 
+-int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
+-      const __u8 * data, const yaffs_ExtendedTags * tags);
++int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
++      const __u8 *data, const yaffs_ExtendedTags *tags);
+ 
+-int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
+-      __u8 * data, yaffs_ExtendedTags * tags);
++int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
++      __u8 *data, yaffs_ExtendedTags *tags);
+ 
+ int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
+ 
+ int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
+-      yaffs_BlockState * state, int *sequenceNumber);
++      yaffs_BlockState *state, __u32 *sequenceNumber);
+ 
+ #endif
+--- a/fs/yaffs2/yaffs_mtdif2.c
++++ b/fs/yaffs2/yaffs_mtdif2.c
+@@ -14,7 +14,7 @@
+ /* mtd interface for YAFFS2 */
+ 
+ const char *yaffs_mtdif2_c_version =
+-    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
++      "$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
+ 
+ #include "yportenv.h"
+ 
+@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
+ 
+ #include "yaffs_packedtags2.h"
+ 
+-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
+-                                    const __u8 * data,
+-                                    const yaffs_ExtendedTags * tags)
++/* NB For use with inband tags....
++ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
++ * use it to load the tags.
++ */
++int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
++                                    const __u8 *data,
++                                    const yaffs_ExtendedTags *tags)
+ {
+       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       struct mtd_oob_ops ops;
+ #else
+       size_t dummy;
+ #endif
+       int retval = 0;
+ 
+-      loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
++      loff_t addr;
+ 
+       yaffs_PackedTags2 pt;
+ 
+@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
+          ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
+           TENDSTR), chunkInNAND, data, tags));
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+-      if (tags)
+-              yaffs_PackTags2(&pt, tags);
+-      else
+-              BUG(); /* both tags and data should always be present */
+ 
+-      if (data) {
+-              ops.mode = MTD_OOB_AUTO;
+-              ops.ooblen = sizeof(pt);
+-              ops.len = dev->nDataBytesPerChunk;
+-              ops.ooboffs = 0;
+-              ops.datbuf = (__u8 *)data;
+-              ops.oobbuf = (void *)&pt;
+-              retval = mtd->write_oob(mtd, addr, &ops);
++      addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
++
++      /* 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->inbandTags) {
++              yaffs_PackedTags2TagsPart *pt2tp;
++              pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
++              yaffs_PackTags2TagsPart(pt2tp, tags);
+       } else
+-              BUG(); /* both tags and data should always be present */
+-#else
+-      if (tags) {
+               yaffs_PackTags2(&pt, tags);
+-      }
+ 
+-      if (data && tags) {
+-              if (dev->useNANDECC)
+-                      retval =
+-                          mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
+-                                         &dummy, data, (__u8 *) & pt, NULL);
+-              else
+-                      retval =
+-                          mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
+-                                         &dummy, data, (__u8 *) & pt, NULL);
+-      } else {
+-              if (data)
+-                      retval =
+-                          mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
+-                                     data);
+-              if (tags)
+-                      retval =
+-                          mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
+-                                         (__u8 *) & pt);
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++      ops.mode = MTD_OOB_AUTO;
++      ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
++      ops.len = dev->totalBytesPerChunk;
++      ops.ooboffs = 0;
++      ops.datbuf = (__u8 *)data;
++      ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
++      retval = mtd->write_oob(mtd, addr, &ops);
+ 
++#else
++      if (!dev->inbandTags) {
++              retval =
++                  mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
++                                 &dummy, data, (__u8 *) &pt, NULL);
++      } else {
++              retval =
++                  mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
++                             data);
+       }
+ #endif
+ 
+@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
+               return YAFFS_FAIL;
+ }
+ 
+-int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
+-                                     __u8 * data, yaffs_ExtendedTags * tags)
++int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
++                                     __u8 *data, yaffs_ExtendedTags *tags)
+ {
+       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       struct mtd_oob_ops ops;
+ #endif
+       size_t dummy;
+       int retval = 0;
++      int localData = 0;
+ 
+-      loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
++      loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
+ 
+       yaffs_PackedTags2 pt;
+ 
+@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
+          ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
+           TENDSTR), chunkInNAND, data, tags));
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+-      if (data && !tags)
+-              retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
++      if (dev->inbandTags) {
++
++              if (!data) {
++                      localData = 1;
++                      data = yaffs_GetTempBuffer(dev, __LINE__);
++              }
++
++
++      }
++
++
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
++      if (dev->inbandTags || (data && !tags))
++              retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
+                               &dummy, data);
+       else if (tags) {
+               ops.mode = MTD_OOB_AUTO;
+@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
+               retval = mtd->read_oob(mtd, addr, &ops);
+       }
+ #else
+-      if (data && tags) {
+-              if (dev->useNANDECC) {
+-                      retval =
+-                          mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
+-                                        &dummy, data, dev->spareBuffer,
+-                                        NULL);
+-              } else {
+-                      retval =
+-                          mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
++      if (!dev->inbandTags && data && tags) {
++
++              retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
+                                         &dummy, data, dev->spareBuffer,
+                                         NULL);
+-              }
+       } else {
+               if (data)
+                       retval =
+                           mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
+                                     data);
+-              if (tags)
++              if (!dev->inbandTags && tags)
+                       retval =
+                           mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
+                                         dev->spareBuffer);
+       }
+ #endif
+ 
+-      memcpy(&pt, dev->spareBuffer, sizeof(pt));
+ 
+-      if (tags)
+-              yaffs_UnpackTags2(tags, &pt);
++      if (dev->inbandTags) {
++              if (tags) {
++                      yaffs_PackedTags2TagsPart *pt2tp;
++                      pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
++                      yaffs_UnpackTags2TagsPart(tags, pt2tp);
++              }
++      } else {
++              if (tags) {
++                      memcpy(&pt, dev->spareBuffer, sizeof(pt));
++                      yaffs_UnpackTags2(tags, &pt);
++              }
++      }
+ 
+-      if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+-              tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
++      if (localData)
++              yaffs_ReleaseTempBuffer(dev, data, __LINE__);
+ 
++      if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
++              tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
+       retval =
+           mtd->block_markbad(mtd,
+                              blockNo * dev->nChunksPerBlock *
+-                             dev->nDataBytesPerChunk);
++                             dev->totalBytesPerChunk);
+ 
+       if (retval == 0)
+               return YAFFS_OK;
+@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
+ }
+ 
+ int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
+-                          yaffs_BlockState * state, int *sequenceNumber)
++                          yaffs_BlockState *state, __u32 *sequenceNumber)
+ {
+       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       int retval;
+@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
+       retval =
+           mtd->block_isbad(mtd,
+                            blockNo * dev->nChunksPerBlock *
+-                           dev->nDataBytesPerChunk);
++                           dev->totalBytesPerChunk);
+ 
+       if (retval) {
+               T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
+--- a/fs/yaffs2/yaffs_mtdif2.h
++++ b/fs/yaffs2/yaffs_mtdif2.h
+@@ -17,13 +17,13 @@
+ #define __YAFFS_MTDIF2_H__
+ 
+ #include "yaffs_guts.h"
+-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
+-                                    const __u8 * data,
+-                                    const yaffs_ExtendedTags * tags);
+-int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
+-                                     __u8 * data, yaffs_ExtendedTags * tags);
++int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
++                              const __u8 *data,
++                              const yaffs_ExtendedTags *tags);
++int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
++                              __u8 *data, yaffs_ExtendedTags *tags);
+ int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
+ int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
+-                          yaffs_BlockState * state, int *sequenceNumber);
++                      yaffs_BlockState *state, __u32 *sequenceNumber);
+ 
+ #endif
+--- a/fs/yaffs2/yaffs_mtdif.c
++++ b/fs/yaffs2/yaffs_mtdif.c
+@@ -12,7 +12,7 @@
+  */
+ 
+ const char *yaffs_mtdif_c_version =
+-    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
++      "$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
+ 
+ #include "yportenv.h"
+ 
+@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
+ #include "linux/time.h"
+ #include "linux/mtd/nand.h"
+ 
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
++#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
+ static struct nand_oobinfo yaffs_oobinfo = {
+       .useecc = 1,
+       .eccbytes = 6,
+@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
+ };
+ #endif
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+ static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
+ {
+       oob[0] = spare->tagByte0;
+@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
+       oob[3] = spare->tagByte3;
+       oob[4] = spare->tagByte4;
+       oob[5] = spare->tagByte5 & 0x3f;
+-      oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
+-      oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
++      oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
++      oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
+       oob[6] = spare->tagByte6;
+       oob[7] = spare->tagByte7;
+ }
+@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
+ }
+ #endif
+ 
+-int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
+-                           const __u8 * data, const yaffs_Spare * spare)
++int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
++                           const __u8 *data, const yaffs_Spare *spare)
+ {
+       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       struct mtd_oob_ops ops;
+ #endif
+       size_t dummy;
+       int retval = 0;
+ 
+       loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       __u8 spareAsBytes[8]; /* OOB */
+ 
+       if (data && !spare)
+@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
+               return YAFFS_FAIL;
+ }
+ 
+-int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
+-                            yaffs_Spare * spare)
++int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
++                            yaffs_Spare *spare)
+ {
+       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       struct mtd_oob_ops ops;
+ #endif
+       size_t dummy;
+       int retval = 0;
+ 
+       loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
++#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       __u8 spareAsBytes[8]; /* OOB */
+ 
+       if (data && !spare)
+@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
+               return YAFFS_FAIL;
+ }
+ 
+-int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
++int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
+ {
+       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       __u32 addr =
+@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
+               return YAFFS_FAIL;
+ }
+ 
+-int nandmtd_InitialiseNAND(yaffs_Device * dev)
++int nandmtd_InitialiseNAND(yaffs_Device *dev)
+ {
+       return YAFFS_OK;
+ }
+--- a/fs/yaffs2/yaffs_mtdif.h
++++ b/fs/yaffs2/yaffs_mtdif.h
+@@ -18,10 +18,15 @@
+ 
+ #include "yaffs_guts.h"
+ 
+-int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
+-                           const __u8 * data, const yaffs_Spare * spare);
+-int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
+-                            yaffs_Spare * spare);
+-int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
+-int nandmtd_InitialiseNAND(yaffs_Device * dev);
++#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
++extern struct nand_oobinfo yaffs_oobinfo;
++extern struct nand_oobinfo yaffs_noeccinfo;
++#endif
++
++int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
++                      const __u8 *data, const yaffs_Spare *spare);
++int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
++                      yaffs_Spare *spare);
++int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
++int nandmtd_InitialiseNAND(yaffs_Device *dev);
+ #endif
+--- a/fs/yaffs2/yaffs_nand.c
++++ b/fs/yaffs2/yaffs_nand.c
+@@ -12,16 +12,17 @@
+  */
+ 
+ const char *yaffs_nand_c_version =
+-    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
++      "$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
+ 
+ #include "yaffs_nand.h"
+ #include "yaffs_tagscompat.h"
+ #include "yaffs_tagsvalidity.h"
+ 
++#include "yaffs_getblockinfo.h"
+ 
+-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
+-                                         __u8 * buffer,
+-                                         yaffs_ExtendedTags * tags)
++int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
++                                         __u8 *buffer,
++                                         yaffs_ExtendedTags *tags)
+ {
+       int result;
+       yaffs_ExtendedTags localTags;
+@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
+       int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
+ 
+       /* If there are no tags provided, use local tags to get prioritised gc working */
+-      if(!tags)
++      if (!tags)
+               tags = &localTags;
+ 
+       if (dev->readChunkWithTagsFromNAND)
+@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
+                                                                       realignedChunkInNAND,
+                                                                       buffer,
+                                                                       tags);
+-      if(tags &&
+-         tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
++      if (tags &&
++         tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
+ 
+               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
+-                yaffs_HandleChunkError(dev,bi);
++              yaffs_HandleChunkError(dev, bi);
+       }
+ 
+       return result;
+ }
+ 
+-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
++int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
+                                                  int chunkInNAND,
+-                                                 const __u8 * buffer,
+-                                                 yaffs_ExtendedTags * tags)
++                                                 const __u8 *buffer,
++                                                 yaffs_ExtendedTags *tags)
+ {
+       chunkInNAND -= dev->chunkOffset;
+ 
+@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
+                                                                      tags);
+ }
+ 
+-int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
++int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
+ {
+       blockNo -= dev->blockOffset;
+ 
+@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
+               return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
+ }
+ 
+-int yaffs_QueryInitialBlockState(yaffs_Device * dev,
++int yaffs_QueryInitialBlockState(yaffs_Device *dev,
+                                                int blockNo,
+-                                               yaffs_BlockState * state,
+-                                               unsigned *sequenceNumber)
++                                               yaffs_BlockState *state,
++                                               __u32 *sequenceNumber)
+ {
+       blockNo -= dev->blockOffset;
+ 
+--- a/fs/yaffs2/yaffs_nandemul2k.h
++++ b/fs/yaffs2/yaffs_nandemul2k.h
+@@ -21,14 +21,14 @@
+ #include "yaffs_guts.h"
+ 
+ int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
+-                                      int chunkInNAND, const __u8 * data,
+-                                      yaffs_ExtendedTags * tags);
++                                      int chunkInNAND, const __u8 *data,
++                                      const yaffs_ExtendedTags *tags);
+ int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
+-                                       int chunkInNAND, __u8 * data,
+-                                       yaffs_ExtendedTags * tags);
++                                       int chunkInNAND, __u8 *data,
++                                       yaffs_ExtendedTags *tags);
+ int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
+ int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
+-                            yaffs_BlockState * state, int *sequenceNumber);
++                            yaffs_BlockState *state, __u32 *sequenceNumber);
+ int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
+                               int blockInNAND);
+ int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
+--- a/fs/yaffs2/yaffs_nand.h
++++ b/fs/yaffs2/yaffs_nand.h
+@@ -19,21 +19,21 @@
+ 
+ 
+ 
+-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
+-                                         __u8 * buffer,
+-                                         yaffs_ExtendedTags * tags);
+-
+-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
+-                                                 int chunkInNAND,
+-                                                 const __u8 * buffer,
+-                                                 yaffs_ExtendedTags * tags);
+-
+-int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
+-
+-int yaffs_QueryInitialBlockState(yaffs_Device * dev,
+-                                               int blockNo,
+-                                               yaffs_BlockState * state,
+-                                               unsigned *sequenceNumber);
++int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
++                                      __u8 *buffer,
++                                      yaffs_ExtendedTags *tags);
++
++int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
++                                              int chunkInNAND,
++                                              const __u8 *buffer,
++                                              yaffs_ExtendedTags *tags);
++
++int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
++
++int yaffs_QueryInitialBlockState(yaffs_Device *dev,
++                                              int blockNo,
++                                              yaffs_BlockState *state,
++                                              unsigned *sequenceNumber);
+ 
+ int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
+                                 int blockInNAND);
+--- a/fs/yaffs2/yaffs_packedtags1.c
++++ b/fs/yaffs2/yaffs_packedtags1.c
+@@ -14,7 +14,7 @@
+ #include "yaffs_packedtags1.h"
+ #include "yportenv.h"
+ 
+-void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
++void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
+ {
+       pt->chunkId = t->chunkId;
+       pt->serialNumber = t->serialNumber;
+@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
+ 
+ }
+ 
+-void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
++void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
+ {
+       static const __u8 allFF[] =
+           { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
+ 
+       if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
+               t->blockBad = 0;
+-              if (pt->shouldBeFF != 0xFFFFFFFF) {
++              if (pt->shouldBeFF != 0xFFFFFFFF)
+                       t->blockBad = 1;
+-              }
+               t->chunkUsed = 1;
+               t->objectId = pt->objectId;
+               t->chunkId = pt->chunkId;
+@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
+               t->serialNumber = pt->serialNumber;
+       } else {
+               memset(t, 0, sizeof(yaffs_ExtendedTags));
+-
+       }
+ }
+--- a/fs/yaffs2/yaffs_packedtags1.h
++++ b/fs/yaffs2/yaffs_packedtags1.h
+@@ -32,6 +32,6 @@ typedef struct {
+ 
+ } yaffs_PackedTags1;
+ 
+-void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
+-void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
++void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
++void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
+ #endif
+--- a/fs/yaffs2/yaffs_packedtags2.c
++++ b/fs/yaffs2/yaffs_packedtags2.c
+@@ -37,60 +37,68 @@
+ #define EXTRA_OBJECT_TYPE_SHIFT (28)
+ #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
+ 
+-static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
++
++static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
+ {
+       T(YAFFS_TRACE_MTD,
+         (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
+-         pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
+-         pt->t.sequenceNumber));
++         ptt->objectId, ptt->chunkId, ptt->byteCount,
++         ptt->sequenceNumber));
++}
++static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
++{
++      yaffs_DumpPackedTags2TagsPart(&pt->t);
+ }
+ 
+-static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
++static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
+ {
+       T(YAFFS_TRACE_MTD,
+         (TSTR
+-         ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
+-          "%d del %d ser %d seq %d"
++         ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
+           TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
+          t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
+          t->sequenceNumber));
+ 
+ }
+ 
+-void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
++void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
++              const yaffs_ExtendedTags *t)
+ {
+-      pt->t.chunkId = t->chunkId;
+-      pt->t.sequenceNumber = t->sequenceNumber;
+-      pt->t.byteCount = t->byteCount;
+-      pt->t.objectId = t->objectId;
++      ptt->chunkId = t->chunkId;
++      ptt->sequenceNumber = t->sequenceNumber;
++      ptt->byteCount = t->byteCount;
++      ptt->objectId = t->objectId;
+ 
+       if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
+               /* Store the extra header info instead */
+               /* We save the parent object in the chunkId */
+-              pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
++              ptt->chunkId = EXTRA_HEADER_INFO_FLAG
+                       | t->extraParentObjectId;
+-              if (t->extraIsShrinkHeader) {
+-                      pt->t.chunkId |= EXTRA_SHRINK_FLAG;
+-              }
+-              if (t->extraShadows) {
+-                      pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
+-              }
++              if (t->extraIsShrinkHeader)
++                      ptt->chunkId |= EXTRA_SHRINK_FLAG;
++              if (t->extraShadows)
++                      ptt->chunkId |= EXTRA_SHADOWS_FLAG;
+ 
+-              pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
+-              pt->t.objectId |=
++              ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
++              ptt->objectId |=
+                   (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
+ 
+-              if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
+-                      pt->t.byteCount = t->extraEquivalentObjectId;
+-              } else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
+-                      pt->t.byteCount = t->extraFileLength;
+-              } else {
+-                      pt->t.byteCount = 0;
+-              }
++              if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
++                      ptt->byteCount = t->extraEquivalentObjectId;
++              else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
++                      ptt->byteCount = t->extraFileLength;
++              else
++                      ptt->byteCount = 0;
+       }
+ 
+-      yaffs_DumpPackedTags2(pt);
++      yaffs_DumpPackedTags2TagsPart(ptt);
+       yaffs_DumpTags2(t);
++}
++
++
++void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
++{
++      yaffs_PackTags2TagsPart(&pt->t, t);
+ 
+ #ifndef YAFFS_IGNORE_TAGS_ECC
+       {
+@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
+ #endif
+ }
+ 
+-void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
++
++void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
++              yaffs_PackedTags2TagsPart *ptt)
+ {
+ 
+       memset(t, 0, sizeof(yaffs_ExtendedTags));
+ 
+       yaffs_InitialiseTags(t);
+ 
+-      if (pt->t.sequenceNumber != 0xFFFFFFFF) {
+-              /* Page is in use */
+-#ifdef YAFFS_IGNORE_TAGS_ECC
+-              {
+-                      t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
+-              }
+-#else
+-              {
+-                      yaffs_ECCOther ecc;
+-                      int result;
+-                      yaffs_ECCCalculateOther((unsigned char *)&pt->t,
+-                                              sizeof
+-                                              (yaffs_PackedTags2TagsPart),
+-                                              &ecc);
+-                      result =
+-                          yaffs_ECCCorrectOther((unsigned char *)&pt->t,
+-                                                sizeof
+-                                                (yaffs_PackedTags2TagsPart),
+-                                                &pt->ecc, &ecc);
+-                      switch(result){
+-                              case 0:
+-                                      t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
+-                                      break;
+-                              case 1:
+-                                      t->eccResult = YAFFS_ECC_RESULT_FIXED;
+-                                      break;
+-                              case -1:
+-                                      t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+-                                      break;
+-                              default:
+-                                      t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
+-                      }
+-              }
+-#endif
++      if (ptt->sequenceNumber != 0xFFFFFFFF) {
+               t->blockBad = 0;
+               t->chunkUsed = 1;
+-              t->objectId = pt->t.objectId;
+-              t->chunkId = pt->t.chunkId;
+-              t->byteCount = pt->t.byteCount;
++              t->objectId = ptt->objectId;
++              t->chunkId = ptt->chunkId;
++              t->byteCount = ptt->byteCount;
+               t->chunkDeleted = 0;
+               t->serialNumber = 0;
+-              t->sequenceNumber = pt->t.sequenceNumber;
++              t->sequenceNumber = ptt->sequenceNumber;
+ 
+               /* Do extra header info stuff */
+ 
+-              if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
++              if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
+                       t->chunkId = 0;
+                       t->byteCount = 0;
+ 
+                       t->extraHeaderInfoAvailable = 1;
+                       t->extraParentObjectId =
+-                          pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
++                          ptt->chunkId & (~(ALL_EXTRA_FLAGS));
+                       t->extraIsShrinkHeader =
+-                          (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
++                          (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
+                       t->extraShadows =
+-                          (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
++                          (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
+                       t->extraObjectType =
+-                          pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
++                          ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
+                       t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
+ 
+-                      if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
+-                              t->extraEquivalentObjectId = pt->t.byteCount;
+-                      } else {
+-                              t->extraFileLength = pt->t.byteCount;
++                      if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
++                              t->extraEquivalentObjectId = ptt->byteCount;
++                      else
++                              t->extraFileLength = ptt->byteCount;
++              }
++      }
++
++      yaffs_DumpPackedTags2TagsPart(ptt);
++      yaffs_DumpTags2(t);
++
++}
++
++
++void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
++{
++
++      yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
++
++      if (pt->t.sequenceNumber != 0xFFFFFFFF) {
++              /* Page is in use */
++#ifndef YAFFS_IGNORE_TAGS_ECC
++              {
++                      yaffs_ECCOther ecc;
++                      int result;
++                      yaffs_ECCCalculateOther((unsigned char *)&pt->t,
++                                              sizeof
++                                              (yaffs_PackedTags2TagsPart),
++                                              &ecc);
++                      result =
++                          yaffs_ECCCorrectOther((unsigned char *)&pt->t,
++                                                sizeof
++                                                (yaffs_PackedTags2TagsPart),
++                                                &pt->ecc, &ecc);
++                      switch (result) {
++                      case 0:
++                              eccResult = YAFFS_ECC_RESULT_NO_ERROR;
++                              break;
++                      case 1:
++                              eccResult = YAFFS_ECC_RESULT_FIXED;
++                              break;
++                      case -1:
++                              eccResult = YAFFS_ECC_RESULT_UNFIXED;
++                              break;
++                      default:
++                              eccResult = YAFFS_ECC_RESULT_UNKNOWN;
+                       }
+               }
++#endif
+       }
+ 
++      yaffs_UnpackTags2TagsPart(t, &pt->t);
++
++      t->eccResult = eccResult;
++
+       yaffs_DumpPackedTags2(pt);
+       yaffs_DumpTags2(t);
+ 
+ }
++
+--- a/fs/yaffs2/yaffs_packedtags2.h
++++ b/fs/yaffs2/yaffs_packedtags2.h
+@@ -33,6 +33,11 @@ typedef struct {
+       yaffs_ECCOther ecc;
+ } yaffs_PackedTags2;
+ 
+-void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
+-void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
++/* Full packed tags with ECC, used for oob tags */
++void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
++void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
++
++/* Only the tags part (no ECC for use with inband tags */
++void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
++void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
+ #endif
+--- a/fs/yaffs2/yaffs_qsort.c
++++ b/fs/yaffs2/yaffs_qsort.c
+@@ -28,12 +28,12 @@
+  */
+ 
+ #include "yportenv.h"
+-//#include <linux/string.h>
++/* #include <linux/string.h> */
+ 
+ /*
+  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
+  */
+-#define swapcode(TYPE, parmi, parmj, n) {             \
++#define swapcode(TYPE, parmi, parmj, n) do {          \
+       long i = (n) / sizeof (TYPE);                   \
+       register TYPE *pi = (TYPE *) (parmi);           \
+       register TYPE *pj = (TYPE *) (parmj);           \
+@@ -41,28 +41,29 @@
+               register TYPE   t = *pi;                \
+               *pi++ = *pj;                            \
+               *pj++ = t;                              \
+-        } while (--i > 0);                            \
+-}
++      } while (--i > 0);                              \
++} while (0)
+ 
+ #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
+-      es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
++      es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
+ 
+ static __inline void
+ swapfunc(char *a, char *b, int n, int swaptype)
+ {
+       if (swaptype <= 1)
+-              swapcode(long, a, b, n)
++              swapcode(long, a, b, n);
+       else
+-              swapcode(char, a, b, n)
++              swapcode(char, a, b, n);
+ }
+ 
+-#define swap(a, b)                                    \
++#define yswap(a, b) do {                                      \
+       if (swaptype == 0) {                            \
+               long t = *(long *)(a);                  \
+               *(long *)(a) = *(long *)(b);            \
+               *(long *)(b) = t;                       \
+       } else                                          \
+-              swapfunc(a, b, es, swaptype)
++              swapfunc(a, b, es, swaptype);           \
++} while (0)
+ 
+ #define vecswap(a, b, n)      if ((n) > 0) swapfunc(a, b, n, swaptype)
+ 
+@@ -70,12 +71,12 @@ static __inline char *
+ med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
+ {
+       return cmp(a, b) < 0 ?
+-             (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
+-              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
++              (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
++              : (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
+ }
+ 
+ #ifndef min
+-#define min(a,b) (((a) < (b)) ? (a) : (b))
++#define min(a, b) (((a) < (b)) ? (a) : (b))
+ #endif
+ 
+ void
+@@ -92,7 +93,7 @@ loop:        SWAPINIT(a, es);
+               for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
+                       for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
+                            pl -= es)
+-                              swap(pl, pl - es);
++                              yswap(pl, pl - es);
+               return;
+       }
+       pm = (char *)a + (n / 2) * es;
+@@ -107,7 +108,7 @@ loop:      SWAPINIT(a, es);
+               }
+               pm = med3(pl, pm, pn, cmp);
+       }
+-      swap(a, pm);
++      yswap(a, pm);
+       pa = pb = (char *)a + es;
+ 
+       pc = pd = (char *)a + (n - 1) * es;
+@@ -115,7 +116,7 @@ loop:      SWAPINIT(a, es);
+               while (pb <= pc && (r = cmp(pb, a)) <= 0) {
+                       if (r == 0) {
+                               swap_cnt = 1;
+-                              swap(pa, pb);
++                              yswap(pa, pb);
+                               pa += es;
+                       }
+                       pb += es;
+@@ -123,14 +124,14 @@ loop:    SWAPINIT(a, es);
+               while (pb <= pc && (r = cmp(pc, a)) >= 0) {
+                       if (r == 0) {
+                               swap_cnt = 1;
+-                              swap(pc, pd);
++                              yswap(pc, pd);
+                               pd -= es;
+                       }
+                       pc -= es;
+               }
+               if (pb > pc)
+                       break;
+-              swap(pb, pc);
++              yswap(pb, pc);
+               swap_cnt = 1;
+               pb += es;
+               pc -= es;
+@@ -139,7 +140,7 @@ loop:      SWAPINIT(a, es);
+               for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
+                       for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
+                            pl -= es)
+-                              swap(pl, pl - es);
++                              yswap(pl, pl - es);
+               return;
+       }
+ 
+@@ -148,9 +149,11 @@ loop:     SWAPINIT(a, es);
+       vecswap(a, pb - r, r);
+       r = min((long)(pd - pc), (long)(pn - pd - es));
+       vecswap(pb, pn - r, r);
+-      if ((r = pb - pa) > es)
++      r = pb - pa;
++      if (r > es)
+               yaffs_qsort(a, r / es, es, cmp);
+-      if ((r = pd - pc) > es) {
++      r = pd - pc;
++      if (r > es) {
+               /* Iterate rather than recurse to save stack space */
+               a = pn - r;
+               n = r / es;
+--- a/fs/yaffs2/yaffs_qsort.h
++++ b/fs/yaffs2/yaffs_qsort.h
+@@ -17,7 +17,7 @@
+ #ifndef __YAFFS_QSORT_H__
+ #define __YAFFS_QSORT_H__
+ 
+-extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
+-                   int (*cmp)(const void *, const void *));
++extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
++                      int (*cmp)(const void *, const void *));
+ 
+ #endif
+--- a/fs/yaffs2/yaffs_tagscompat.c
++++ b/fs/yaffs2/yaffs_tagscompat.c
+@@ -14,16 +14,17 @@
+ #include "yaffs_guts.h"
+ #include "yaffs_tagscompat.h"
+ #include "yaffs_ecc.h"
++#include "yaffs_getblockinfo.h"
+ 
+-static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
++static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
+ #ifdef NOTYET
+-static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
+-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
+-                                   const __u8 * data,
+-                                   const yaffs_Spare * spare);
+-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
+-                                  const yaffs_Spare * spare);
+-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
++static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
++static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
++                                   const __u8 *data,
++                                   const yaffs_Spare *spare);
++static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
++                                  const yaffs_Spare *spare);
++static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
+ #endif
+ 
+ static const char yaffs_countBitsTable[256] = {
+@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
+ 
+ /********** Tags ECC calculations  *********/
+ 
+-void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
++void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
+ {
+       yaffs_ECCCalculate(data, spare->ecc1);
+       yaffs_ECCCalculate(&data[256], spare->ecc2);
+ }
+ 
+-void yaffs_CalcTagsECC(yaffs_Tags * tags)
++void yaffs_CalcTagsECC(yaffs_Tags *tags)
+ {
+       /* Calculate an ecc */
+ 
+@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
+       for (i = 0; i < 8; i++) {
+               for (j = 1; j & 0xff; j <<= 1) {
+                       bit++;
+-                      if (b[i] & j) {
++                      if (b[i] & j)
+                               ecc ^= bit;
+-                      }
+               }
+       }
+ 
+@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
+ 
+ }
+ 
+-int yaffs_CheckECCOnTags(yaffs_Tags * tags)
++int yaffs_CheckECCOnTags(yaffs_Tags *tags)
+ {
+       unsigned ecc = tags->ecc;
+ 
+@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
+ 
+ /********** Tags **********/
+ 
+-static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
+-                                  yaffs_Tags * tagsPtr)
++static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
++                              yaffs_Tags *tagsPtr)
+ {
+       yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
+ 
+@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
+       sparePtr->tagByte7 = tu->asBytes[7];
+ }
+ 
+-static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
+-                                 yaffs_Tags * tagsPtr)
++static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
++                              yaffs_Tags *tagsPtr)
+ {
+       yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
+       int result;
+@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
+       tu->asBytes[7] = sparePtr->tagByte7;
+ 
+       result = yaffs_CheckECCOnTags(tagsPtr);
+-      if (result > 0) {
++      if (result > 0)
+               dev->tagsEccFixed++;
+-      } else if (result < 0) {
++      else if (result < 0)
+               dev->tagsEccUnfixed++;
+-      }
+ }
+ 
+-static void yaffs_SpareInitialise(yaffs_Spare * spare)
++static void yaffs_SpareInitialise(yaffs_Spare *spare)
+ {
+       memset(spare, 0xFF, sizeof(yaffs_Spare));
+ }
+ 
+ static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
+-                                int chunkInNAND, const __u8 * data,
+-                                yaffs_Spare * spare)
++                              int chunkInNAND, const __u8 *data,
++                              yaffs_Spare *spare)
+ {
+       if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
+               T(YAFFS_TRACE_ERROR,
+@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
+ 
+ static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
+                                  int chunkInNAND,
+-                                 __u8 * data,
+-                                 yaffs_Spare * spare,
+-                                 yaffs_ECCResult * eccResult,
++                                 __u8 *data,
++                                 yaffs_Spare *spare,
++                                 yaffs_ECCResult *eccResult,
+                                  int doErrorCorrection)
+ {
+       int retVal;
+@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
+               /* Must allocate enough memory for spare+2*sizeof(int) */
+               /* for ecc results from device. */
+               struct yaffs_NANDSpare nspare;
+-              retVal =
+-                  dev->readChunkFromNAND(dev, chunkInNAND, data,
+-                                         (yaffs_Spare *) & nspare);
++
++              memset(&nspare, 0, sizeof(nspare));
++
++              retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
++                                      (yaffs_Spare *) &nspare);
+               memcpy(spare, &nspare, sizeof(yaffs_Spare));
+               if (data && doErrorCorrection) {
+                       if (nspare.eccres1 > 0) {
+@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
+ static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
+                                 int chunkInNAND)
+ {
+-
+-      static int init = 0;
++      static int init;
+       static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
+       static __u8 data[YAFFS_BYTES_PER_CHUNK];
+       /* Might as well always allocate the larger size for */
+@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
+  * Functions for robustisizing
+  */
+ 
+-static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
++static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
+ {
+       int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
+ 
+       /* Mark the block for retirement */
+-      yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
++      yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
+       T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+         (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
+ 
+@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
+ }
+ 
+ #ifdef NOTYET
+-static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
++static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
+ {
+ }
+ 
+-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
+-                                   const __u8 * data,
+-                                   const yaffs_Spare * spare)
++static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
++                                   const __u8 *data,
++                                   const yaffs_Spare *spare)
+ {
+ }
+ 
+-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
+-                                  const yaffs_Spare * spare)
++static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
++                                  const yaffs_Spare *spare)
+ {
+ }
+ 
+-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
++static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
+ {
+       int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
+ 
+@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
+       yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
+ }
+ 
+-static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
+-                             const yaffs_Spare * s0, const yaffs_Spare * s1)
++static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
++                             const yaffs_Spare *s0, const yaffs_Spare *s1)
+ {
+ 
+       if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
+@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
+ }
+ #endif                                /* NOTYET */
+ 
+-int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
+-                                                  int chunkInNAND,
+-                                                  const __u8 * data,
+-                                                  const yaffs_ExtendedTags *
+-                                                  eTags)
++int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
++                                              int chunkInNAND,
++                                              const __u8 *data,
++                                              const yaffs_ExtendedTags *eTags)
+ {
+       yaffs_Spare spare;
+       yaffs_Tags tags;
+ 
+       yaffs_SpareInitialise(&spare);
+ 
+-      if (eTags->chunkDeleted) {
++      if (eTags->chunkDeleted)
+               spare.pageStatus = 0;
+-      } else {
++      else {
+               tags.objectId = eTags->objectId;
+               tags.chunkId = eTags->chunkId;
+-              tags.byteCount = eTags->byteCount;
++
++              tags.byteCountLSB = eTags->byteCount & 0x3ff;
++
++              if (dev->nDataBytesPerChunk >= 1024)
++                      tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
++              else
++                      tags.byteCountMSB = 3;
++
++
+               tags.serialNumber = eTags->serialNumber;
+ 
+-              if (!dev->useNANDECC && data) {
++              if (!dev->useNANDECC && data)
+                       yaffs_CalcECC(data, &spare);
+-              }
++
+               yaffs_LoadTagsIntoSpare(&spare, &tags);
+ 
+       }
+@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
+       return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
+ }
+ 
+-int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
++int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
+                                                    int chunkInNAND,
+-                                                   __u8 * data,
+-                                                   yaffs_ExtendedTags * eTags)
++                                                   __u8 *data,
++                                                   yaffs_ExtendedTags *eTags)
+ {
+ 
+       yaffs_Spare spare;
+       yaffs_Tags tags;
+-      yaffs_ECCResult eccResult;
++      yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
+ 
+       static yaffs_Spare spareFF;
+       static int init;
+@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
+ 
+                               eTags->objectId = tags.objectId;
+                               eTags->chunkId = tags.chunkId;
+-                              eTags->byteCount = tags.byteCount;
++                              eTags->byteCount = tags.byteCountLSB;
++
++                              if (dev->nDataBytesPerChunk >= 1024)
++                                      eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
++
+                               eTags->serialNumber = tags.serialNumber;
+                       }
+               }
+@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
+ }
+ 
+ int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
+-                                        int blockNo, yaffs_BlockState *
+-                                        state,
+-                                        int *sequenceNumber)
++                                        int blockNo,
++                                        yaffs_BlockState *state,
++                                        __u32 *sequenceNumber)
+ {
+ 
+       yaffs_Spare spare0, spare1;
+--- a/fs/yaffs2/yaffs_tagscompat.h
++++ b/fs/yaffs2/yaffs_tagscompat.h
+@@ -17,24 +17,23 @@
+ #define __YAFFS_TAGSCOMPAT_H__
+ 
+ #include "yaffs_guts.h"
+-int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
+-                                                  int chunkInNAND,
+-                                                  const __u8 * data,
+-                                                  const yaffs_ExtendedTags *
+-                                                  tags);
+-int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
+-                                                   int chunkInNAND,
+-                                                   __u8 * data,
+-                                                   yaffs_ExtendedTags *
+-                                                   tags);
++int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
++                                              int chunkInNAND,
++                                              const __u8 *data,
++                                              const yaffs_ExtendedTags *tags);
++int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
++                                              int chunkInNAND,
++                                              __u8 *data,
++                                              yaffs_ExtendedTags *tags);
+ int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
+                                           int blockNo);
+ int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
+-                                        int blockNo, yaffs_BlockState *
+-                                        state, int *sequenceNumber);
++                                        int blockNo,
++                                        yaffs_BlockState *state,
++                                        __u32 *sequenceNumber);
+ 
+-void yaffs_CalcTagsECC(yaffs_Tags * tags);
+-int yaffs_CheckECCOnTags(yaffs_Tags * tags);
++void yaffs_CalcTagsECC(yaffs_Tags *tags);
++int yaffs_CheckECCOnTags(yaffs_Tags *tags);
+ int yaffs_CountBits(__u8 byte);
+ 
+ #endif
+--- a/fs/yaffs2/yaffs_tagsvalidity.c
++++ b/fs/yaffs2/yaffs_tagsvalidity.c
+@@ -13,14 +13,14 @@
+ 
+ #include "yaffs_tagsvalidity.h"
+ 
+-void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
++void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
+ {
+       memset(tags, 0, sizeof(yaffs_ExtendedTags));
+       tags->validMarker0 = 0xAAAAAAAA;
+       tags->validMarker1 = 0x55555555;
+ }
+ 
+-int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
++int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
+ {
+       return (tags->validMarker0 == 0xAAAAAAAA &&
+               tags->validMarker1 == 0x55555555);
+--- a/fs/yaffs2/yaffs_tagsvalidity.h
++++ b/fs/yaffs2/yaffs_tagsvalidity.h
+@@ -19,6 +19,6 @@
+ 
+ #include "yaffs_guts.h"
+ 
+-void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
+-int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
++void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
++int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
+ #endif
+--- a/fs/yaffs2/yportenv.h
++++ b/fs/yaffs2/yportenv.h
+@@ -17,17 +17,28 @@
+ #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))
++
+ #if defined CONFIG_YAFFS_WINCE
+ 
+ #include "ywinceenv.h"
+ 
+-#elif  defined __KERNEL__
++#elif defined __KERNEL__
+ 
+ #include "moduleconfig.h"
+ 
+ /* Linux kernel */
++
+ #include <linux/version.h>
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#define MTD_VERSION_CODE LINUX_VERSION_CODE
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+ #include <linux/config.h>
+ #endif
+ #include <linux/kernel.h>
+@@ -40,12 +51,13 @@
+ #define YCHAR char
+ #define YUCHAR unsigned char
+ #define _Y(x)     x
+-#define yaffs_strcpy(a,b)    strcpy(a,b)
+-#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
+-#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
+-#define yaffs_strlen(s)            strlen(s)
+-#define yaffs_sprintf      sprintf
+-#define yaffs_toupper(a)     toupper(a)
++#define yaffs_strcat(a, b)     strcat(a, b)
++#define yaffs_strcpy(a, b)     strcpy(a, b)
++#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
++#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
++#define yaffs_strlen(s)              strlen(s)
++#define yaffs_sprintf        sprintf
++#define yaffs_toupper(a)       toupper(a)
+ 
+ #define Y_INLINE inline
+ 
+@@ -53,19 +65,19 @@
+ #define YAFFS_LOSTNFOUND_PREFIX               "obj"
+ 
+ /* #define YPRINTF(x) printk x */
+-#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
++#define YMALLOC(x) kmalloc(x, GFP_NOFS)
+ #define YFREE(x)   kfree(x)
+ #define YMALLOC_ALT(x) vmalloc(x)
+ #define YFREE_ALT(x)   vfree(x)
+ #define YMALLOC_DMA(x) YMALLOC(x)
+ 
+-// KR - added for use in scan so processes aren't blocked indefinitely.
++/* KR - added for use in scan so processes aren't blocked indefinitely. */
+ #define YYIELD() schedule()
+ 
+ #define YAFFS_ROOT_MODE                       0666
+ #define YAFFS_LOSTNFOUND_MODE         0666
+ 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++#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
+@@ -73,11 +85,12 @@
+ #define Y_TIME_CONVERT(x) (x)
+ #endif
+ 
+-#define yaffs_SumCompare(x,y) ((x) == (y))
+-#define yaffs_strcmp(a,b) strcmp(a,b)
++#define yaffs_SumCompare(x, y) ((x) == (y))
++#define yaffs_strcmp(a, b) strcmp(a, b)
+ 
+ #define TENDSTR "\n"
+ #define TSTR(x) KERN_WARNING x
++#define TCONT(x) x
+ #define TOUT(p) printk p
+ 
+ #define yaffs_trace(mask, fmt, args...) \
+@@ -90,6 +103,8 @@
+ 
+ #elif defined CONFIG_YAFFS_DIRECT
+ 
++#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
++
+ /* Direct interface */
+ #include "ydirectenv.h"
+ 
+@@ -111,11 +126,12 @@
+ #define YCHAR char
+ #define YUCHAR unsigned char
+ #define _Y(x)     x
+-#define yaffs_strcpy(a,b)    strcpy(a,b)
+-#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
+-#define yaffs_strlen(s)            strlen(s)
+-#define yaffs_sprintf      sprintf
+-#define yaffs_toupper(a)     toupper(a)
++#define yaffs_strcat(a, b)     strcat(a, b)
++#define yaffs_strcpy(a, b)     strcpy(a, b)
++#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
++#define yaffs_strlen(s)              strlen(s)
++#define yaffs_sprintf        sprintf
++#define yaffs_toupper(a)       toupper(a)
+ 
+ #define Y_INLINE inline
+ 
+@@ -133,8 +149,8 @@
+ #define YAFFS_ROOT_MODE                               0666
+ #define YAFFS_LOSTNFOUND_MODE         0666
+ 
+-#define yaffs_SumCompare(x,y) ((x) == (y))
+-#define yaffs_strcmp(a,b) strcmp(a,b)
++#define yaffs_SumCompare(x, y) ((x) == (y))
++#define yaffs_strcmp(a, b) strcmp(a, b)
+ 
+ #else
+ /* Should have specified a configuration type */
+@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
+ #define YAFFS_TRACE_ALWAYS            0xF0000000
+ 
+ 
+-#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
++#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
+ 
+-#ifndef CONFIG_YAFFS_WINCE
+-#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
++#ifndef YBUG
++#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
+ #endif
+ 
+ #endif

diff --git a/target/linux/generic-2.6/patches-2.6.35/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.35/600-phy_extension.patch
new file mode 100644 (file)
index 0000000..7ae6d2a
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/600-phy_extension.patch
@@ -0,0 +1,81 @@
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -298,6 +298,50 @@ int phy_ethtool_gset(struct phy_device *
+ }
+ EXPORT_SYMBOL(phy_ethtool_gset);
+ 
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
++{
++      u32 cmd;
++      int tmp;
++      struct ethtool_cmd ecmd = { ETHTOOL_GSET };
++      struct ethtool_value edata = { ETHTOOL_GLINK };
++
++      if (get_user(cmd, (u32 *) useraddr))
++              return -EFAULT;
++
++      switch (cmd) {
++      case ETHTOOL_GSET:
++              phy_ethtool_gset(phydev, &ecmd);
++              if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
++                      return -EFAULT;
++              return 0;
++
++      case ETHTOOL_SSET:
++              if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
++                      return -EFAULT;
++              return phy_ethtool_sset(phydev, &ecmd);
++
++      case ETHTOOL_NWAY_RST:
++              /* if autoneg is off, it's an error */
++              tmp = phy_read(phydev, MII_BMCR);
++              if (tmp & BMCR_ANENABLE) {
++                      tmp |= (BMCR_ANRESTART);
++                      phy_write(phydev, MII_BMCR, tmp);
++                      return 0;
++              }
++              return -EINVAL;
++
++      case ETHTOOL_GLINK:
++              edata.data = (phy_read(phydev,
++                              MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
++              if (copy_to_user(useraddr, &edata, sizeof(edata)))
++                      return -EFAULT;
++              return 0;
++      }
++
++      return -EOPNOTSUPP;
++}
++EXPORT_SYMBOL(phy_ethtool_ioctl);
++
+ /**
+  * phy_mii_ioctl - generic PHY MII ioctl interface
+  * @phydev: the phy_device struct
+@@ -351,7 +395,7 @@ int phy_mii_ioctl(struct phy_device *phy
+               }
+ 
+               phy_write(phydev, mii_data->reg_num, val);
+-              
++
+               if (mii_data->reg_num == MII_BMCR &&
+                   val & BMCR_RESET &&
+                   phydev->drv->config_init) {
+@@ -465,7 +509,7 @@ static void phy_force_reduction(struct p
+       int idx;
+ 
+       idx = phy_find_setting(phydev->speed, phydev->duplex);
+-      
++
+       idx++;
+ 
+       idx = phy_find_valid(idx, phydev->supported);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -492,6 +492,7 @@ void phy_start_machine(struct phy_device
+ void phy_stop_machine(struct phy_device *phydev);
+ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
+ int phy_mii_ioctl(struct phy_device *phydev,
+               struct mii_ioctl_data *mii_data, int cmd);
+ int phy_start_interrupts(struct phy_device *phydev);

diff --git a/target/linux/generic-2.6/patches-2.6.35/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.35/620-phy_adm6996.patch
new file mode 100644 (file)
index 0000000..86bab7a
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/620-phy_adm6996.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -93,6 +93,11 @@ config MICREL_PHY
+       ---help---
+         Supports the KSZ9021, VSC8201, KS8001 PHYs.
+ 
++config ADM6996_PHY
++      tristate "Driver for ADM6996 switches"
++      ---help---
++        Currently supports the ADM6996F switch
++
+ config FIXED_PHY
+       bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+       depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)    += vitesse.o
+ obj-$(CONFIG_BROADCOM_PHY)    += broadcom.o
+ obj-$(CONFIG_BCM63XX_PHY)     += bcm63xx.o
+ obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
++obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
+ obj-$(CONFIG_REALTEK_PHY)     += realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY)               += fixed.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.35/630-phy_packets.patch
new file mode 100644 (file)
index 0000000..fd6d0d2
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/630-phy_packets.patch
@@ -0,0 +1,63 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
+ }
+ EXPORT_SYMBOL(phy_scan_fixups);
+ 
++static int generic_receive_skb(struct sk_buff *skb)
++{
++      skb->protocol = eth_type_trans(skb, skb->dev);
++      return netif_receive_skb(skb);
++}
++
++static int generic_rx(struct sk_buff *skb)
++{
++      skb->protocol = eth_type_trans(skb, skb->dev);
++      return netif_rx(skb);
++}
++
+ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
+ {
+       struct phy_device *dev;
+@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
+       dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
+ 
+       dev->state = PHY_DOWN;
++      dev->netif_receive_skb = &generic_receive_skb;
++      dev->netif_rx = &generic_rx;
+ 
+       mutex_init(&dev->lock);
+       INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -325,6 +325,20 @@ struct phy_device {
+       void (*adjust_link)(struct net_device *dev);
+ 
+       void (*adjust_state)(struct net_device *dev);
++
++      /*
++       * By default these point to the original functions
++       * with the same name. adding them to the phy_device
++       * allows the phy driver to override them for packet
++       * mangling if the ethernet driver supports it
++       * This is required to support some really horrible
++       * switches such as the Marvell 88E6060
++       */
++      int (*netif_receive_skb)(struct sk_buff *skb);
++      int (*netif_rx)(struct sk_buff *skb);
++
++      /* alignment offset for packets */
++      int pkt_align;
+ };
+ #define to_phy_device(d) container_of(d, struct phy_device, dev)
+ 
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -863,6 +863,7 @@ struct net_device {
+       void                    *ax25_ptr;      /* AX.25 specific data */
+       struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
+                                                  assign before registering */
++      void                    *phy_ptr; /* PHY device specific data */
+ 
+ /*
+  * Cache line mostly used on receive path (including eth_type_trans())

diff --git a/target/linux/generic-2.6/patches-2.6.35/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.35/650-swconfig.patch
new file mode 100644 (file)
index 0000000..6825037
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/650-swconfig.patch
@@ -0,0 +1,25 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -13,6 +13,12 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config SWCONFIG
++      tristate "Switch configuration API"
++      ---help---
++        Switch configuration API using netlink. This allows
++        you to configure the VLAN features of certain switches.
++
+ comment "MII PHY device drivers"
+ 
+ config MARVELL_PHY
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -3,6 +3,7 @@
+ libphy-objs                   := phy.o phy_device.o mdio_bus.o
+ 
+ obj-$(CONFIG_PHYLIB)          += libphy.o
++obj-$(CONFIG_SWCONFIG)                += swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)     += marvell.o
+ obj-$(CONFIG_DAVICOM_PHY)     += davicom.o
+ obj-$(CONFIG_CICADA_PHY)      += cicada.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.35/651-swconfig-2.6.32-fix.patch
new file mode 100644 (file)
index 0000000..b86e259
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/651-swconfig-2.6.32-fix.patch
@@ -0,0 +1,29 @@
+--- a/drivers/net/phy/swconfig.c
++++ b/drivers/net/phy/swconfig.c
+@@ -335,7 +335,7 @@ swconfig_send_multipart(struct swconfig_
+                       if (cb->close(cb, arg) < 0)
+                               goto error;
+               }
+-              err = genlmsg_unicast(cb->msg, info->snd_pid);
++              err = genlmsg_reply(cb->msg, info);
+               cb->msg = NULL;
+               if (err < 0)
+                       goto error;
+@@ -419,7 +419,7 @@ swconfig_list_attrs(struct sk_buff *skb,
+       if (!cb.msg)
+               return 0;
+ 
+-      return genlmsg_unicast(cb.msg, info->snd_pid);
++      return genlmsg_reply(cb.msg, info);
+ 
+ error:
+       if (cb.msg)
+@@ -732,7 +732,7 @@ swconfig_get_attr(struct sk_buff *skb, s
+               goto nla_put_failure;
+ 
+       swconfig_put_dev(dev);
+-      return genlmsg_unicast(msg, info->snd_pid);
++      return genlmsg_reply(msg, info);
+ 
+ nla_put_failure:
+       if (msg)

diff --git a/target/linux/generic-2.6/patches-2.6.35/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.35/660-phy_mvswitch.patch
new file mode 100644 (file)
index 0000000..f5ff558
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/660-phy_mvswitch.patch
@@ -0,0 +1,22 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -104,6 +104,9 @@ config ADM6996_PHY
+       ---help---
+         Currently supports the ADM6996F switch
+ 
++config MVSWITCH_PHY
++      tristate "Driver for Marvell 88E6060 switches"
++
+ config FIXED_PHY
+       bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+       depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)   += broadcom.o
+ obj-$(CONFIG_BCM63XX_PHY)     += bcm63xx.o
+ obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
+ obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
++obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
+ obj-$(CONFIG_REALTEK_PHY)     += realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY)               += fixed.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.35/670-phy_ip175c.patch
new file mode 100644 (file)
index 0000000..e8c57ca
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/670-phy_ip175c.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -107,6 +107,10 @@ config ADM6996_PHY
+ config MVSWITCH_PHY
+       tristate "Driver for Marvell 88E6060 switches"
+ 
++config IP175C_PHY
++      tristate "Driver for IC+ IP175C/IP178C switches"
++      select SWCONFIG
++
+ config FIXED_PHY
+       bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+       depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_BCM63XX_PHY)    += bcm63xx.o
+ obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
+ obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
++obj-$(CONFIG_IP175C_PHY)      += ip175c.o
+ obj-$(CONFIG_REALTEK_PHY)     += realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY)               += fixed.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.35/680-phy_ar8216.patch
new file mode 100644 (file)
index 0000000..2bc9d67
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/680-phy_ar8216.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -111,6 +111,10 @@ config IP175C_PHY
+       tristate "Driver for IC+ IP175C/IP178C switches"
+       select SWCONFIG
+ 
++config AR8216_PHY
++      tristate "Driver for Atheros AR8216 switches"
++      select SWCONFIG
++
+ config FIXED_PHY
+       bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+       depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY)    += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
+ obj-$(CONFIG_IP175C_PHY)      += ip175c.o
+ obj-$(CONFIG_REALTEK_PHY)     += realtek.o
++obj-$(CONFIG_AR8216_PHY)      += ar8216.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY)               += fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.35/690-phy_rtl8306.patch
new file mode 100644 (file)
index 0000000..9e86748
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/690-phy_rtl8306.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -115,6 +115,10 @@ config AR8216_PHY
+       tristate "Driver for Atheros AR8216 switches"
+       select SWCONFIG
+ 
++config RTL8306_PHY
++      tristate "Driver for Realtek RTL8306S switches"
++      select SWCONFIG
++
+ config FIXED_PHY
+       bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+       depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY)   += mvswitch.o
+ obj-$(CONFIG_IP175C_PHY)      += ip175c.o
+ obj-$(CONFIG_REALTEK_PHY)     += realtek.o
+ obj-$(CONFIG_AR8216_PHY)      += ar8216.o
++obj-$(CONFIG_RTL8306_PHY)     += rtl8306.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY)               += fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.35/691-phy_rtl8366.patch
new file mode 100644 (file)
index 0000000..ec07636
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/691-phy_rtl8366.patch
@@ -0,0 +1,44 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -157,4 +157,29 @@ config MDIO_OCTEON
+ 
+         If in doubt, say Y.
+ 
++config RTL8366_SMI
++      tristate "Driver for the RTL8366 SMI interface"
++      depends on GENERIC_GPIO
++      ---help---
++        This module implements the SMI interface protocol which is used
++        by some RTL8366 ethernet switch devices via the generic GPIO API.
++
++if RTL8366_SMI
++
++config RTL8366S_PHY
++      tristate "Driver for the Realtek RTL8366S switch"
++      select SWCONFIG
++
++config RTL8366RB_PHY
++      tristate "Driver for the Realtek RTL8366RB switch"
++      select SWCONFIG
++
++config RTL8366S_PHY_DEBUG_FS
++      bool "RTL8366 switch driver DEBUG_FS support"
++      depends on RTL8366S_PHY || RTL8366RB_PHY
++      depends on DEBUG_FS
++      default n
++
++endif # RTL8366_SMI
++
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -20,6 +20,9 @@ obj-$(CONFIG_IP175C_PHY)     += ip175c.o
+ obj-$(CONFIG_REALTEK_PHY)     += realtek.o
+ obj-$(CONFIG_AR8216_PHY)      += ar8216.o
+ obj-$(CONFIG_RTL8306_PHY)     += rtl8306.o
++obj-$(CONFIG_RTL8366_SMI)     += rtl8366_smi.o
++obj-$(CONFIG_RTL8366S_PHY)    += rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY)               += fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.35/700-rtc7301.patch
new file mode 100644 (file)
index 0000000..f4325d2
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/700-rtc7301.patch
@@ -0,0 +1,250 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -618,6 +618,15 @@ config RTC_DRV_NUC900
+         If you say yes here you get support for the RTC subsystem of the
+         NUC910/NUC920 used in embedded systems.
+ 
++config RTC_DRV_RTC7301
++      tristate "Epson RTC-7301 SF/DG"
++      help
++        If you say Y here you will get support for the
++        Epson RTC-7301 SF/DG RTC chips.
++
++        This driver can also be built as a module. If so, the module
++        will be called rtc-7301.
++
+ comment "on-CPU RTC drivers"
+ 
+ config RTC_DRV_OMAP
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -74,6 +74,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c
+ obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o
+ obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o
+ obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o
++obj-$(CONFIG_RTC_DRV_RTC7301) += rtc-rtc7301.o
+ obj-$(CONFIG_RTC_DRV_RX8025)  += rtc-rx8025.o
+ obj-$(CONFIG_RTC_DRV_RX8581)  += rtc-rx8581.o
+ obj-$(CONFIG_RTC_DRV_S35390A) += rtc-s35390a.o
+--- /dev/null
++++ b/drivers/rtc/rtc-rtc7301.c
+@@ -0,0 +1,219 @@
++/*
++ * Driver for Epson RTC-7301SF/DG
++ *
++ * Copyright (C) 2009 Jose Vasconcellos
++ *
++ * 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 <linux/module.h>
++#include <linux/rtc.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/delay.h>
++#include <linux/bcd.h>
++
++#define RTC_NAME "rtc7301"
++#define RTC_VERSION "0.1"
++
++/* Epson RTC-7301 register addresses */
++#define RTC7301_SEC           0x00
++#define RTC7301_SEC10         0x01
++#define RTC7301_MIN           0x02
++#define RTC7301_MIN10         0x03
++#define RTC7301_HOUR          0x04
++#define RTC7301_HOUR10                0x05
++#define RTC7301_WEEKDAY               0x06
++#define RTC7301_DAY           0x07
++#define RTC7301_DAY10         0x08
++#define RTC7301_MON           0x09
++#define RTC7301_MON10         0x0A
++#define RTC7301_YEAR          0x0B
++#define RTC7301_YEAR10                0x0C
++#define RTC7301_YEAR100               0x0D
++#define RTC7301_YEAR1000      0x0E
++#define RTC7301_CTRLREG               0x0F
++
++static uint8_t __iomem *rtc7301_base;
++
++#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
++#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
++
++#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
++
++static void rtc7301_init_settings(void)
++{
++      int i;
++
++      write_reg(RTC7301_CTRLREG, 2);
++      write_reg(RTC7301_YEAR1000, 2);
++      udelay(122);
++
++      /* bank 1 */
++      write_reg(RTC7301_CTRLREG, 6);
++      for (i=0; i<15; i++)
++              write_reg(i, 0);
++
++      /* bank 2 */
++      write_reg(RTC7301_CTRLREG, 14);
++      for (i=0; i<15; i++)
++              write_reg(i, 0);
++      write_reg(RTC7301_CTRLREG, 0);
++}
++
++static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
++{
++      int cnt;
++      uint8_t buf[16];
++
++      cnt = 0;
++      while (rtc7301_isbusy()) {
++              udelay(244);
++              if (cnt++ > 100) {
++                      dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
++                      return -EIO;
++              }
++      }
++
++      for (cnt=0; cnt<16; cnt++)
++              buf[cnt] = read_reg(cnt);
++
++      if (buf[RTC7301_SEC10] & 8) {
++              dev_err(dev, "%s: RTC not set\n", __func__);
++              return -EINVAL;
++      }
++
++      memset(dt, 0, sizeof(*dt));
++
++      dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
++      dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
++      dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
++
++      dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
++      dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
++      dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
++                    buf[RTC7301_YEAR100]*100 +
++                    ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
++
++      /* the rtc device may contain illegal values on power up
++       * according to the data sheet. make sure they are valid.
++       */
++
++      return rtc_valid_tm(dt);
++}
++
++static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
++{
++      int data;
++
++      data = dt->tm_year + 1900;
++      if (data >= 2100 || data < 1900)
++              return -EINVAL;
++
++      write_reg(RTC7301_CTRLREG, 2);
++              udelay(122);
++
++      data = bin2bcd(dt->tm_sec);
++      write_reg(RTC7301_SEC, data);
++      write_reg(RTC7301_SEC10, (data >> 4));
++
++      data = bin2bcd(dt->tm_min);
++      write_reg(RTC7301_MIN, data );
++      write_reg(RTC7301_MIN10, (data >> 4));
++
++      data = bin2bcd(dt->tm_hour);
++      write_reg(RTC7301_HOUR, data);
++      write_reg(RTC7301_HOUR10, (data >> 4));
++
++      data = bin2bcd(dt->tm_mday);
++      write_reg(RTC7301_DAY, data);
++      write_reg(RTC7301_DAY10, (data>> 4));
++
++      data = bin2bcd(dt->tm_mon + 1);
++      write_reg(RTC7301_MON, data);
++      write_reg(RTC7301_MON10, (data >> 4));
++
++      data = bin2bcd(dt->tm_year % 100);
++      write_reg(RTC7301_YEAR, data);
++      write_reg(RTC7301_YEAR10, (data >> 4));
++      data = bin2bcd((1900 + dt->tm_year) / 100);
++      write_reg(RTC7301_YEAR100, data);
++
++      data = bin2bcd(dt->tm_wday);
++      write_reg(RTC7301_WEEKDAY, data);
++
++      write_reg(RTC7301_CTRLREG, 0);
++
++      return 0;
++}
++
++static const struct rtc_class_ops rtc7301_rtc_ops = {
++      .read_time      = rtc7301_get_datetime,
++      .set_time       = rtc7301_set_datetime,
++};
++
++static int __devinit rtc7301_probe(struct platform_device *pdev)
++{
++      struct rtc_device *rtc;
++      struct resource *res;
++
++      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++      if (!res)
++              return -ENOENT;
++
++      rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
++      if (!rtc7301_base)
++              return -EINVAL;
++
++      rtc = rtc_device_register(RTC_NAME, &pdev->dev,
++                              &rtc7301_rtc_ops, THIS_MODULE);
++      if (IS_ERR(rtc)) {
++              iounmap(rtc7301_base);
++              return PTR_ERR(rtc);
++      }
++
++      platform_set_drvdata(pdev, rtc);
++
++      rtc7301_init_settings();
++      return 0;
++}
++
++static int __devexit rtc7301_remove(struct platform_device *pdev)
++{
++      struct rtc_device *rtc = platform_get_drvdata(pdev);
++
++      if (rtc)
++              rtc_device_unregister(rtc);
++      if (rtc7301_base)
++              iounmap(rtc7301_base);
++      return 0;
++}
++
++static struct platform_driver rtc7301_driver = {
++      .driver = {
++              .name   = RTC_NAME,
++              .owner  = THIS_MODULE,
++      },
++      .probe  = rtc7301_probe,
++      .remove = __devexit_p(rtc7301_remove),
++};
++
++static __init int rtc7301_init(void)
++{
++      return platform_driver_register(&rtc7301_driver);
++}
++module_init(rtc7301_init);
++
++static __exit void rtc7301_exit(void)
++{
++      platform_driver_unregister(&rtc7301_driver);
++}
++module_exit(rtc7301_exit);
++
++MODULE_DESCRIPTION("Epson 7301 RTC driver");
++MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" RTC_NAME);
++MODULE_VERSION(RTC_VERSION);

diff --git a/target/linux/generic-2.6/patches-2.6.35/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.35/750-glamo-headers.patch
new file mode 100644 (file)
index 0000000..c2e3880
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/750-glamo-headers.patch
@@ -0,0 +1,21 @@
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
+@@ -124,6 +124,7 @@ struct dentry;
+ #define FB_ACCEL_TRIDENT_BLADE3D 52   /* Trident Blade3D              */
+ #define FB_ACCEL_TRIDENT_BLADEXP 53   /* Trident BladeXP              */
+ #define FB_ACCEL_CIRRUS_ALPINE   53   /* Cirrus Logic 543x/544x/5480  */
++#define FB_ACCEL_GLAMO                50      /* SMedia Glamo                 */
+ #define FB_ACCEL_NEOMAGIC_NM2070 90   /* NeoMagic NM2070              */
+ #define FB_ACCEL_NEOMAGIC_NM2090 91   /* NeoMagic NM2090              */
+ #define FB_ACCEL_NEOMAGIC_NM2093 92   /* NeoMagic NM2093              */
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -77,6 +77,8 @@ header-y += genetlink.h
+ header-y += gen_stats.h
+ header-y += gfs2_ondisk.h
+ header-y += gigaset_dev.h
++header-y += glamofb.h
++header-y += glamo-engine.h
+ header-y += hysdn_if.h
+ header-y += i2o-dev.h
+ header-y += i8k.h

diff --git a/target/linux/generic-2.6/patches-2.6.35/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.35/801-usb_serial_endpoint_size.patch
new file mode 100644 (file)
index 0000000..cfbcbe8
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/801-usb_serial_endpoint_size.patch
@@ -0,0 +1,25 @@
+--- a/drivers/usb/serial/usb-serial.c
++++ b/drivers/usb/serial/usb-serial.c
+@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv
+    drivers depend on it.
+ */
+ 
++static ushort maxSize = 0;
+ static int debug;
+ /* initially all NULL */
+ static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
+@@ -912,7 +913,7 @@ int usb_serial_probe(struct usb_interfac
+               }
+               buffer_size = serial->type->bulk_in_size;
+               if (!buffer_size)
+-                      buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
++                      buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
+               port->bulk_in_size = buffer_size;
+               port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
+               port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
+@@ -1382,3 +1383,5 @@ MODULE_LICENSE("GPL");
+ 
+ module_param(debug, bool, S_IRUGO | S_IWUSR);
+ MODULE_PARM_DESC(debug, "Debug enabled or not");
++module_param(maxSize, ushort,0);
++MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");

diff --git a/target/linux/generic-2.6/patches-2.6.35/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.35/840-unable_to_open_console.patch
new file mode 100644 (file)
index 0000000..6a634b7
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/840-unable_to_open_console.patch
@@ -0,0 +1,11 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -887,7 +887,7 @@ static int __init kernel_init(void * unu
+ 
+       /* Open the /dev/console on the rootfs, this should never fail */
+       if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+-              printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++              printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
+ 
+       (void) sys_dup(0);
+       (void) sys_dup(0);

diff --git a/target/linux/generic-2.6/patches-2.6.35/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.35/902-darwin_scripts_include.patch
new file mode 100644 (file)
index 0000000..39b6abe
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/902-darwin_scripts_include.patch
@@ -0,0 +1,102 @@
+--- a/scripts/genksyms/parse.c_shipped
++++ b/scripts/genksyms/parse.c_shipped
+@@ -160,7 +160,9 @@
+ 
+ 
+ #include <assert.h>
++#ifndef __APPLE__
+ #include <malloc.h>
++#endif
+ #include "genksyms.h"
+ 
+ static int is_typedef;
+--- a/scripts/genksyms/parse.y
++++ b/scripts/genksyms/parse.y
+@@ -24,7 +24,9 @@
+ %{
+ 
+ #include <assert.h>
++#ifndef __APPLE__
+ #include <malloc.h>
++#endif
+ #include "genksyms.h"
+ 
+ static int is_typedef;
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -22,6 +22,35 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef __APPLE__
++/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
++void *memmem (const void *haystack, size_t haystack_len,
++                          const void *needle,  size_t needle_len)
++{
++  const char *begin;
++  const char *const last_possible
++    = (const char *) haystack + haystack_len - needle_len;
++
++  if (needle_len == 0)
++    /* The first occurrence of the empty string is deemed to occur at
++       the beginning of the string.  */
++    return (void *) haystack;
++
++  /* Sanity check, otherwise the loop might search through the whole
++     memory.  */
++  if (__builtin_expect (haystack_len < needle_len, 0))
++    return NULL;
++
++  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
++    if (begin[0] == ((const char *) needle)[0] &&
++        !memcmp ((const void *) &begin[1],
++                 (const void *) ((const char *) needle + 1),
++                 needle_len - 1))
++      return (void *) begin;
++
++  return NULL;
++}
++#endif
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -140,6 +140,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
+ # we really need to do so. (Do not call gcc as part of make mrproper)
+ HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
+ HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
++ifeq ($(shell uname -s),Darwin)
++HOST_LOADLIBES  += -lncurses
++endif
+ 
+ HOST_EXTRACFLAGS += -DLOCALE
+ 
+--- a/scripts/mod/mk_elfconfig.c
++++ b/scripts/mod/mk_elfconfig.c
+@@ -1,7 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __APPLE__
+ #include <elf.h>
++#else
++#include "../../../../../tools/sstrip/include/elf.h"
++#endif
+ 
+ int
+ main(int argc, char **argv)
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h
+@@ -7,7 +7,11 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#if !(defined(__APPLE__) || defined(__CYGWIN__))
+ #include <elf.h>
++#else
++#include "../../../../../tools/sstrip/include/elf.h"
++#endif
+ 
+ #include "elfconfig.h"
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.35/903-hostap_txpower.patch
new file mode 100644 (file)
index 0000000..8aa43c5
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/903-hostap_txpower.patch
@@ -0,0 +1,154 @@
+--- a/drivers/net/wireless/hostap/hostap_ap.c
++++ b/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2336,13 +2336,13 @@ int prism2_ap_get_sta_qual(local_info_t
+               addr[count].sa_family = ARPHRD_ETHER;
+               memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+               if (sta->last_rx_silence == 0)
+-                      qual[count].qual = sta->last_rx_signal < 27 ?
+-                              0 : (sta->last_rx_signal - 27) * 92 / 127;
++                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
++                                0 : (sta->last_rx_signal - 156) * 92 / 64;
+               else
+-                      qual[count].qual = sta->last_rx_signal -
+-                              sta->last_rx_silence - 35;
+-              qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-              qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        qual[count].qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                qual[count].level = sta->last_rx_signal;
++                qual[count].noise = sta->last_rx_silence;
+               qual[count].updated = sta->last_rx_updated;
+ 
+               sta->last_rx_updated = IW_QUAL_DBM;
+@@ -2408,13 +2408,13 @@ int prism2_ap_translate_scan(struct net_
+               memset(&iwe, 0, sizeof(iwe));
+               iwe.cmd = IWEVQUAL;
+               if (sta->last_rx_silence == 0)
+-                      iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+-                              0 : (sta->last_rx_signal - 27) * 92 / 127;
++                      iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
++                              0 : (sta->last_rx_signal - 156) * 92 / 64;
+               else
+-                      iwe.u.qual.qual = sta->last_rx_signal -
+-                              sta->last_rx_silence - 35;
+-              iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-              iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        iwe.u.qual.qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                iwe.u.qual.level = sta->last_rx_signal;
++                iwe.u.qual.noise = sta->last_rx_silence;
+               iwe.u.qual.updated = sta->last_rx_updated;
+               iwe.len = IW_EV_QUAL_LEN;
+               current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+--- a/drivers/net/wireless/hostap/hostap_config.h
++++ b/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@
+  */
+ /* #define PRISM2_NO_STATION_MODES */
+ 
++/* Enable TX power Setting functions
++ * (min att = -128 , max att =  127)
++ */
++#define RAW_TXPOWER_SETTING
++
+ #endif /* HOSTAP_CONFIG_H */
+--- a/drivers/net/wireless/hostap/hostap.h
++++ b/drivers/net/wireless/hostap/hostap.h
+@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
+ extern const struct ethtool_ops prism2_ethtool_ops;
+ 
+ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++int hostap_restore_power(struct net_device *dev);
+ 
+ 
+ #endif /* HOSTAP_H */
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
+                       prism2_hw_reset(dev);
+       }
+ 
++      hostap_restore_power(dev);
+       return res;
+ }
+ 
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -433,6 +433,11 @@ static void handle_info_queue_linkstatus
+       }
+ 
+       /* Get BSSID if we have a valid AP address */
++
++      if ( val == HFA384X_LINKSTATUS_CONNECTED ||
++           val == HFA384X_LINKSTATUS_DISCONNECTED )
++                      hostap_restore_power(local->dev);
++
+       if (connected) {
+               netif_carrier_on(local->dev);
+               netif_carrier_on(local->ddev);
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1477,23 +1477,20 @@ static int prism2_txpower_hfa386x_to_dBm
+               val = 255;
+ 
+       tmp = val;
+-      tmp >>= 2;
+ 
+-      return -12 - tmp;
++      return tmp;
+ }
+ 
+ static u16 prism2_txpower_dBm_to_hfa386x(int val)
+ {
+       signed char tmp;
+ 
+-      if (val > 20)
+-              return 128;
+-      else if (val < -43)
++      if (val > 127)
+               return 127;
++      else if (val < -128)
++              return 128;
+ 
+       tmp = val;
+-      tmp = -12 - tmp;
+-      tmp <<= 2;
+ 
+       return (unsigned char) tmp;
+ }
+@@ -4057,3 +4054,35 @@ int hostap_ioctl(struct net_device *dev,
+ 
+       return ret;
+ }
++
++/* BUG FIX: Restore power setting value when lost due to F/W bug */
++
++int hostap_restore_power(struct net_device *dev)
++{
++        struct hostap_interface *iface = netdev_priv(dev);
++       local_info_t *local = iface->local;
++
++       u16 val;
++       int ret = 0;
++
++       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
++                       val = 0xff; /* use all standby and sleep modes */
++                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                                              HFA386X_CR_A_D_TEST_MODES2,
++                                              &val, NULL);
++       }
++
++#ifdef RAW_TXPOWER_SETTING
++       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
++               val = HFA384X_TEST_CFG_BIT_ALC;
++               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
++                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
++               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
++               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
++       }
++#endif /* RAW_TXPOWER_SETTING */
++       return (ret ? -EOPNOTSUPP : 0);
++}
++
++EXPORT_SYMBOL(hostap_restore_power);

diff --git a/target/linux/generic-2.6/patches-2.6.35/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.35/903-stddef_include.patch
new file mode 100644 (file)
index 0000000..7fe248d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/903-stddef_include.patch
@@ -0,0 +1,17 @@
+--- a/include/linux/stddef.h
++++ b/include/linux/stddef.h
+@@ -16,6 +16,7 @@ enum {
+       false   = 0,
+       true    = 1
+ };
++#endif /* __KERNEL__ */
+ 
+ #undef offsetof
+ #ifdef __compiler_offsetof
+@@ -23,6 +24,5 @@ enum {
+ #else
+ #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+ #endif
+-#endif /* __KERNEL__ */
+ 
+ #endif

diff --git a/target/linux/generic-2.6/patches-2.6.35/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.35/905-i386_build.patch
new file mode 100644 (file)
index 0000000..c701fda
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/905-i386_build.patch
@@ -0,0 +1,10 @@
+--- a/arch/x86/boot/tools/build.c
++++ b/arch/x86/boot/tools/build.c
+@@ -29,7 +29,6 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>

diff --git a/target/linux/generic-2.6/patches-2.6.35/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.35/920-01-hotpluggable-spi-gpio.patch
new file mode 100644 (file)
index 0000000..b10bc9a
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/920-01-hotpluggable-spi-gpio.patch
@@ -0,0 +1,60 @@
+Fix spi-gpio for hotplug.
+
+--mb
+
+
+
+--- a/drivers/spi/spi_gpio.c
++++ b/drivers/spi/spi_gpio.c
+@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
+       spi_bitbang_cleanup(spi);
+ }
+ 
+-static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
++static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
+ {
+       int value;
+ 
+@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
+       return value;
+ }
+ 
+-static int __init
++static int __devinit
+ spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
+ {
+       int value;
+@@ -261,7 +261,7 @@ done:
+       return value;
+ }
+ 
+-static int __init spi_gpio_probe(struct platform_device *pdev)
++static int __devinit spi_gpio_probe(struct platform_device *pdev)
+ {
+       int                             status;
+       struct spi_master               *master;
+@@ -317,7 +317,7 @@ gpio_free:
+       return status;
+ }
+ 
+-static int __exit spi_gpio_remove(struct platform_device *pdev)
++static int __devexit spi_gpio_remove(struct platform_device *pdev)
+ {
+       struct spi_gpio                 *spi_gpio;
+       struct spi_gpio_platform_data   *pdata;
+@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
+ static struct platform_driver spi_gpio_driver = {
+       .driver.name    = DRIVER_NAME,
+       .driver.owner   = THIS_MODULE,
+-      .remove         = __exit_p(spi_gpio_remove),
++      .probe          = spi_gpio_probe,
++      .remove         = __devexit_p(spi_gpio_remove),
+ };
+ 
+ static int __init spi_gpio_init(void)
+ {
+-      return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
++      return platform_driver_register(&spi_gpio_driver);
+ }
+ module_init(spi_gpio_init);
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.35/920-04-spi-gpio-implement-spi-delay.patch
new file mode 100644 (file)
index 0000000..1903288
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/920-04-spi-gpio-implement-spi-delay.patch
@@ -0,0 +1,58 @@
+Implement the SPI-GPIO delay function for busses that need speed limitation.
+
+--mb
+
+
+
+--- a/drivers/spi/spi_gpio.c
++++ b/drivers/spi/spi_gpio.c
+@@ -21,6 +21,7 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/gpio.h>
++#include <linux/delay.h>
+ 
+ #include <linux/spi/spi.h>
+ #include <linux/spi/spi_bitbang.h>
+@@ -69,6 +70,7 @@ struct spi_gpio {
+  *            #define SPI_MOSI_GPIO   120
+  *            #define SPI_SCK_GPIO    121
+  *            #define SPI_N_CHIPSEL   4
++ *            #undef NEED_SPIDELAY
+  *            #include "spi_gpio.c"
+  */
+ 
+@@ -76,6 +78,7 @@ struct spi_gpio {
+ #define DRIVER_NAME   "spi_gpio"
+ 
+ #define GENERIC_BITBANG       /* vs tight inlines */
++#define NEED_SPIDELAY 1
+ 
+ /* all functions referencing these symbols must define pdata */
+ #define SPI_MISO_GPIO ((pdata)->miso)
+@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
+ #undef pdata
+ 
+ /*
+- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
+- * requested device clock.  Software overhead means we usually have trouble
+- * reaching even one Mbit/sec (except when we can inline bitops), so for now
+- * we'll just assume we never need additional per-bit slowdowns.
++ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
++ * and spi_transfer.speed_hz to 0.
++ * Otherwise this is a function of the requested device clock.
++ * Software overhead means we usually have trouble
++ * reaching even one Mbit/sec (except when we can inline bitops). So on small
++ * embedded devices with fast SPI slaves you usually don't need a delay.
+  */
+-#define spidelay(nsecs)       do {} while (0)
++static inline void spidelay(unsigned nsecs)
++{
++#ifdef NEED_SPIDELAY
++      if (unlikely(nsecs))
++              ndelay(nsecs);
++#endif /* NEED_SPIDELAY */
++}
+ 
+ #define       EXPAND_BITBANG_TXRX
+ #include <linux/spi/spi_bitbang.h>

diff --git a/target/linux/generic-2.6/patches-2.6.35/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.35/921-gpio_spi_driver.patch
new file mode 100644 (file)
index 0000000..65f17b4
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/921-gpio_spi_driver.patch
@@ -0,0 +1,366 @@
+THIS CODE IS DEPRECATED.
+
+Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+
+--mb
+
+
+
+--- /dev/null
++++ b/include/linux/spi/spi_gpio_old.h
+@@ -0,0 +1,73 @@
++/*
++ * spi_gpio interface to platform code
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * 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.
++ */
++#ifndef _LINUX_SPI_SPI_GPIO
++#define _LINUX_SPI_SPI_GPIO
++
++#include <linux/types.h>
++#include <linux/spi/spi.h>
++
++
++/**
++ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
++ *
++ * This structure holds information about a GPIO-based SPI device.
++ *
++ * @pin_clk: The GPIO pin number of the CLOCK pin.
++ *
++ * @pin_miso: The GPIO pin number of the MISO pin.
++ *
++ * @pin_mosi: The GPIO pin number of the MOSI pin.
++ *
++ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
++ *
++ * @cs_activelow: If true, the chip is selected when the CS line is low.
++ *
++ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
++ *                Note that doing no delay is not standards compliant,
++ *                but it might be needed to speed up transfers on some
++ *                slow embedded machines.
++ *
++ * @boardinfo_setup: This callback is called after the
++ *                   SPI master device was registered, but before the
++ *                   device is registered.
++ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
++ */
++struct spi_gpio_platform_data {
++      unsigned int pin_clk;
++      unsigned int pin_miso;
++      unsigned int pin_mosi;
++      unsigned int pin_cs;
++      bool cs_activelow;
++      bool no_spi_delay;
++      int (*boardinfo_setup)(struct spi_board_info *bi,
++                             struct spi_master *master,
++                             void *data);
++      void *boardinfo_setup_data;
++};
++
++/**
++ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a spi-gpio device.
++ */
++#define SPI_GPIO_PLATDEV_NAME "spi-gpio"
++
++/**
++ * spi_gpio_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int spi_gpio_next_id(void);
++
++#endif /* _LINUX_SPI_SPI_GPIO */
+--- /dev/null
++++ b/drivers/spi/spi_gpio_old.c
+@@ -0,0 +1,251 @@
++/*
++ * Bitbanging SPI bus driver using GPIO API
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * based on spi_s3c2410_gpio.c
++ *   Copyright (c) 2006 Ben Dooks
++ *   Copyright (c) 2006 Simtec Electronics
++ * and on i2c-gpio.c
++ *   Copyright (C) 2007 Atmel Corporation
++ *
++ * 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 <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/spinlock.h>
++#include <linux/workqueue.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/spi_bitbang.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++struct spi_gpio {
++      struct spi_bitbang bitbang;
++      struct spi_gpio_platform_data *info;
++      struct platform_device *pdev;
++      struct spi_board_info bi;
++};
++
++
++static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
++{
++      return dev->controller_data;
++}
++
++static inline void setsck(struct spi_device *dev, int val)
++{
++      struct spi_gpio *sp = spidev_to_sg(dev);
++      gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
++}
++
++static inline void setmosi(struct spi_device *dev, int val)
++{
++      struct spi_gpio *sp = spidev_to_sg(dev);
++      gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
++}
++
++static inline u32 getmiso(struct spi_device *dev)
++{
++      struct spi_gpio *sp = spidev_to_sg(dev);
++      return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
++}
++
++static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
++{
++      struct spi_gpio *sp = spidev_to_sg(dev);
++
++      if (!sp->info->no_spi_delay)
++              ndelay(nsecs);
++}
++
++#define spidelay(nsecs) do {                                  \
++      /* Steal the spi_device pointer from our caller.        \
++       * The bitbang-API should probably get fixed here... */ \
++      do_spidelay(spi, nsecs);                                \
++  } while (0)
++
++#define EXPAND_BITBANG_TXRX
++#include <linux/spi/spi_bitbang.h>
++
++static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
++                             unsigned nsecs, u32 word, u8 bits)
++{
++      return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
++                             unsigned nsecs, u32 word, u8 bits)
++{
++      return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
++                             unsigned nsecs, u32 word, u8 bits)
++{
++      return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
++                             unsigned nsecs, u32 word, u8 bits)
++{
++      return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
++}
++
++static void spi_gpio_chipselect(struct spi_device *dev, int on)
++{
++      struct spi_gpio *sp = spidev_to_sg(dev);
++
++      if (sp->info->cs_activelow)
++              on = !on;
++      gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
++}
++
++static int spi_gpio_probe(struct platform_device *pdev)
++{
++      struct spi_master *master;
++      struct spi_gpio_platform_data *pdata;
++      struct spi_gpio *sp;
++      struct spi_device *spidev;
++      int err;
++
++      pdata = pdev->dev.platform_data;
++      if (!pdata)
++              return -ENXIO;
++
++      err = -ENOMEM;
++      master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
++      if (!master)
++              goto err_alloc_master;
++
++      sp = spi_master_get_devdata(master);
++      platform_set_drvdata(pdev, sp);
++      sp->info = pdata;
++
++      err = gpio_request(pdata->pin_clk, "spi_clock");
++      if (err)
++              goto err_request_clk;
++      err = gpio_request(pdata->pin_mosi, "spi_mosi");
++      if (err)
++              goto err_request_mosi;
++      err = gpio_request(pdata->pin_miso, "spi_miso");
++      if (err)
++              goto err_request_miso;
++      err = gpio_request(pdata->pin_cs, "spi_cs");
++      if (err)
++              goto err_request_cs;
++
++      sp->bitbang.master = spi_master_get(master);
++      sp->bitbang.master->bus_num = -1;
++      sp->bitbang.master->num_chipselect = 1;
++      sp->bitbang.chipselect = spi_gpio_chipselect;
++      sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
++      sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
++      sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
++      sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
++
++      gpio_direction_output(pdata->pin_clk, 0);
++      gpio_direction_output(pdata->pin_mosi, 0);
++      gpio_direction_output(pdata->pin_cs,
++                            pdata->cs_activelow ? 1 : 0);
++      gpio_direction_input(pdata->pin_miso);
++
++      err = spi_bitbang_start(&sp->bitbang);
++      if (err)
++              goto err_no_bitbang;
++      err = pdata->boardinfo_setup(&sp->bi, master,
++                                   pdata->boardinfo_setup_data);
++      if (err)
++              goto err_bi_setup;
++      sp->bi.controller_data = sp;
++      spidev = spi_new_device(master, &sp->bi);
++      if (!spidev)
++              goto err_new_dev;
++
++      return 0;
++
++err_new_dev:
++err_bi_setup:
++      spi_bitbang_stop(&sp->bitbang);
++err_no_bitbang:
++      spi_master_put(sp->bitbang.master);
++      gpio_free(pdata->pin_cs);
++err_request_cs:
++      gpio_free(pdata->pin_miso);
++err_request_miso:
++      gpio_free(pdata->pin_mosi);
++err_request_mosi:
++      gpio_free(pdata->pin_clk);
++err_request_clk:
++      kfree(master);
++
++err_alloc_master:
++      return err;
++}
++
++static int __devexit spi_gpio_remove(struct platform_device *pdev)
++{
++      struct spi_gpio *sp;
++      struct spi_gpio_platform_data *pdata;
++
++      pdata = pdev->dev.platform_data;
++      sp = platform_get_drvdata(pdev);
++
++      gpio_free(pdata->pin_clk);
++      gpio_free(pdata->pin_mosi);
++      gpio_free(pdata->pin_miso);
++      gpio_free(pdata->pin_cs);
++      spi_bitbang_stop(&sp->bitbang);
++      spi_master_put(sp->bitbang.master);
++
++      return 0;
++}
++
++static struct platform_driver spi_gpio_driver = {
++      .driver         = {
++              .name   = SPI_GPIO_PLATDEV_NAME,
++              .owner  = THIS_MODULE,
++      },
++      .probe          = spi_gpio_probe,
++      .remove         = __devexit_p(spi_gpio_remove),
++};
++
++int spi_gpio_next_id(void)
++{
++      static atomic_t counter = ATOMIC_INIT(-1);
++
++      return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(spi_gpio_next_id);
++
++static int __init spi_gpio_init(void)
++{
++      int err;
++
++      err = platform_driver_register(&spi_gpio_driver);
++      if (err)
++              printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
++
++      return err;
++}
++module_init(spi_gpio_init);
++
++static void __exit spi_gpio_exit(void)
++{
++      platform_driver_unregister(&spi_gpio_driver);
++}
++module_exit(spi_gpio_exit);
++
++MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
++MODULE_LICENSE("GPL v2");
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -133,6 +133,15 @@ config SPI_GPIO
+         GPIO operations, you should be able to leverage that for better
+         speed with a custom version of this driver; see the source code.
+ 
++config SPI_GPIO_OLD
++      tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
++      depends on SPI_MASTER && GENERIC_GPIO
++      select SPI_BITBANG
++      help
++        This code is deprecated. Please use the new mainline SPI-GPIO driver.
++
++        If unsure, say N.
++
+ config SPI_IMX
+       tristate "Freescale i.MX SPI controllers"
+       depends on ARCH_MXC
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_SPI_DESIGNWARE)         += dw_spi.
+ obj-$(CONFIG_SPI_DW_PCI)              += dw_spi_pci.o
+ obj-$(CONFIG_SPI_DW_MMIO)             += dw_spi_mmio.o
+ obj-$(CONFIG_SPI_GPIO)                        += spi_gpio.o
++obj-$(CONFIG_SPI_GPIO_OLD)            += spi_gpio_old.o
+ obj-$(CONFIG_SPI_IMX)                 += spi_imx.o
+ obj-$(CONFIG_SPI_LM70_LLP)            += spi_lm70llp.o
+ obj-$(CONFIG_SPI_PXA2XX)              += pxa2xx_spi.o

diff --git a/target/linux/generic-2.6/patches-2.6.35/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.35/922-gpiommc.patch
new file mode 100644 (file)
index 0000000..24e5d59
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/922-gpiommc.patch
@@ -0,0 +1,843 @@
+--- /dev/null
++++ b/drivers/mmc/host/gpiommc.c
+@@ -0,0 +1,608 @@
++/*
++ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
++ * This module hooks up the mmc_spi and spi_gpio modules and also
++ * provides a configfs interface.
++ *
++ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/mmc/gpiommc.h>
++#include <linux/platform_device.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/configfs.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++#define PFX                           "gpio-mmc: "
++
++
++struct gpiommc_device {
++      struct platform_device *pdev;
++      struct platform_device *spi_pdev;
++      struct spi_board_info boardinfo;
++};
++
++
++MODULE_DESCRIPTION("GPIO based MMC driver");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_LICENSE("GPL");
++
++
++static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
++                                 struct spi_master *master,
++                                 void *data)
++{
++      struct gpiommc_device *d = data;
++      struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++      /* Bind the SPI master to the MMC-SPI host driver. */
++      strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
++
++      bi->max_speed_hz = pdata->max_bus_speed;
++      bi->bus_num = master->bus_num;
++      bi->mode = pdata->mode;
++
++      return 0;
++}
++
++static int gpiommc_probe(struct platform_device *pdev)
++{
++      struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
++      struct spi_gpio_platform_data spi_pdata;
++      struct gpiommc_device *d;
++      int err;
++
++      err = -ENXIO;
++      if (!mmc_pdata)
++              goto error;
++
++#ifdef CONFIG_MMC_SPI_MODULE
++      err = request_module("mmc_spi");
++      if (err) {
++              printk(KERN_WARNING PFX
++                     "Failed to request mmc_spi module.\n");
++      }
++#endif /* CONFIG_MMC_SPI_MODULE */
++
++      /* Allocate the GPIO-MMC device */
++      err = -ENOMEM;
++      d = kzalloc(sizeof(*d), GFP_KERNEL);
++      if (!d)
++              goto error;
++      d->pdev = pdev;
++
++      /* Create the SPI-GPIO device */
++      d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
++                                          spi_gpio_next_id());
++      if (!d->spi_pdev)
++              goto err_free_d;
++
++      memset(&spi_pdata, 0, sizeof(spi_pdata));
++      spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
++      spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
++      spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
++      spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
++      spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
++      spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
++      spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
++      spi_pdata.boardinfo_setup_data = d;
++
++      err = platform_device_add_data(d->spi_pdev, &spi_pdata,
++                                     sizeof(spi_pdata));
++      if (err)
++              goto err_free_pdev;
++      err = platform_device_add(d->spi_pdev);
++      if (err)
++              goto err_free_pdata;
++      platform_set_drvdata(pdev, d);
++
++      printk(KERN_INFO PFX "MMC-Card \"%s\" "
++             "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
++             mmc_pdata->name, mmc_pdata->pins.gpio_di,
++             mmc_pdata->pins.gpio_do,
++             mmc_pdata->pins.gpio_clk,
++             mmc_pdata->pins.gpio_cs);
++
++      return 0;
++
++err_free_pdata:
++      kfree(d->spi_pdev->dev.platform_data);
++      d->spi_pdev->dev.platform_data = NULL;
++err_free_pdev:
++      platform_device_put(d->spi_pdev);
++err_free_d:
++      kfree(d);
++error:
++      return err;
++}
++
++static int gpiommc_remove(struct platform_device *pdev)
++{
++      struct gpiommc_device *d = platform_get_drvdata(pdev);
++      struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++      platform_device_unregister(d->spi_pdev);
++      printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
++             pdata->name);
++      platform_device_put(d->spi_pdev);
++
++      return 0;
++}
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++
++/* A device that was created through configfs */
++struct gpiommc_configfs_device {
++      struct config_item item;
++      /* The platform device, after registration. */
++      struct platform_device *pdev;
++      /* The configuration */
++      struct gpiommc_platform_data pdata;
++};
++
++#define GPIO_INVALID  -1
++
++static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
++{
++      return (dev->pdev != NULL);
++}
++
++static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
++{
++      return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
++}
++
++static struct configfs_attribute gpiommc_attr_DI = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "gpio_data_in",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_DO = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "gpio_data_out",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CLK = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "gpio_clock",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "gpio_chipselect",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS_activelow = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "gpio_chipselect_activelow",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spimode = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "spi_mode",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spidelay = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "spi_delay",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_max_bus_speed = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "max_bus_speed",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_register = {
++      .ca_owner = THIS_MODULE,
++      .ca_name = "register",
++      .ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute *gpiommc_config_attrs[] = {
++      &gpiommc_attr_DI,
++      &gpiommc_attr_DO,
++      &gpiommc_attr_CLK,
++      &gpiommc_attr_CS,
++      &gpiommc_attr_CS_activelow,
++      &gpiommc_attr_spimode,
++      &gpiommc_attr_spidelay,
++      &gpiommc_attr_max_bus_speed,
++      &gpiommc_attr_register,
++      NULL,
++};
++
++static ssize_t gpiommc_config_attr_show(struct config_item *item,
++                                      struct configfs_attribute *attr,
++                                      char *page)
++{
++      struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++      ssize_t count = 0;
++      unsigned int gpio;
++      int err = 0;
++
++      if (attr == &gpiommc_attr_DI) {
++              gpio = dev->pdata.pins.gpio_di;
++              if (gpio == GPIO_INVALID)
++                      count = snprintf(page, PAGE_SIZE, "not configured\n");
++              else
++                      count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++              goto out;
++      }
++      if (attr == &gpiommc_attr_DO) {
++              gpio = dev->pdata.pins.gpio_do;
++              if (gpio == GPIO_INVALID)
++                      count = snprintf(page, PAGE_SIZE, "not configured\n");
++              else
++                      count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++              goto out;
++      }
++      if (attr == &gpiommc_attr_CLK) {
++              gpio = dev->pdata.pins.gpio_clk;
++              if (gpio == GPIO_INVALID)
++                      count = snprintf(page, PAGE_SIZE, "not configured\n");
++              else
++                      count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++              goto out;
++      }
++      if (attr == &gpiommc_attr_CS) {
++              gpio = dev->pdata.pins.gpio_cs;
++              if (gpio == GPIO_INVALID)
++                      count = snprintf(page, PAGE_SIZE, "not configured\n");
++              else
++                      count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++              goto out;
++      }
++      if (attr == &gpiommc_attr_CS_activelow) {
++              count = snprintf(page, PAGE_SIZE, "%u\n",
++                               dev->pdata.pins.cs_activelow);
++              goto out;
++      }
++      if (attr == &gpiommc_attr_spimode) {
++              count = snprintf(page, PAGE_SIZE, "%u\n",
++                               dev->pdata.mode);
++              goto out;
++      }
++      if (attr == &gpiommc_attr_spidelay) {
++              count = snprintf(page, PAGE_SIZE, "%u\n",
++                               !dev->pdata.no_spi_delay);
++              goto out;
++      }
++      if (attr == &gpiommc_attr_max_bus_speed) {
++              count = snprintf(page, PAGE_SIZE, "%u\n",
++                               dev->pdata.max_bus_speed);
++              goto out;
++      }
++      if (attr == &gpiommc_attr_register) {
++              count = snprintf(page, PAGE_SIZE, "%u\n",
++                               gpiommc_is_registered(dev));
++              goto out;
++      }
++      WARN_ON(1);
++      err = -ENOSYS;
++out:
++      return err ? err : count;
++}
++
++static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
++                             const char *name)
++{
++      int err;
++
++      if (gpiommc_is_registered(dev))
++              return 0;
++
++      if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
++          !gpio_is_valid(dev->pdata.pins.gpio_do) ||
++          !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
++          !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
++              printk(KERN_ERR PFX
++                     "configfs: Invalid GPIO pin number(s)\n");
++              return -EINVAL;
++      }
++
++      strlcpy(dev->pdata.name, name,
++              sizeof(dev->pdata.name));
++
++      dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
++                                        gpiommc_next_id());
++      if (!dev->pdev)
++              return -ENOMEM;
++      err = platform_device_add_data(dev->pdev, &dev->pdata,
++                                     sizeof(dev->pdata));
++      if (err) {
++              platform_device_put(dev->pdev);
++              return err;
++      }
++      err = platform_device_add(dev->pdev);
++      if (err) {
++              platform_device_put(dev->pdev);
++              return err;
++      }
++
++      return 0;
++}
++
++static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
++{
++      if (!gpiommc_is_registered(dev))
++              return;
++
++      platform_device_unregister(dev->pdev);
++      dev->pdev = NULL;
++}
++
++static ssize_t gpiommc_config_attr_store(struct config_item *item,
++                                       struct configfs_attribute *attr,
++                                       const char *page, size_t count)
++{
++      struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++      int err = -EINVAL;
++      unsigned long data;
++
++      if (attr == &gpiommc_attr_register) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              if (data == 1)
++                      err = gpiommc_do_register(dev, item->ci_name);
++              if (data == 0) {
++                      gpiommc_do_unregister(dev);
++                      err = 0;
++              }
++              goto out;
++      }
++
++      if (gpiommc_is_registered(dev)) {
++              /* The rest of the config parameters can only be set
++               * as long as the device is not registered, yet. */
++              err = -EBUSY;
++              goto out;
++      }
++
++      if (attr == &gpiommc_attr_DI) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              if (!gpio_is_valid(data))
++                      goto out;
++              dev->pdata.pins.gpio_di = data;
++              err = 0;
++              goto out;
++      }
++      if (attr == &gpiommc_attr_DO) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              if (!gpio_is_valid(data))
++                      goto out;
++              dev->pdata.pins.gpio_do = data;
++              err = 0;
++              goto out;
++      }
++      if (attr == &gpiommc_attr_CLK) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              if (!gpio_is_valid(data))
++                      goto out;
++              dev->pdata.pins.gpio_clk = data;
++              err = 0;
++              goto out;
++      }
++      if (attr == &gpiommc_attr_CS) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              if (!gpio_is_valid(data))
++                      goto out;
++              dev->pdata.pins.gpio_cs = data;
++              err = 0;
++              goto out;
++      }
++      if (attr == &gpiommc_attr_CS_activelow) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              if (data != 0 && data != 1)
++                      goto out;
++              dev->pdata.pins.cs_activelow = data;
++              err = 0;
++              goto out;
++      }
++      if (attr == &gpiommc_attr_spimode) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              switch (data) {
++              case 0:
++                      dev->pdata.mode = SPI_MODE_0;
++                      break;
++              case 1:
++                      dev->pdata.mode = SPI_MODE_1;
++                      break;
++              case 2:
++                      dev->pdata.mode = SPI_MODE_2;
++                      break;
++              case 3:
++                      dev->pdata.mode = SPI_MODE_3;
++                      break;
++              default:
++                      goto out;
++              }
++              err = 0;
++              goto out;
++      }
++      if (attr == &gpiommc_attr_spidelay) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              if (data != 0 && data != 1)
++                      goto out;
++              dev->pdata.no_spi_delay = !data;
++              err = 0;
++              goto out;
++      }
++      if (attr == &gpiommc_attr_max_bus_speed) {
++              err = strict_strtoul(page, 10, &data);
++              if (err)
++                      goto out;
++              err = -EINVAL;
++              if (data > UINT_MAX)
++                      goto out;
++              dev->pdata.max_bus_speed = data;
++              err = 0;
++              goto out;
++      }
++      WARN_ON(1);
++      err = -ENOSYS;
++out:
++      return err ? err : count;
++}
++
++static void gpiommc_config_item_release(struct config_item *item)
++{
++      struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++      kfree(dev);
++}
++
++static struct configfs_item_operations gpiommc_config_item_ops = {
++      .release                = gpiommc_config_item_release,
++      .show_attribute         = gpiommc_config_attr_show,
++      .store_attribute        = gpiommc_config_attr_store,
++};
++
++static struct config_item_type gpiommc_dev_ci_type = {
++      .ct_item_ops    = &gpiommc_config_item_ops,
++      .ct_attrs       = gpiommc_config_attrs,
++      .ct_owner       = THIS_MODULE,
++};
++
++static struct config_item *gpiommc_make_item(struct config_group *group,
++                                           const char *name)
++{
++      struct gpiommc_configfs_device *dev;
++
++      if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
++              printk(KERN_ERR PFX "configfs: device name too long\n");
++              return NULL;
++      }
++
++      dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++      if (!dev)
++              return NULL;
++
++      config_item_init_type_name(&dev->item, name,
++                                 &gpiommc_dev_ci_type);
++
++      /* Assign default configuration */
++      dev->pdata.pins.gpio_di = GPIO_INVALID;
++      dev->pdata.pins.gpio_do = GPIO_INVALID;
++      dev->pdata.pins.gpio_clk = GPIO_INVALID;
++      dev->pdata.pins.gpio_cs = GPIO_INVALID;
++      dev->pdata.pins.cs_activelow = 1;
++      dev->pdata.mode = SPI_MODE_0;
++      dev->pdata.no_spi_delay = 0;
++      dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
++
++      return &(dev->item);
++}
++
++static void gpiommc_drop_item(struct config_group *group,
++                            struct config_item *item)
++{
++      struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++      gpiommc_do_unregister(dev);
++      kfree(dev);
++}
++
++static struct configfs_group_operations gpiommc_ct_group_ops = {
++      .make_item      = gpiommc_make_item,
++      .drop_item      = gpiommc_drop_item,
++};
++
++static struct config_item_type gpiommc_ci_type = {
++      .ct_group_ops   = &gpiommc_ct_group_ops,
++      .ct_owner       = THIS_MODULE,
++};
++
++static struct configfs_subsystem gpiommc_subsys = {
++      .su_group = {
++              .cg_item = {
++                      .ci_namebuf = GPIOMMC_PLATDEV_NAME,
++                      .ci_type = &gpiommc_ci_type,
++              },
++      },
++      .su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
++};
++
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++static struct platform_driver gpiommc_plat_driver = {
++      .probe  = gpiommc_probe,
++      .remove = gpiommc_remove,
++      .driver = {
++              .name   = GPIOMMC_PLATDEV_NAME,
++              .owner  = THIS_MODULE,
++      },
++};
++
++int gpiommc_next_id(void)
++{
++      static atomic_t counter = ATOMIC_INIT(-1);
++
++      return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(gpiommc_next_id);
++
++static int __init gpiommc_modinit(void)
++{
++      int err;
++
++      err = platform_driver_register(&gpiommc_plat_driver);
++      if (err)
++              return err;
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++      config_group_init(&gpiommc_subsys.su_group);
++      err = configfs_register_subsystem(&gpiommc_subsys);
++      if (err) {
++              platform_driver_unregister(&gpiommc_plat_driver);
++              return err;
++      }
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++      return 0;
++}
++module_init(gpiommc_modinit);
++
++static void __exit gpiommc_modexit(void)
++{
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++      configfs_unregister_subsystem(&gpiommc_subsys);
++#endif
++      platform_driver_unregister(&gpiommc_plat_driver);
++}
++module_exit(gpiommc_modexit);
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -370,6 +370,31 @@ config MMC_TMIO
+         This provides support for the SD/MMC cell found in TC6393XB,
+         T7L66XB and also HTC ASIC3
+ 
++config GPIOMMC
++      tristate "MMC/SD over GPIO-based SPI"
++      depends on MMC && MMC_SPI && SPI_GPIO_OLD
++      help
++        This driver hooks up the mmc_spi and spi_gpio modules so that
++        MMC/SD cards can be used on a GPIO based bus by bitbanging
++        the SPI protocol in software.
++
++        This driver provides a configfs interface to dynamically create
++        and destroy GPIO-based MMC/SD card devices. It also provides
++        a platform device interface API.
++        See Documentation/gpiommc.txt for details.
++
++        The module will be called gpiommc.
++
++        If unsure, say N.
++
++config GPIOMMC_CONFIGFS
++      bool
++      depends on GPIOMMC && CONFIGFS_FS
++      default y
++      help
++        This option automatically enables configfs support for gpiommc
++        if configfs is available.
++
+ config MMC_CB710
+       tristate "ENE CB710 MMC/SD Interface support"
+       depends on PCI
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_
+ obj-$(CONFIG_MMC_TMIO)                += tmio_mmc.o
+ obj-$(CONFIG_MMC_CB710)       += cb710-mmc.o
+ obj-$(CONFIG_MMC_VIA_SDMMC)   += via-sdmmc.o
++obj-$(CONFIG_GPIOMMC)         += gpiommc.o
+ obj-$(CONFIG_SDH_BFIN)                += bfin_sdh.o
+ 
+ obj-$(CONFIG_MMC_SDHCI_OF)    += sdhci-of.o
+--- /dev/null
++++ b/include/linux/mmc/gpiommc.h
+@@ -0,0 +1,71 @@
++/*
++ * Device driver for MMC/SD cards driven over a GPIO bus.
++ *
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * Licensed under the GNU/GPL version 2.
++ */
++#ifndef LINUX_GPIOMMC_H_
++#define LINUX_GPIOMMC_H_
++
++#include <linux/types.h>
++
++
++#define GPIOMMC_MAX_NAMELEN           15
++#define GPIOMMC_MAX_NAMELEN_STR               __stringify(GPIOMMC_MAX_NAMELEN)
++
++/**
++ * struct gpiommc_pins - Hardware pin assignments
++ *
++ * @gpio_di: The GPIO number of the DATA IN pin
++ * @gpio_do: The GPIO number of the DATA OUT pin
++ * @gpio_clk: The GPIO number of the CLOCK pin
++ * @gpio_cs: The GPIO number of the CHIPSELECT pin
++ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
++ */
++struct gpiommc_pins {
++      unsigned int gpio_di;
++      unsigned int gpio_do;
++      unsigned int gpio_clk;
++      unsigned int gpio_cs;
++      bool cs_activelow;
++};
++
++/**
++ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
++ *
++ * @name: The unique name string of the device.
++ * @pins: The hardware pin assignments.
++ * @mode: The hardware mode. This is either SPI_MODE_0,
++ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
++ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
++ *                This is not standards compliant, but may be required for some
++ *                embedded machines to gain reasonable speed.
++ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
++ */
++struct gpiommc_platform_data {
++      char name[GPIOMMC_MAX_NAMELEN + 1];
++      struct gpiommc_pins pins;
++      u8 mode;
++      bool no_spi_delay;
++      unsigned int max_bus_speed;
++};
++
++/**
++ * GPIOMMC_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a gpiommc device.
++ */
++#define GPIOMMC_PLATDEV_NAME  "gpiommc"
++
++/**
++ * gpiommc_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int gpiommc_next_id(void);
++
++#endif /* LINUX_GPIOMMC_H_ */
+--- /dev/null
++++ b/Documentation/gpiommc.txt
+@@ -0,0 +1,97 @@
++GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
++================================================================
++
++The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
++MMC or SD card on GPIO pins.
++
++Two interfaces for registering a new MMC/SD card device are provided:
++A static platform-device based mechanism and a dynamic configfs based interface.
++
++
++Registering devices via platform-device
++=======================================
++
++The platform-device interface is used for registering MMC/SD devices that are
++part of the hardware platform. This is most useful only for embedded machines
++with MMC/SD devices statically connected to the platform GPIO bus.
++
++The data structures are declared in <linux/mmc/gpiommc.h>.
++
++To register a new device, define an instance of struct gpiommc_platform_data.
++This structure holds any information about how the device is hooked up to the
++GPIO pins and what hardware modes the device supports. See the docbook-style
++documentation in the header file for more information on the struct fields.
++
++Then allocate a new instance of a platform device by doing:
++
++      pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
++
++This will allocate the platform device data structures and hook it up to the
++gpiommc driver.
++Then add the gpiommc_platform_data to the platform device.
++
++      err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
++
++You may free the local instance of struct gpiommc_platform_data now. (So the
++struct may be allocated on the stack, too).
++Now simply register the platform device.
++
++      err = platform_device_add(pdev);
++
++Done. The gpiommc probe routine will be invoked now and you should see a kernel
++log message for the added device.
++
++
++Registering devices via configfs
++================================
++
++MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
++selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
++hardware are a common situation.
++So we provide a dynamic interface to conveniently handle adding and removing
++devices from userspace, without the need to recompile the kernel.
++
++The "gpiommc" subdirectory at the configfs mountpoint is used for handling
++the dynamic configuration.
++
++To create a new device, it must first be allocated with mkdir.
++The following command will allocate a device named "my_mmc":
++      mkdir /config/gpiommc/my_mmc
++
++There are several configuration files available in the new
++/config/gpiommc/my_mmc/ directory:
++
++gpio_data_in                  = The SPI data-IN GPIO pin number.
++gpio_data_out                 = The SPI data-OUT GPIO pin number.
++gpio_clock                    = The SPI Clock GPIO pin number.
++gpio_chipselect                       = The SPI Chipselect GPIO pin number.
++gpio_chipselect_activelow     = Boolean. If 0, Chipselect is active-HIGH.
++                                If 1, Chipselect is active-LOW.
++spi_mode                      = The SPI data mode. Can be 0-3.
++spi_delay                     = Enable all delays in the lowlevel bitbanging.
++max_bus_speed                 = The maximum SPI bus speed. In Hertz.
++
++register                      = Not a configuration parameter.
++                                Used to register the configured card
++                                with the kernel.
++
++The device must first get configured and then registered by writing "1" to
++the "register" file.
++The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
++and "gpio_chipselect" are essential and _must_ be configured before writing
++"1" to the "register" file. The registration will fail, otherwise.
++
++The default values for the other parameters are:
++gpio_chipselect_activelow     = 1             (CS active-LOW)
++spi_mode                      = 0             (SPI_MODE_0)
++spi_delay                     = 1             (enabled)
++max_bus_speed                 = 5000000       (5 Mhz)
++
++Configuration values can not be changed after registration. To unregister
++the device, write a "0" to the "register" file. The configuration can be
++changed again after unregistering.
++
++To completely remove the device, simply rmdir the directory
++(/config/gpiommc/my_mmc in this example).
++There's no need to first unregister the device before removing it. That will
++be done automatically.
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -2540,6 +2540,11 @@ T:      git git://git.kernel.org/pub/scm/linu
+ S:    Maintained
+ F:    drivers/media/video/gspca/
+ 
++GPIOMMC DRIVER
++P:    Michael Buesch
++M:    mb@bu3sch.de
++S:    Maintained
++
+ HARDWARE MONITORING
+ L:    lm-sensors@lm-sensors.org
+ W:    http://www.lm-sensors.org/

diff --git a/target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch
new file mode 100644 (file)
index 0000000..2e4e820
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch
@@ -0,0 +1,58 @@
+The gpiommc configfs context structure needs locking, as configfs
+does not lock access between files.
+
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
+       struct platform_device *pdev;
+       /* The configuration */
+       struct gpiommc_platform_data pdata;
++      /* Mutex to protect this structure */
++      struct mutex mutex;
+ };
+ 
+ #define GPIO_INVALID  -1
+@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
+       unsigned int gpio;
+       int err = 0;
+ 
++      mutex_lock(&dev->mutex);
++
+       if (attr == &gpiommc_attr_DI) {
+               gpio = dev->pdata.pins.gpio_di;
+               if (gpio == GPIO_INVALID)
+@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
+       WARN_ON(1);
+       err = -ENOSYS;
+ out:
++      mutex_unlock(&dev->mutex);
++
+       return err ? err : count;
+ }
+ 
+@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
+       int err = -EINVAL;
+       unsigned long data;
+ 
++      mutex_lock(&dev->mutex);
++
+       if (attr == &gpiommc_attr_register) {
+               err = strict_strtoul(page, 10, &data);
+               if (err)
+@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
+       WARN_ON(1);
+       err = -ENOSYS;
+ out:
++      mutex_unlock(&dev->mutex);
++
+       return err ? err : count;
+ }
+ 
+@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
+       if (!dev)
+               return NULL;
+ 
++      mutex_init(&dev->mutex);
+       config_item_init_type_name(&dev->item, name,
+                                  &gpiommc_dev_ci_type);
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.35/924-cs5535_gpio.patch
new file mode 100644 (file)
index 0000000..9081be8
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/924-cs5535_gpio.patch
@@ -0,0 +1,102 @@
+--- a/drivers/char/cs5535_gpio.c
++++ b/drivers/char/cs5535_gpio.c
+@@ -15,6 +15,7 @@
+ #include <linux/kernel.h>
+ #include <linux/init.h>
+ #include <linux/cdev.h>
++#include <linux/device.h>
+ #include <linux/ioport.h>
+ #include <linux/pci.h>
+ 
+@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
+ MODULE_DEVICE_TABLE(pci, divil_pci);
+ 
+ static struct cdev cs5535_gpio_cdev;
++static struct class *cs5535_gpio_class;
+ 
+ /* reserve 32 entries even though some aren't usable */
+ #define CS5535_GPIO_COUNT     32
+@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
+       { 0x30, 0x00, '1', '0' },       /* GPIOx_READ_BACK / GPIOx_OUT_VAL */
+       { 0x20, 0x20, 'I', 'i' },       /* GPIOx_IN_EN */
+       { 0x04, 0x04, 'O', 'o' },       /* GPIOx_OUT_EN */
++      { 0x10, 0x10, 'A', 'a' },       /* GPIOx_OUT_AUX1_SEL */
++      { 0x14, 0x14, 'B', 'b' },       /* GPIOx_OUT_AUX2_SEL */
+       { 0x08, 0x08, 't', 'T' },       /* GPIOx_OUT_OD_EN */
+       { 0x18, 0x18, 'P', 'p' },       /* GPIOx_OUT_PU_EN */
+       { 0x1c, 0x1c, 'D', 'd' },       /* GPIOx_OUT_PD_EN */
++      { 0x24, 0x24, 'N', 'n' },       /* GPIOx_IN_INV_EN */
++      { 0x0c, 0x0c, 'X', 'x' },       /* GPIOx_OUT_INV_EN */
++      { 0x00, 0x00, 'H', 'L' },       /* GPIOx_OUT_VAL */
+ };
+ 
+ 
+@@ -176,7 +183,7 @@ static int __init cs5535_gpio_init(void)
+ {
+       dev_t   dev_id;
+       u32     low, hi;
+-      int     retval;
++      int     retval, i;
+ 
+       if (pci_dev_present(divil_pci) == 0) {
+               printk(KERN_WARNING NAME ": DIVIL not found\n");
+@@ -231,23 +238,54 @@ static int __init cs5535_gpio_init(void)
+               major = MAJOR(dev_id);
+       }
+ 
+-      if (retval) {
+-              release_region(gpio_base, CS5535_GPIO_SIZE);
+-              return -1;
+-      }
++      if (retval)
++              goto error;
+ 
+       printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
+              gpio_base, mask, major);
+ 
+       cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
+-      cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
++      retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
++      if (retval) {
++              kobject_put(&cs5535_gpio_cdev.kobj);
++              goto error_region;
++      }
++
++      cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
++      if (IS_ERR(cs5535_gpio_class)) {
++              printk(KERN_ERR "Error creating cs5535_gpio class\n");
++              cdev_del(&cs5535_gpio_cdev);
++              retval = PTR_ERR(cs5535_gpio_class);
++              goto error_region;
++      }
++
++      for (i = 0; i < CS5535_GPIO_COUNT; i++) {
++              if (mask & (1<<i)) {
++                      device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
++              }
++      }
+ 
+       return 0;
++
++error_region:
++      unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
++error:
++      release_region(gpio_base, CS5535_GPIO_SIZE);
++      return retval;
+ }
+ 
+ static void __exit cs5535_gpio_cleanup(void)
+ {
+       dev_t dev_id = MKDEV(major, 0);
++      int i;
++
++      for (i = 0; i < CS5535_GPIO_COUNT; i++) {
++              if (mask & (1<<i)) {
++                      device_destroy(cs5535_gpio_class, MKDEV(major, i));
++              }
++      }
++
++      class_destroy(cs5535_gpio_class);
+ 
+       cdev_del(&cs5535_gpio_cdev);
+       unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);

diff --git a/target/linux/generic-2.6/patches-2.6.35/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.35/940-wireless_mesh_header.patch
new file mode 100644 (file)
index 0000000..33d5299
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/940-wireless_mesh_header.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -138,7 +138,7 @@ static inline bool dev_xmit_complete(int
+  */
+ 
+ #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+-# if defined(CONFIG_MAC80211_MESH)
++# if 1 || defined(CONFIG_MAC80211_MESH)
+ #  define LL_MAX_HEADER 128
+ # else
+ #  define LL_MAX_HEADER 96

diff --git a/target/linux/generic-2.6/patches-2.6.35/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.35/951-revert_gcc4_4_fixes.patch
new file mode 100644 (file)
index 0000000..d2c76a8
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/951-revert_gcc4_4_fixes.patch
@@ -0,0 +1,524 @@
+--- a/arch/powerpc/boot/crtsavres.S
++++ /dev/null
+@@ -1,233 +0,0 @@
+-/*
+- * Special support for eabi and SVR4
+- *
+- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
+- *   Copyright 2008 Freescale Semiconductor, Inc.
+- *   Written By Michael Meissner
+- *
+- * Based on gcc/config/rs6000/crtsavres.asm from gcc
+- *
+- * This file 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, or (at your option) any
+- * later version.
+- *
+- * In addition to the permissions in the GNU General Public License, the
+- * Free Software Foundation gives you unlimited permission to link the
+- * compiled version of this file with other programs, and to distribute
+- * those programs without any restriction coming from the use of this
+- * file.  (The General Public License restrictions do apply in other
+- * respects; for example, they cover modification of the file, and
+- * distribution when not linked into another program.)
+- *
+- * This file 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
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; see the file COPYING.  If not, write to
+- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02110-1301, USA.
+- *
+- *    As a special exception, if you link this library with files
+- *    compiled with GCC to produce an executable, this does not cause
+- *    the resulting executable to be covered by the GNU General Public License.
+- *    This exception does not however invalidate any other reasons why
+- *    the executable file might be covered by the GNU General Public License.
+- */
+-
+-      .file   "crtsavres.S"
+-      .section ".text"
+-
+-/* On PowerPC64 Linux, these functions are provided by the linker.  */
+-#ifndef __powerpc64__
+-
+-#define _GLOBAL(name) \
+-      .type name,@function; \
+-      .globl name; \
+-name:
+-
+-/* Routines for saving integer registers, called by the compiler.  */
+-/* Called with r11 pointing to the stack header word of the caller of the */
+-/* function, just beyond the end of the integer save area.  */
+-
+-_GLOBAL(_savegpr_14)
+-_GLOBAL(_save32gpr_14)
+-      stw     14,-72(11)      /* save gp registers */
+-_GLOBAL(_savegpr_15)
+-_GLOBAL(_save32gpr_15)
+-      stw     15,-68(11)
+-_GLOBAL(_savegpr_16)
+-_GLOBAL(_save32gpr_16)
+-      stw     16,-64(11)
+-_GLOBAL(_savegpr_17)
+-_GLOBAL(_save32gpr_17)
+-      stw     17,-60(11)
+-_GLOBAL(_savegpr_18)
+-_GLOBAL(_save32gpr_18)
+-      stw     18,-56(11)
+-_GLOBAL(_savegpr_19)
+-_GLOBAL(_save32gpr_19)
+-      stw     19,-52(11)
+-_GLOBAL(_savegpr_20)
+-_GLOBAL(_save32gpr_20)
+-      stw     20,-48(11)
+-_GLOBAL(_savegpr_21)
+-_GLOBAL(_save32gpr_21)
+-      stw     21,-44(11)
+-_GLOBAL(_savegpr_22)
+-_GLOBAL(_save32gpr_22)
+-      stw     22,-40(11)
+-_GLOBAL(_savegpr_23)
+-_GLOBAL(_save32gpr_23)
+-      stw     23,-36(11)
+-_GLOBAL(_savegpr_24)
+-_GLOBAL(_save32gpr_24)
+-      stw     24,-32(11)
+-_GLOBAL(_savegpr_25)
+-_GLOBAL(_save32gpr_25)
+-      stw     25,-28(11)
+-_GLOBAL(_savegpr_26)
+-_GLOBAL(_save32gpr_26)
+-      stw     26,-24(11)
+-_GLOBAL(_savegpr_27)
+-_GLOBAL(_save32gpr_27)
+-      stw     27,-20(11)
+-_GLOBAL(_savegpr_28)
+-_GLOBAL(_save32gpr_28)
+-      stw     28,-16(11)
+-_GLOBAL(_savegpr_29)
+-_GLOBAL(_save32gpr_29)
+-      stw     29,-12(11)
+-_GLOBAL(_savegpr_30)
+-_GLOBAL(_save32gpr_30)
+-      stw     30,-8(11)
+-_GLOBAL(_savegpr_31)
+-_GLOBAL(_save32gpr_31)
+-      stw     31,-4(11)
+-      blr
+-
+-/* Routines for restoring integer registers, called by the compiler.  */
+-/* Called with r11 pointing to the stack header word of the caller of the */
+-/* function, just beyond the end of the integer restore area.  */
+-
+-_GLOBAL(_restgpr_14)
+-_GLOBAL(_rest32gpr_14)
+-      lwz     14,-72(11)      /* restore gp registers */
+-_GLOBAL(_restgpr_15)
+-_GLOBAL(_rest32gpr_15)
+-      lwz     15,-68(11)
+-_GLOBAL(_restgpr_16)
+-_GLOBAL(_rest32gpr_16)
+-      lwz     16,-64(11)
+-_GLOBAL(_restgpr_17)
+-_GLOBAL(_rest32gpr_17)
+-      lwz     17,-60(11)
+-_GLOBAL(_restgpr_18)
+-_GLOBAL(_rest32gpr_18)
+-      lwz     18,-56(11)
+-_GLOBAL(_restgpr_19)
+-_GLOBAL(_rest32gpr_19)
+-      lwz     19,-52(11)
+-_GLOBAL(_restgpr_20)
+-_GLOBAL(_rest32gpr_20)
+-      lwz     20,-48(11)
+-_GLOBAL(_restgpr_21)
+-_GLOBAL(_rest32gpr_21)
+-      lwz     21,-44(11)
+-_GLOBAL(_restgpr_22)
+-_GLOBAL(_rest32gpr_22)
+-      lwz     22,-40(11)
+-_GLOBAL(_restgpr_23)
+-_GLOBAL(_rest32gpr_23)
+-      lwz     23,-36(11)
+-_GLOBAL(_restgpr_24)
+-_GLOBAL(_rest32gpr_24)
+-      lwz     24,-32(11)
+-_GLOBAL(_restgpr_25)
+-_GLOBAL(_rest32gpr_25)
+-      lwz     25,-28(11)
+-_GLOBAL(_restgpr_26)
+-_GLOBAL(_rest32gpr_26)
+-      lwz     26,-24(11)
+-_GLOBAL(_restgpr_27)
+-_GLOBAL(_rest32gpr_27)
+-      lwz     27,-20(11)
+-_GLOBAL(_restgpr_28)
+-_GLOBAL(_rest32gpr_28)
+-      lwz     28,-16(11)
+-_GLOBAL(_restgpr_29)
+-_GLOBAL(_rest32gpr_29)
+-      lwz     29,-12(11)
+-_GLOBAL(_restgpr_30)
+-_GLOBAL(_rest32gpr_30)
+-      lwz     30,-8(11)
+-_GLOBAL(_restgpr_31)
+-_GLOBAL(_rest32gpr_31)
+-      lwz     31,-4(11)
+-      blr
+-
+-/* Routines for restoring integer registers, called by the compiler.  */
+-/* Called with r11 pointing to the stack header word of the caller of the */
+-/* function, just beyond the end of the integer restore area.  */
+-
+-_GLOBAL(_restgpr_14_x)
+-_GLOBAL(_rest32gpr_14_x)
+-      lwz     14,-72(11)      /* restore gp registers */
+-_GLOBAL(_restgpr_15_x)
+-_GLOBAL(_rest32gpr_15_x)
+-      lwz     15,-68(11)
+-_GLOBAL(_restgpr_16_x)
+-_GLOBAL(_rest32gpr_16_x)
+-      lwz     16,-64(11)
+-_GLOBAL(_restgpr_17_x)
+-_GLOBAL(_rest32gpr_17_x)
+-      lwz     17,-60(11)
+-_GLOBAL(_restgpr_18_x)
+-_GLOBAL(_rest32gpr_18_x)
+-      lwz     18,-56(11)
+-_GLOBAL(_restgpr_19_x)
+-_GLOBAL(_rest32gpr_19_x)
+-      lwz     19,-52(11)
+-_GLOBAL(_restgpr_20_x)
+-_GLOBAL(_rest32gpr_20_x)
+-      lwz     20,-48(11)
+-_GLOBAL(_restgpr_21_x)
+-_GLOBAL(_rest32gpr_21_x)
+-      lwz     21,-44(11)
+-_GLOBAL(_restgpr_22_x)
+-_GLOBAL(_rest32gpr_22_x)
+-      lwz     22,-40(11)
+-_GLOBAL(_restgpr_23_x)
+-_GLOBAL(_rest32gpr_23_x)
+-      lwz     23,-36(11)
+-_GLOBAL(_restgpr_24_x)
+-_GLOBAL(_rest32gpr_24_x)
+-      lwz     24,-32(11)
+-_GLOBAL(_restgpr_25_x)
+-_GLOBAL(_rest32gpr_25_x)
+-      lwz     25,-28(11)
+-_GLOBAL(_restgpr_26_x)
+-_GLOBAL(_rest32gpr_26_x)
+-      lwz     26,-24(11)
+-_GLOBAL(_restgpr_27_x)
+-_GLOBAL(_rest32gpr_27_x)
+-      lwz     27,-20(11)
+-_GLOBAL(_restgpr_28_x)
+-_GLOBAL(_rest32gpr_28_x)
+-      lwz     28,-16(11)
+-_GLOBAL(_restgpr_29_x)
+-_GLOBAL(_rest32gpr_29_x)
+-      lwz     29,-12(11)
+-_GLOBAL(_restgpr_30_x)
+-_GLOBAL(_rest32gpr_30_x)
+-      lwz     30,-8(11)
+-_GLOBAL(_restgpr_31_x)
+-_GLOBAL(_rest32gpr_31_x)
+-      lwz     0,4(11)
+-      lwz     31,-4(11)
+-      mtlr    0
+-      mr      1,11
+-      blr
+-#endif
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -60,7 +60,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
+ $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
+       $(addprefix $(obj)/,$(libfdtheader))
+ 
+-src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
++src-wlib := string.S crt0.S stdio.c main.c \
+               $(libfdt) libfdt-wrapper.c \
+               ns16550.c serial.c simple_alloc.c div64.S util.S \
+               gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
+--- a/arch/powerpc/kernel/prom_init_check.sh
++++ b/arch/powerpc/kernel/prom_init_check.sh
+@@ -48,20 +48,6 @@ do
+               fi
+       done
+ 
+-      # ignore register save/restore funcitons
+-      if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
+-              OK=1
+-      fi
+-      if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
+-              OK=1
+-      fi
+-      if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
+-              OK=1
+-      fi
+-      if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
+-              OK=1
+-      fi
+-
+       if [ $OK -eq 0 ]; then
+               ERROR=1
+               echo "Error: External symbol '$UNDEF' referenced" \
+--- a/arch/powerpc/lib/crtsavres.S
++++ /dev/null
+@@ -1,229 +0,0 @@
+-/*
+- * Special support for eabi and SVR4
+- *
+- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
+- *   Copyright 2008 Freescale Semiconductor, Inc.
+- *   Written By Michael Meissner
+- *
+- * Based on gcc/config/rs6000/crtsavres.asm from gcc
+- *
+- * This file 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, or (at your option) any
+- * later version.
+- *
+- * In addition to the permissions in the GNU General Public License, the
+- * Free Software Foundation gives you unlimited permission to link the
+- * compiled version of this file with other programs, and to distribute
+- * those programs without any restriction coming from the use of this
+- * file.  (The General Public License restrictions do apply in other
+- * respects; for example, they cover modification of the file, and
+- * distribution when not linked into another program.)
+- *
+- * This file 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
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; see the file COPYING.  If not, write to
+- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02110-1301, USA.
+- *
+- *    As a special exception, if you link this library with files
+- *    compiled with GCC to produce an executable, this does not cause
+- *    the resulting executable to be covered by the GNU General Public License.
+- *    This exception does not however invalidate any other reasons why
+- *    the executable file might be covered by the GNU General Public License.
+- */
+-
+-#include <asm/ppc_asm.h>
+-
+-      .file   "crtsavres.S"
+-      .section ".text"
+-
+-#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+-
+-/* Routines for saving integer registers, called by the compiler.  */
+-/* Called with r11 pointing to the stack header word of the caller of the */
+-/* function, just beyond the end of the integer save area.  */
+-
+-_GLOBAL(_savegpr_14)
+-_GLOBAL(_save32gpr_14)
+-      stw     14,-72(11)      /* save gp registers */
+-_GLOBAL(_savegpr_15)
+-_GLOBAL(_save32gpr_15)
+-      stw     15,-68(11)
+-_GLOBAL(_savegpr_16)
+-_GLOBAL(_save32gpr_16)
+-      stw     16,-64(11)
+-_GLOBAL(_savegpr_17)
+-_GLOBAL(_save32gpr_17)
+-      stw     17,-60(11)
+-_GLOBAL(_savegpr_18)
+-_GLOBAL(_save32gpr_18)
+-      stw     18,-56(11)
+-_GLOBAL(_savegpr_19)
+-_GLOBAL(_save32gpr_19)
+-      stw     19,-52(11)
+-_GLOBAL(_savegpr_20)
+-_GLOBAL(_save32gpr_20)
+-      stw     20,-48(11)
+-_GLOBAL(_savegpr_21)
+-_GLOBAL(_save32gpr_21)
+-      stw     21,-44(11)
+-_GLOBAL(_savegpr_22)
+-_GLOBAL(_save32gpr_22)
+-      stw     22,-40(11)
+-_GLOBAL(_savegpr_23)
+-_GLOBAL(_save32gpr_23)
+-      stw     23,-36(11)
+-_GLOBAL(_savegpr_24)
+-_GLOBAL(_save32gpr_24)
+-      stw     24,-32(11)
+-_GLOBAL(_savegpr_25)
+-_GLOBAL(_save32gpr_25)
+-      stw     25,-28(11)
+-_GLOBAL(_savegpr_26)
+-_GLOBAL(_save32gpr_26)
+-      stw     26,-24(11)
+-_GLOBAL(_savegpr_27)
+-_GLOBAL(_save32gpr_27)
+-      stw     27,-20(11)
+-_GLOBAL(_savegpr_28)
+-_GLOBAL(_save32gpr_28)
+-      stw     28,-16(11)
+-_GLOBAL(_savegpr_29)
+-_GLOBAL(_save32gpr_29)
+-      stw     29,-12(11)
+-_GLOBAL(_savegpr_30)
+-_GLOBAL(_save32gpr_30)
+-      stw     30,-8(11)
+-_GLOBAL(_savegpr_31)
+-_GLOBAL(_save32gpr_31)
+-      stw     31,-4(11)
+-      blr
+-
+-/* Routines for restoring integer registers, called by the compiler.  */
+-/* Called with r11 pointing to the stack header word of the caller of the */
+-/* function, just beyond the end of the integer restore area.  */
+-
+-_GLOBAL(_restgpr_14)
+-_GLOBAL(_rest32gpr_14)
+-      lwz     14,-72(11)      /* restore gp registers */
+-_GLOBAL(_restgpr_15)
+-_GLOBAL(_rest32gpr_15)
+-      lwz     15,-68(11)
+-_GLOBAL(_restgpr_16)
+-_GLOBAL(_rest32gpr_16)
+-      lwz     16,-64(11)
+-_GLOBAL(_restgpr_17)
+-_GLOBAL(_rest32gpr_17)
+-      lwz     17,-60(11)
+-_GLOBAL(_restgpr_18)
+-_GLOBAL(_rest32gpr_18)
+-      lwz     18,-56(11)
+-_GLOBAL(_restgpr_19)
+-_GLOBAL(_rest32gpr_19)
+-      lwz     19,-52(11)
+-_GLOBAL(_restgpr_20)
+-_GLOBAL(_rest32gpr_20)
+-      lwz     20,-48(11)
+-_GLOBAL(_restgpr_21)
+-_GLOBAL(_rest32gpr_21)
+-      lwz     21,-44(11)
+-_GLOBAL(_restgpr_22)
+-_GLOBAL(_rest32gpr_22)
+-      lwz     22,-40(11)
+-_GLOBAL(_restgpr_23)
+-_GLOBAL(_rest32gpr_23)
+-      lwz     23,-36(11)
+-_GLOBAL(_restgpr_24)
+-_GLOBAL(_rest32gpr_24)
+-      lwz     24,-32(11)
+-_GLOBAL(_restgpr_25)
+-_GLOBAL(_rest32gpr_25)
+-      lwz     25,-28(11)
+-_GLOBAL(_restgpr_26)
+-_GLOBAL(_rest32gpr_26)
+-      lwz     26,-24(11)
+-_GLOBAL(_restgpr_27)
+-_GLOBAL(_rest32gpr_27)
+-      lwz     27,-20(11)
+-_GLOBAL(_restgpr_28)
+-_GLOBAL(_rest32gpr_28)
+-      lwz     28,-16(11)
+-_GLOBAL(_restgpr_29)
+-_GLOBAL(_rest32gpr_29)
+-      lwz     29,-12(11)
+-_GLOBAL(_restgpr_30)
+-_GLOBAL(_rest32gpr_30)
+-      lwz     30,-8(11)
+-_GLOBAL(_restgpr_31)
+-_GLOBAL(_rest32gpr_31)
+-      lwz     31,-4(11)
+-      blr
+-
+-/* Routines for restoring integer registers, called by the compiler.  */
+-/* Called with r11 pointing to the stack header word of the caller of the */
+-/* function, just beyond the end of the integer restore area.  */
+-
+-_GLOBAL(_restgpr_14_x)
+-_GLOBAL(_rest32gpr_14_x)
+-      lwz     14,-72(11)      /* restore gp registers */
+-_GLOBAL(_restgpr_15_x)
+-_GLOBAL(_rest32gpr_15_x)
+-      lwz     15,-68(11)
+-_GLOBAL(_restgpr_16_x)
+-_GLOBAL(_rest32gpr_16_x)
+-      lwz     16,-64(11)
+-_GLOBAL(_restgpr_17_x)
+-_GLOBAL(_rest32gpr_17_x)
+-      lwz     17,-60(11)
+-_GLOBAL(_restgpr_18_x)
+-_GLOBAL(_rest32gpr_18_x)
+-      lwz     18,-56(11)
+-_GLOBAL(_restgpr_19_x)
+-_GLOBAL(_rest32gpr_19_x)
+-      lwz     19,-52(11)
+-_GLOBAL(_restgpr_20_x)
+-_GLOBAL(_rest32gpr_20_x)
+-      lwz     20,-48(11)
+-_GLOBAL(_restgpr_21_x)
+-_GLOBAL(_rest32gpr_21_x)
+-      lwz     21,-44(11)
+-_GLOBAL(_restgpr_22_x)
+-_GLOBAL(_rest32gpr_22_x)
+-      lwz     22,-40(11)
+-_GLOBAL(_restgpr_23_x)
+-_GLOBAL(_rest32gpr_23_x)
+-      lwz     23,-36(11)
+-_GLOBAL(_restgpr_24_x)
+-_GLOBAL(_rest32gpr_24_x)
+-      lwz     24,-32(11)
+-_GLOBAL(_restgpr_25_x)
+-_GLOBAL(_rest32gpr_25_x)
+-      lwz     25,-28(11)
+-_GLOBAL(_restgpr_26_x)
+-_GLOBAL(_rest32gpr_26_x)
+-      lwz     26,-24(11)
+-_GLOBAL(_restgpr_27_x)
+-_GLOBAL(_rest32gpr_27_x)
+-      lwz     27,-20(11)
+-_GLOBAL(_restgpr_28_x)
+-_GLOBAL(_rest32gpr_28_x)
+-      lwz     28,-16(11)
+-_GLOBAL(_restgpr_29_x)
+-_GLOBAL(_rest32gpr_29_x)
+-      lwz     29,-12(11)
+-_GLOBAL(_restgpr_30_x)
+-_GLOBAL(_rest32gpr_30_x)
+-      lwz     30,-8(11)
+-_GLOBAL(_restgpr_31_x)
+-_GLOBAL(_rest32gpr_31_x)
+-      lwz     0,4(11)
+-      lwz     31,-4(11)
+-      mtlr    0
+-      mr      1,11
+-      blr
+-#endif
+--- a/arch/powerpc/lib/Makefile
++++ b/arch/powerpc/lib/Makefile
+@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
+ 
+ obj-y                 := string.o alloc.o \
+                          checksum_$(CONFIG_WORD_SIZE).o
+-obj-$(CONFIG_PPC32)   += div64.o copy_32.o crtsavres.o
++obj-$(CONFIG_PPC32)   += div64.o copy_32.o
+ obj-$(CONFIG_HAS_IOMEM)       += devres.o
+ 
+ obj-$(CONFIG_PPC64)   += copypage_64.o copyuser_64.o \
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -92,8 +92,6 @@ endif
+ else
+       KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
+ endif
+-else
+-LDFLAGS_MODULE        += arch/powerpc/lib/crtsavres.o
+ endif
+ 
+ ifeq ($(CONFIG_TUNE_CELL),y)

diff --git a/target/linux/generic-2.6/patches-2.6.35/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.35/970-ocf_kbuild_integration.patch
new file mode 100644 (file)
index 0000000..76413e9
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/970-ocf_kbuild_integration.patch
@@ -0,0 +1,20 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -836,3 +836,6 @@ config CRYPTO_ANSI_CPRNG
+ source "drivers/crypto/Kconfig"
+ 
+ endif # if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -86,6 +86,8 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
+ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
+ obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o
+ 
++obj-$(CONFIG_OCF_OCF) += ocf/
++
+ #
+ # generic algorithms and the async_tx api
+ #

diff --git a/target/linux/generic-2.6/patches-2.6.35/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.35/971-ocf_20100325.patch
new file mode 100644 (file)
index 0000000..02bb9f2
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/971-ocf_20100325.patch
@@ -0,0 +1,82 @@
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
+       }
+       return ret;
+ }
++EXPORT_SYMBOL(sys_dup);
+ 
+ #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
+ 
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -12,6 +12,7 @@
+ #define APOLLO_MOUSE_MINOR    7
+ #define PC110PAD_MINOR                9
+ /*#define ADB_MOUSE_MINOR     10      FIXME OBSOLETE */
++#define CRYPTODEV_MINOR               70      /* /dev/crypto */
+ #define WATCHDOG_MINOR                130     /* Watchdog timer     */
+ #define TEMP_MINOR            131     /* Temperature Sensor */
+ #define RTC_MINOR             135
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -9,6 +9,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/ioctl.h>
++#include <linux/types.h> /* for __u32 in user space */
+ #include <linux/irqnr.h>
+ 
+ /* ioctl()'s for the random number generator */
+@@ -34,6 +35,30 @@
+ /* Clear the entropy pool and associated counters.  (Superuser only.) */
+ #define RNDCLEARPOOL  _IO( 'R', 0x06 )
+ 
++#ifdef CONFIG_FIPS_RNG
++
++/* Size of seed value - equal to AES blocksize */
++#define AES_BLOCK_SIZE_BYTES  16
++#define SEED_SIZE_BYTES                       AES_BLOCK_SIZE_BYTES
++/* Size of AES key */
++#define KEY_SIZE_BYTES                16
++
++/* ioctl() structure used by FIPS 140-2 Tests */
++struct rand_fips_test {
++      unsigned char key[KEY_SIZE_BYTES];                      /* Input */
++      unsigned char datetime[SEED_SIZE_BYTES];        /* Input */
++      unsigned char seed[SEED_SIZE_BYTES];            /* Input */
++      unsigned char result[SEED_SIZE_BYTES];          /* Output */
++};
++
++/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
++#define RNDFIPSVST    _IOWR('R', 0x10, struct rand_fips_test)
++
++/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
++#define RNDFIPSMCT    _IOWR('R', 0x11, struct rand_fips_test)
++
++#endif /* #ifdef CONFIG_FIPS_RNG */
++
+ struct rand_pool_info {
+       int     entropy_count;
+       int     buf_size;
+@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
+                                unsigned int value);
+ extern void add_interrupt_randomness(int irq);
+ 
++extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
++extern int random_input_wait(void);
++#define HAS_RANDOM_INPUT_WAIT 1
++
+ extern void get_random_bytes(void *buf, int nbytes);
+ void generate_random_uuid(unsigned char uuid_out[16]);
+ 
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -389,6 +389,7 @@ struct task_struct *find_task_by_vpid(pi
+ {
+       return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
+ {

diff --git a/target/linux/generic-2.6/patches-2.6.35/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.35/974-ssb_b43_default_on.patch
new file mode 100644 (file)
index 0000000..3176dcb
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/974-ssb_b43_default_on.patch
@@ -0,0 +1,19 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -29,6 +29,7 @@ config SSB_SPROM
+ config SSB_BLOCKIO
+       bool
+       depends on SSB
++      default y
+ 
+ config SSB_PCIHOST_POSSIBLE
+       bool
+@@ -49,7 +50,7 @@ config SSB_PCIHOST
+ config SSB_B43_PCI_BRIDGE
+       bool
+       depends on SSB_PCIHOST
+-      default n
++      default y
+ 
+ config SSB_PCMCIAHOST_POSSIBLE
+       bool

diff --git a/target/linux/generic-2.6/patches-2.6.35/975-hifn795x-byteswap.patch b/target/linux/generic-2.6/patches-2.6.35/975-hifn795x-byteswap.patch
new file mode 100644 (file)
index 0000000..3a37c95
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/975-hifn795x-byteswap.patch
@@ -0,0 +1,17 @@
+--- a/drivers/crypto/hifn_795x.c
++++ b/drivers/crypto/hifn_795x.c
+@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
+ 
+ static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-      writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
++      writel(val, dev->bar[0] + reg);
+ }
+ 
+ static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-      writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
++      writel(val, dev->bar[1] + reg);
+ }
+ 
+ static void hifn_wait_puc(struct hifn_device *dev)

diff --git a/target/linux/generic-2.6/patches-2.6.35/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.35/977-textsearch_kconfig_hacks.patch
new file mode 100644 (file)
index 0000000..e9577ba
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/977-textsearch_kconfig_hacks.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -158,16 +158,16 @@ config REED_SOLOMON_DEC16
+ # Textsearch support is select'ed if needed
+ #
+ config TEXTSEARCH
+-      boolean
++      boolean "Textsearch support"
+ 
+ config TEXTSEARCH_KMP
+-      tristate
++      tristate "Textsearch KMP"
+ 
+ config TEXTSEARCH_BM
+-      tristate
++      tristate "Textsearch BM"
+ 
+ config TEXTSEARCH_FSM
+-      tristate
++      tristate "Textsearch FSM"
+ 
+ config BTREE
+       boolean

diff --git a/target/linux/generic-2.6/patches-2.6.35/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.35/978-lib80211_kconfig_hacks.patch
new file mode 100644 (file)
index 0000000..c044dea
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/978-lib80211_kconfig_hacks.patch
@@ -0,0 +1,19 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -142,13 +142,13 @@ config LIB80211
+         you want this built into your kernel.
+ 
+ config LIB80211_CRYPT_WEP
+-      tristate
++      tristate "LIB80211_CRYPT_WEP"
+ 
+ config LIB80211_CRYPT_CCMP
+-      tristate
++      tristate "LIB80211_CRYPT_CCMP"
+ 
+ config LIB80211_CRYPT_TKIP
+-      tristate
++      tristate "LIB80211_CRYPT_TKIP"
+ 
+ config LIB80211_DEBUG
+       bool "lib80211 debugging messages"

diff --git a/target/linux/generic-2.6/patches-2.6.35/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.35/979-crypto_add_kconfig_prompts.patch
new file mode 100644 (file)
index 0000000..b40b2ce
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/979-crypto_add_kconfig_prompts.patch
@@ -0,0 +1,47 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -32,7 +32,7 @@ config CRYPTO_FIPS
+         option is selected
+ 
+ config CRYPTO_ALGAPI
+-      tristate
++      tristate "ALGAPI"
+       select CRYPTO_ALGAPI2
+       help
+         This option provides the API for cryptographic algorithms.
+@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
+       tristate
+ 
+ config CRYPTO_AEAD
+-      tristate
++      tristate "AEAD"
+       select CRYPTO_AEAD2
+       select CRYPTO_ALGAPI
+ 
+@@ -50,7 +50,7 @@ config CRYPTO_AEAD2
+       select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_BLKCIPHER
+-      tristate
++      tristate "BLKCIPHER"
+       select CRYPTO_BLKCIPHER2
+       select CRYPTO_ALGAPI
+ 
+@@ -61,7 +61,7 @@ config CRYPTO_BLKCIPHER2
+       select CRYPTO_WORKQUEUE
+ 
+ config CRYPTO_HASH
+-      tristate
++      tristate "HASH"
+       select CRYPTO_HASH2
+       select CRYPTO_ALGAPI
+ 
+@@ -70,7 +70,7 @@ config CRYPTO_HASH2
+       select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_RNG
+-      tristate
++      tristate "RNG"
+       select CRYPTO_RNG2
+       select CRYPTO_ALGAPI
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.35/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.35/980-vm_exports.patch
new file mode 100644 (file)
index 0000000..5d0b5c6
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/980-vm_exports.patch
@@ -0,0 +1,142 @@
+--- a/mm/shmem.c
++++ b/mm/shmem.c
+@@ -29,6 +29,7 @@
+ #include <linux/mm.h>
+ #include <linux/module.h>
+ #include <linux/swap.h>
++#include <linux/ima.h>
+ 
+ static struct vfsmount *shm_mnt;
+ 
+@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
+ 
+ /* common code */
+ 
++void shmem_set_file(struct vm_area_struct *vma, struct file *file)
++{
++      ima_counts_get(file);
++      if (vma->vm_file)
++              fput(vma->vm_file);
++      vma->vm_file = file;
++      vma->vm_ops = &shmem_vm_ops;
++}
++EXPORT_SYMBOL_GPL(shmem_set_file);
++
+ /**
+  * shmem_file_setup - get an unlinked file living in tmpfs
+  * @name: name for dentry (to be seen in /proc/<pid>/maps
+@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
+       if (IS_ERR(file))
+               return PTR_ERR(file);
+ 
+-      if (vma->vm_file)
+-              fput(vma->vm_file);
+-      vma->vm_file = file;
+-      vma->vm_ops = &shmem_vm_ops;
++      shmem_set_file(vma, file);
+       return 0;
+ }
+--- a/fs/file.c
++++ b/fs/file.c
+@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
+       /* All good, so we try */
+       return expand_fdtable(files, nr);
+ }
++EXPORT_SYMBOL_GPL(expand_files);
+ 
+ static int count_open_files(struct fdtable *fdt)
+ {
+--- a/kernel/exit.c
++++ b/kernel/exit.c
+@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st
+ 
+       return files;
+ }
++EXPORT_SYMBOL_GPL(get_files_struct);
+ 
+ void put_files_struct(struct files_struct *files)
+ {
+@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc
+               rcu_read_unlock();
+       }
+ }
++EXPORT_SYMBOL_GPL(put_files_struct);
+ 
+ void reset_files_struct(struct files_struct *files)
+ {
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -177,6 +177,7 @@ void __put_task_struct(struct task_struc
+       if (!profile_handoff_task(tsk))
+               free_task(tsk);
+ }
++EXPORT_SYMBOL_GPL(__put_task_struct);
+ 
+ /*
+  * macro override instead of weak attribute alias, to workaround
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -4367,6 +4367,7 @@ int can_nice(const struct task_struct *p
+       return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
+               capable(CAP_SYS_NICE));
+ }
++EXPORT_SYMBOL_GPL(can_nice);
+ 
+ #ifdef __ARCH_WANT_SYS_NICE
+ 
+--- a/mm/memory.c
++++ b/mm/memory.c
+@@ -1203,6 +1203,7 @@ unsigned long zap_page_range(struct vm_a
+               tlb_finish_mmu(tlb, address, end);
+       return end;
+ }
++EXPORT_SYMBOL_GPL(zap_page_range);
+ 
+ /**
+  * zap_vma_ptes - remove ptes mapping the vma
+@@ -2596,6 +2597,7 @@ int vmtruncate_range(struct inode *inode
+ 
+       return 0;
+ }
++EXPORT_SYMBOL_GPL(vmtruncate_range);
+ 
+ /*
+  * We enter with non-exclusive mmap_sem (to exclude vma changes,
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
+       vunmap_page_range(addr, end);
+       flush_tlb_kernel_range(addr, end);
+ }
++EXPORT_SYMBOL_GPL(unmap_kernel_range);
+ 
+ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
+ {
+@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
+       return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
+                               -1, GFP_KERNEL, __builtin_return_address(0));
+ }
++EXPORT_SYMBOL_GPL(get_vm_area);
+ 
+ struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
+                               void *caller)
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -728,6 +728,7 @@ extern void show_free_areas(void);
+ 
+ int shmem_lock(struct file *file, int lock, struct user_struct *user);
+ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
++void shmem_set_file(struct vm_area_struct *vma, struct file *file);
+ int shmem_zero_setup(struct vm_area_struct *);
+ 
+ #ifndef CONFIG_MMU
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -1121,6 +1121,7 @@ struct sighand_struct *lock_task_sighand
+ 
+       return sighand;
+ }
++EXPORT_SYMBOL(lock_task_sighand);
+ 
+ /*
+  * send signal info to all the members of a group

diff --git a/target/linux/generic-2.6/patches-2.6.35/981-wireless_ext_kconfig_hack.patch b/target/linux/generic-2.6/patches-2.6.35/981-wireless_ext_kconfig_hack.patch
new file mode 100644 (file)
index 0000000..daac589
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/981-wireless_ext_kconfig_hack.patch
@@ -0,0 +1,22 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -1,5 +1,5 @@
+ config WIRELESS_EXT
+-      bool
++      bool "Wireless extensions"
+ 
+ config WEXT_CORE
+       def_bool y
+@@ -11,10 +11,10 @@ config WEXT_PROC
+       depends on WEXT_CORE
+ 
+ config WEXT_SPY
+-      bool
++      bool "WEXT_SPY"
+ 
+ config WEXT_PRIV
+-      bool
++      bool "WEXT_PRIV"
+ 
+ config CFG80211
+       tristate "cfg80211 - wireless configuration API"

diff --git a/target/linux/generic-2.6/patches-2.6.35/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.35/985-cris-headers.patch
new file mode 100644 (file)
index 0000000..73ede93
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/985-cris-headers.patch
@@ -0,0 +1,27 @@
+--- a/arch/cris/include/arch-v10/arch/Kbuild
++++ b/arch/cris/include/arch-v10/arch/Kbuild
+@@ -1,3 +1,5 @@
++header-y += elf.h
++header-y += ptrace.h
+ header-y += user.h
+ header-y += svinto.h
+ header-y += sv_addr_ag.h
+--- a/arch/cris/include/asm/Kbuild
++++ b/arch/cris/include/asm/Kbuild
+@@ -1,11 +1,14 @@
+ include include/asm-generic/Kbuild.asm
+ 
+-header-y += arch-v10/
+-header-y += arch-v32/
++header-y += ../arch-v10/arch/
++header-y += ../arch-v32/arch/
+ 
++header-y += elf.h
+ header-y += ethernet.h
++header-y += page.h
+ header-y += rtc.h
+ header-y += sync_serial.h
++header-y += user.h
+ 
+ unifdef-y += etraxgpio.h
+ unifdef-y += rs485.h

diff --git a/target/linux/generic-2.6/patches-2.6.35/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.35/991-ppc4xx_optimization.patch
new file mode 100644 (file)
index 0000000..0efb777
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/991-ppc4xx_optimization.patch
@@ -0,0 +1,31 @@
+Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
+they still want to support gcc 3.3 -- well, we don't.
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ KBUILD_CFLAGS         += -mno-sched-epilog
+ endif
+ 
+-cpu-as-$(CONFIG_4xx)          += -Wa,-m405
++cpu-as-$(CONFIG_40x)          += -Wa,-m405
++cpu-as-$(CONFIG_44x)          += -Wa,-m440
+ cpu-as-$(CONFIG_6xx)          += -Wa,-maltivec
+ cpu-as-$(CONFIG_POWER4)               += -Wa,-maltivec
+ cpu-as-$(CONFIG_E500)         += -Wa,-me500
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -38,10 +38,10 @@ BOOTCFLAGS += -I$(obj) -I$(srctree)/$(ob
+ DTS_FLAGS     ?= -p 1024
+ 
+ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
++$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
++$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405

diff --git a/target/linux/generic-2.6/patches-2.6.35/997-lzo_decompressor_fix.patch b/target/linux/generic-2.6/patches-2.6.35/997-lzo_decompressor_fix.patch
new file mode 100644 (file)
index 0000000..4509865
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/997-lzo_decompressor_fix.patch
@@ -0,0 +1,11 @@
+--- a/usr/Kconfig
++++ b/usr/Kconfig
+@@ -75,7 +75,7 @@ config RD_LZMA
+ config RD_LZO
+       bool "Support initial ramdisks compressed using LZO" if EMBEDDED
+       default !EMBEDDED
+-      depends on BLK_DEV_INITRD
++      depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
+       select DECOMPRESS_LZO
+       help
+         Support loading of a LZO encoded initial ramdisk or cpio buffer

diff --git a/target/linux/generic-2.6/patches-2.6.35/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.35/998-openwrt_lzma_options.patch
new file mode 100644 (file)
index 0000000..3e32b67
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/998-openwrt_lzma_options.patch
@@ -0,0 +1,54 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-      lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++      lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+       (rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO    $@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -226,7 +226,7 @@ cpio_list=
+ output="/dev/stdout"
+ output_file=""
+ is_cpio_compressed=
+-compr="gzip -9 -f"
++compr="gzip -9 -f -"
+ 
+ arg="$1"
+ case "$arg" in
+@@ -240,9 +240,9 @@ case "$arg" in
+               output_file="$1"
+               cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
+               output=${cpio_list}
+-              echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
+-              echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
+-              echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
++              echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
++              echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
++              echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
+               echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
+               echo "$output_file" | grep -q "\.cpio$" && compr="cat"
+               shift
+@@ -294,7 +294,7 @@ if [ ! -z ${output_file} ]; then
+       if [ "${is_cpio_compressed}" = "compressed" ]; then
+               cat ${cpio_tfile} > ${output_file}
+       else
+-              (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
++              (cat ${cpio_tfile} | ${compr} > ${output_file}) \
+               || (rm -f ${output_file} ; false)
+       fi
+       [ -z ${cpio_file} ] && rm ${cpio_tfile}
+--- a/lib/decompress.c
++++ b/lib/decompress.c
+@@ -36,6 +36,7 @@ static const struct compress_format {
+       { {037, 0236}, "gzip", gunzip },
+       { {0x42, 0x5a}, "bzip2", bunzip2 },
+       { {0x5d, 0x00}, "lzma", unlzma },
++      { {0x6d, 0x00}, "lzma-openwrt", unlzma },
+       { {0x89, 0x4c}, "lzo", unlzo },
+       { {0, 0}, NULL, NULL }
+ };

diff --git a/target/linux/generic-2.6/patches-2.6.35/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.35/999-use_preinit_as_init.patch
new file mode 100644 (file)
index 0000000..5499f75
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.35/999-use_preinit_as_init.patch
@@ -0,0 +1,14 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -842,10 +842,7 @@ static noinline int init_post(void)
+               printk(KERN_WARNING "Failed to execute %s.  Attempting "
+                                       "defaults...\n", execute_command);
+       }
+-      run_init_process("/sbin/init");
+-      run_init_process("/etc/init");
+-      run_init_process("/bin/init");
+-      run_init_process("/bin/sh");
++      run_init_process("/etc/preinit");
+ 
+       panic("No init found.  Try passing init= option to kernel. "
+             "See Linux Documentation/init.txt for guidance.");