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
..
compr.c	zlib: slim down zlib_deflate() workspace when possible	2011-03-22 17:44:17 -07:00
dev_bdev.c	sanitize <linux/prefetch.h> usage	2011-05-20 12:50:29 -07:00
dev_mtd.c	mtd: fix merge conflict resolution breakage	2012-02-01 11:10:24 -08:00
dir.c	Pull request from git://github.com/prasad-joshi/logfs_upstream.git	2012-01-31 09:23:59 -08:00
file.c	logfs: take write mutex lock during fsync and sync	2012-01-28 11:36:06 +05:30
gc.c	logfs: Prevent memory corruption	2012-01-28 11:24:21 +05:30
inode.c	Pull request from git://github.com/prasad-joshi/logfs_upstream.git	2012-01-31 09:23:59 -08:00
journal.c	logfs: remove useless BUG_ON	2012-01-28 11:41:56 +05:30
Kconfig
logfs_abi.h
logfs.h	Pull request from git://github.com/prasad-joshi/logfs_upstream.git	2012-01-31 09:23:59 -08:00
Makefile
readwrite.c	logfs: Grow inode in delete path	2012-01-28 11:43:07 +05:30
segment.c	logfs: Free areas before calling generic_shutdown_super()	2012-01-28 11:42:39 +05:30
super.c	logfs: Free areas before calling generic_shutdown_super()	2012-01-28 11:42:39 +05:30