android_kernel_msm-6.1_noth.../include/linux/mtd
Artem Bityutskiy 7d73101921 mtd: fix merge conflict resolution breakage
This patch fixes merge conflict resolution breakage introduced by merge
d3712b9dfc ("Merge tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream").

The commit changed 'mtd_can_have_bb()' function and made it always
return zero, which is incorrect.  Instead, we need it to return whether
the underlying flash device can have bad eraseblocks or not.  UBI needs
this information because it affects how it handles the underlying flash.
E.g., if the underlying flash is NOR, it cannot have bad blocks and any
write or erase error is fatal, and all we can do is to switch to R/O
mode.  We do not need to reserve a pool of good eraseblocks for bad
eraseblocks handling, and so on.

This patch also removes 'mtd_can_have_bb()' invocations from Logfs to
ensure correct Logfs behavior.

I've tested that with this patch UBI works on top of NOR and NAND
flashes emulated by mtdram and nandsim correspondingly.

This patch is based on patch from Linus Torvalds.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Acked-by: Jörn Engel <joern@logfs.org>
Acked-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-02-01 11:10:24 -08:00
..
bbm.h mtd: nand: improve comment on NAND_BBT_DYNAMIC_STRUCT 2011-09-11 15:01:57 +03:00
blktrans.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 2011-03-25 17:41:20 +02:00
cfi.h mtd: cfi: Allow per-mapping CFI device endianness 2012-01-09 18:06:13 +00:00
cfi_endian.h mtd: cfi: Allow per-mapping CFI device endianness 2012-01-09 18:06:13 +00:00
concat.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
doc2000.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
flashchip.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
fsmc.h mtd: FSMC NAND fix obvious speling errors 2010-12-03 16:35:40 +00:00
ftl.h
gen_probe.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
gpmi-nand.h mtd: fix compile error for gpmi-nand 2011-12-23 21:33:15 +05:30
inftl.h mtd: inftl.h: fix spacing errors 2010-10-24 23:27:24 +01:00
latch-addr-flash.h mtd: NOR flash driver for OMAP-L137/AM17x 2011-03-11 14:22:47 +00:00
map.h mtd: map.h: fix arm cross-build failure 2012-01-09 18:24:34 +00:00
mtd.h mtd: fix merge conflict resolution breakage 2012-02-01 11:10:24 -08:00
mtdram.h mtd: mtdram.h: checkpatch cleanup 2010-05-10 14:11:30 +01:00
nand-gpio.h
nand.h mtd: nand: add Macronix manufacturer 2012-01-09 17:59:33 +00:00
nand_bch.h mtd: nand: add software BCH ECC support 2011-03-11 17:49:08 +00:00
nand_ecc.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
ndfc.h
nftl.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
onenand.h mtd: OneNAND: Detect the correct NOP when 4KiB pagesize 2011-09-11 15:02:13 +03:00
onenand_regs.h OMAP: OneNAND: fix 104MHz support 2011-02-17 15:44:45 -08:00
partitions.h mtd: remove put_partition_parser() from public header 2011-09-11 15:02:13 +03:00
pfow.h [MTD] LPDDR PFOW definition 2009-01-05 13:55:58 +01:00
physmap.h mtd: maps: physmap: allow partition parsers for physmap_flash_data 2012-01-09 18:16:15 +00:00
pismo.h mtd: Really add ARM pismo support 2010-01-13 09:04:53 +00:00
plat-ram.h
pmc551.h
qinfo.h [MTD] LPDDR QINFO records definitions 2009-01-05 13:55:54 +01:00
sh_flctl.h mtd/nand/sh_flctl: Move function mtd_to_flctl to fix build failure 2010-05-12 23:24:23 +01:00
sharpsl.h
super.h convert get_sb_mtd() users to ->mount() 2010-10-29 04:16:26 -04:00
ubi.h UBI: clarify the volume notification types' doc 2011-06-23 17:40:07 +03:00
xip.h Fix common misspellings 2011-03-31 11:26:23 -03:00