Subject: linux-next: manual merge of the l2-mtd tree with the logfs tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 3 Jan 2012 14:00:29 +1100

Hi Artem,

Today's linux-next merge of the l2-mtd tree got a conflict in
fs/logfs/dev_mtd.c between commit d1cc3ad397f2 ("Logfs: Allow NULL
block_isbad() methods") from the logfs tree and commit 957afd905eda
("logfs: do not use 'mtd->block_isbad' directly") from the l2-mtd tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc fs/logfs/dev_mtd.c
index d054d7e,e97404d..0000000
--- a/fs/logfs/dev_mtd.c
+++ b/fs/logfs/dev_mtd.c
@@@ -147,16 -149,17 +149,16 @@@ static struct page *logfs_mtd_find_firs
  {
  	struct logfs_super *super = logfs_super(sb);
  	struct address_space *mapping = super->s_mapping_inode->i_mapping;
- 	filler_t *filler = mtd_readpage;
+ 	filler_t *filler = logfs_mtd_readpage;
  	struct mtd_info *mtd = super->s_mtd;
  
 -	if (!mtd_can_have_bb(mtd))
 -		return NULL;
 -
  	*ofs = 0;
- 	if (mtd->block_isbad) {
- 		while (mtd->block_isbad(mtd, *ofs)) {
 -	while (mtd_block_isbad(mtd, *ofs)) {
 -		*ofs += mtd->erasesize;
 -		if (*ofs >= mtd->size)
 -			return NULL;
++	if (mtd_can_have_bb(mtd)) {
++		while (mtd_block_isbad(mtd, *ofs)) {
 +			*ofs += mtd->erasesize;
 +			if (*ofs >= mtd->size)
 +				return NULL;
 +		}
  	}
  	BUG_ON(*ofs & ~PAGE_MASK);
  	return read_cache_page(mapping, *ofs >> PAGE_SHIFT, filler, sb);
@@@ -166,16 -169,17 +168,16 @@@ static struct page *logfs_mtd_find_last
  {
  	struct logfs_super *super = logfs_super(sb);
  	struct address_space *mapping = super->s_mapping_inode->i_mapping;
- 	filler_t *filler = mtd_readpage;
+ 	filler_t *filler = logfs_mtd_readpage;
  	struct mtd_info *mtd = super->s_mtd;
  
 -	if (!mtd_can_have_bb(mtd))
 -		return NULL;
 -
  	*ofs = mtd->size - mtd->erasesize;
- 	if (mtd->block_isbad) {
- 		while (mtd->block_isbad(mtd, *ofs)) {
 -	while (mtd_block_isbad(mtd, *ofs)) {
 -		*ofs -= mtd->erasesize;
 -		if (*ofs <= 0)
 -			return NULL;
++	if (mtd_can_have_bb(mtd)) {
++		while (mtd_block_isbad(mtd, *ofs)) {
 +			*ofs -= mtd->erasesize;
 +			if (*ofs <= 0)
 +				return NULL;
 +		}
  	}
  	*ofs = *ofs + mtd->erasesize - 0x1000;
  	BUG_ON(*ofs & ~PAGE_MASK);