The patch titled
Subject: fs-ocfs2-adding-new-return-type-vm_fault_t-fix
has been added to the -mm tree. Its filename is
fs-ocfs2-adding-new-return-type-vm_fault_t-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fs-ocfs2-adding-new-return-type-vm_fault_t-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fs-ocfs2-adding-new-return-type-vm_fault_t-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: fs-ocfs2-adding-new-return-type-vm_fault_t-fix
undo BUG_ON->WARN_ON change
Cc: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>
Cc: Souptick Joarder <jrdr.linux@xxxxxxxxx>
Cc: Mark Fasheh <mark@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Joseph Qi <jiangqi903@xxxxxxxxx>
Cc: Changwei Ge <ge.changwei@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/mmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN fs/ocfs2/mmap.c~fs-ocfs2-adding-new-return-type-vm_fault_t-fix fs/ocfs2/mmap.c
--- a/fs/ocfs2/mmap.c~fs-ocfs2-adding-new-return-type-vm_fault_t-fix
+++ a/fs/ocfs2/mmap.c
@@ -120,7 +120,7 @@ static vm_fault_t __ocfs2_page_mkwrite(s
goto out;
}
err = ocfs2_write_end_nolock(mapping, pos, len, len, fsdata);
- WARN_ON(err != len);
+ BUG_ON(err != len);
ret = VM_FAULT_LOCKED;
out:
return ret;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fs-ocfs2-adding-new-return-type-vm_fault_t-fix.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
zram-introduce-zram-memory-tracking-fix.patch
zram-introduce-zram-memory-tracking-update-fix.patch
zram-introduce-zram-memory-tracking-update-fix-fix.patch
mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch
mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch
mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
revert-autofs-update-fs-autofs4-kconfig-fix.patch
kcov-prefault-the-kcov_area-fix.patch
kcov-prefault-the-kcov_area-fix-fix.patch
kcov-prefault-the-kcov_area-fix-fix-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.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
