public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Artem Bityutskiy <dedekind1@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	"Prasad Joshi" <prasadjoshi.linux@gmail•com>,
	"\"Jörn Engel\"" <joern@logfs•org>
Subject: linux-next: manual merge of the l2-mtd tree with the logfs tree
Date: Tue, 3 Jan 2012 14:00:29 +1100	[thread overview]
Message-ID: <20120103140029.2f996dab9bdfd3ec5c876045@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2210 bytes --]

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                    sfr@canb•auug.org.au

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);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

next             reply	other threads:[~2012-01-03  3:00 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-03  3:00 Stephen Rothwell [this message]
2012-01-03  7:45 ` linux-next: manual merge of the l2-mtd tree with the logfs tree Artem Bityutskiy
  -- strict thread matches above, loose matches on Subject: below --
2011-12-28  1:48 Stephen Rothwell
2011-12-28  8:52 ` Artem Bityutskiy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120103140029.2f996dab9bdfd3ec5c876045@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=dedekind1@gmail$(echo .)com \
    --cc=joern@logfs$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=prasadjoshi.linux@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox