You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		13 years ago
..
Kconfig	…
Makefile	…
compr.c	…
dev_bdev.c	…
dev_mtd.c	mtd: fix merge conflict resolution breakage	13 years ago
dir.c	Pull request from git://github.com/prasad-joshi/logfs_upstream.git	13 years ago
file.c	…
gc.c	…
inode.c	Pull request from git://github.com/prasad-joshi/logfs_upstream.git	13 years ago
journal.c	…
logfs.h	Pull request from git://github.com/prasad-joshi/logfs_upstream.git	13 years ago
logfs_abi.h	…
readwrite.c	…
segment.c	…
super.c	…