Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc5a6deb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dwmw2/mtd-2.6.23

parents b4154d4a 48440e89

drivers/mtd/mtdsuper.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

fs/jffs2/fs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;