The patch titled fs: prepare_write fixes jffs fix has been added to the -mm tree. Its filename is fs-prepare_write-fixes-jffs-fix.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fs: prepare_write fixes jffs fix From: Nick Piggin <npiggin@xxxxxxx> Forgot to return ret. Crazy indenting in this file. Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/jffs/inode-v23.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff -puN fs/jffs/inode-v23.c~fs-prepare_write-fixes-jffs-fix fs/jffs/inode-v23.c --- a/fs/jffs/inode-v23.c~fs-prepare_write-fixes-jffs-fix +++ a/fs/jffs/inode-v23.c @@ -1548,11 +1548,12 @@ jffs_commit_write(struct file *filp, str loff_t pos = page_offset(page) + from; if (to - from == 0) - return 0; + return 0; ret = jffs_file_write(filp, addr, to-from, &pos); if (!PageUptodate(page) && (to - from == PAGE_CACHE_SIZE)) - SetPageUptodate(page); + SetPageUptodate(page); + return ret; } /* jffs_commit_write() */ /* This is our ioctl() routine. */ _ Patches currently in -mm which might be from npiggin@xxxxxxx are mm-more-comment-lockorder.patch mm-only-mm-debug-write-deadlocks.patch mm-fix-pagecache-write-deadlocks.patch mm-fix-pagecache-write-deadlocks-comment.patch mm-fix-pagecache-write-deadlocks-mm-pagecache-write-deadlocks-efault-fix.patch fs-prepare_write-fixes.patch fs-prepare_write-fixes-fuse-fix.patch fs-prepare_write-fixes-jffs-fix.patch oom-dont-kill-unkillable-children-or-siblings.patch oom-cleanup-messages.patch oom-less-memdie.patch mm-incorrect-vm_fault_oom-returns-from-drivers.patch mm-add-arch_alloc_page.patch mm-clean-up-pagecache-allocation.patch radix-tree-rcu-lockless-readside.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html