tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds bc5a6deb b4154d4a

+3 -1
unified split
+2
drivers/mtd/mtdsuper.c
··· 70 DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n", 71 mtd->index, mtd->name); 72 73 ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); 74 if (ret < 0) { 75 up_write(&sb->s_umount);
··· 70 DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n", 71 mtd->index, mtd->name); 72 73 + sb->s_flags = flags; 74 + 75 ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); 76 if (ret < 0) { 77 up_write(&sb->s_umount);
+1 -1
fs/jffs2/fs.c
··· 627 struct inode *inode = OFNI_EDONI_2SFFJ(f); 628 struct page *pg; 629 630 - pg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, 631 (void *)jffs2_do_readpage_unlock, inode); 632 if (IS_ERR(pg)) 633 return (void *)pg;
··· 627 struct inode *inode = OFNI_EDONI_2SFFJ(f); 628 struct page *pg; 629 630 + pg = read_cache_page_async(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, 631 (void *)jffs2_do_readpage_unlock, inode); 632 if (IS_ERR(pg)) 633 return (void *)pg;