diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 00:39:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 00:39:50 -0700 |
| commit | bc5a6deba729a4a44d7b8019408350d4f45b7acb (patch) | |
| tree | 5e290078fa32ed7606f075c8ca4c056933ddba85 | |
| parent | b4154d4a01c6cc98b97dc239ca4302316c8f98da (diff) | |
| parent | 48440e893d700fb8f0de95fa7d748b711d290365 (diff) | |
| download | lwn-bc5a6deba729a4a44d7b8019408350d4f45b7acb.tar.gz lwn-bc5a6deba729a4a44d7b8019408350d4f45b7acb.zip | |
Merge git://git.infradead.org/~dwmw2/mtd-2.6.23
| -rw-r--r-- | drivers/mtd/mtdsuper.c | 2 | ||||
| -rw-r--r-- | fs/jffs2/fs.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index aca331971201..9b430f20b640 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c @@ -70,6 +70,8 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags, DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n", mtd->index, mtd->name); + sb->s_flags = flags; + ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); if (ret < 0) { up_write(&sb->s_umount); diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 1d3b7a9fc828..8bc727b71696 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@ -627,7 +627,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, struct inode *inode = OFNI_EDONI_2SFFJ(f); struct page *pg; - pg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, + pg = read_cache_page_async(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, (void *)jffs2_do_readpage_unlock, inode); if (IS_ERR(pg)) return (void *)pg; |