dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/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
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
doc2000.h
flashchip.h
fsmc.h
ftl.h
gen_probe.h
gpmi-nand.h mtd: fix compile error for gpmi-nand 2011-12-23 21:33:15 +05:30
inftl.h
latch-addr-flash.h
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
nand-gpio.h
nand.h mtd: nand: add Macronix manufacturer 2012-01-09 17:59:33 +00:00
nand_bch.h
nand_ecc.h
ndfc.h
nftl.h
onenand.h mtd: OneNAND: Detect the correct NOP when 4KiB pagesize 2011-09-11 15:02:13 +03:00
onenand_regs.h
partitions.h mtd: remove put_partition_parser() from public header 2011-09-11 15:02:13 +03:00
pfow.h
physmap.h mtd: maps: physmap: allow partition parsers for physmap_flash_data 2012-01-09 18:16:15 +00:00
pismo.h
plat-ram.h
pmc551.h
qinfo.h
sh_flctl.h
sharpsl.h
super.h
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