The patch titled Subject: ocfs2: fix return value from ocfs2_page_mkwrite() has been removed from the -mm tree. Its filename was ocfs2-fix-return-value-from-ocfs2_page_mkwrite.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Jan Kara <jack@xxxxxxx> Subject: ocfs2: fix return value from ocfs2_page_mkwrite() ocfs2_page_mkwrite() could mistakenly return error code instead of mkwrite status value. Fix it. Signed-off-by: Jan Kara <jack@xxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx> Cc: Joseph Qi <joseph.qi@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/mmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN fs/ocfs2/mmap.c~ocfs2-fix-return-value-from-ocfs2_page_mkwrite fs/ocfs2/mmap.c --- a/fs/ocfs2/mmap.c~ocfs2-fix-return-value-from-ocfs2_page_mkwrite +++ a/fs/ocfs2/mmap.c @@ -147,6 +147,10 @@ static int ocfs2_page_mkwrite(struct vm_ ret = ocfs2_inode_lock(inode, &di_bh, 1); if (ret < 0) { mlog_errno(ret); + if (ret == -ENOMEM) + ret = VM_FAULT_OOM; + else + ret = VM_FAULT_SIGBUS; goto out; } _ Patches currently in -mm which might be from jack@xxxxxxx are mm-remove-vm_fault_minor.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