Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 287090
b: refs/heads/master
c: 7d73101
h: refs/heads/master
v: v3
  • Loading branch information
Artem Bityutskiy authored and Linus Torvalds committed Feb 1, 2012
1 parent c7113eb commit 544451f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62aa2b537c6f5957afd98e29f96897419ed5ebab
refs/heads/master: 7d731019218e49a9811f6d0adec4b1cfcb752bed
6 changes: 0 additions & 6 deletions trunk/fs/logfs/dev_mtd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/mtd/mtd.h
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ static inline int mtd_has_oob(const struct mtd_info *mtd)

static inline int mtd_can_have_bb(const struct mtd_info *mtd)
{
return 0;
return !!mtd->block_isbad;
}

/* Kernel-side ioctl definitions */
Expand Down

0 comments on commit 544451f

Please sign in to comment.