diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-03 15:04:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-03 15:05:56 -0500 |
| commit | 8aa0a410af8011d557877e558f9ff17c082c6840 (patch) | |
| tree | e347920bcaba78f6af0fecc626c1842f85aeeb83 /fs/logfs/dev_mtd.c | |
| parent | 54b50af089552bae368502e35dead67e81129b8d (diff) | |
| parent | abe9a6d57b4544ac208401f9c0a4262814db2be4 (diff) | |
| download | linux-8aa0a410af8011d557877e558f9ff17c082c6840.tar.gz | |
Merge commit 'nfs-for-3.3-4' into nfs-for-next
Conflicts:
fs/nfs/nfs4proc.c
Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...
Diffstat (limited to 'fs/logfs/dev_mtd.c')
| -rw-r--r-- | fs/logfs/dev_mtd.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c index e97404d611e0..9c501449450d 100644 --- a/fs/logfs/dev_mtd.c +++ b/fs/logfs/dev_mtd.c @@ -152,9 +152,6 @@ static struct page *logfs_mtd_find_first_sb(struct super_block *sb, u64 *ofs) filler_t *filler = logfs_mtd_readpage; struct mtd_info *mtd = super->s_mtd; - if (!mtd_can_have_bb(mtd)) - return NULL; - *ofs = 0; while (mtd_block_isbad(mtd, *ofs)) { *ofs += mtd->erasesize; @@ -172,9 +169,6 @@ static struct page *logfs_mtd_find_last_sb(struct super_block *sb, u64 *ofs) 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; while (mtd_block_isbad(mtd, *ofs)) { *ofs -= mtd->erasesize; |