The patch titled Subject: ocfs2-add-and-remove-inode-in-orphan-dir-in-ocfs2_direct_io-fix has been removed from the -mm tree. Its filename was ocfs2-add-and-remove-inode-in-orphan-dir-in-ocfs2_direct_io-fix.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: ocfs2-add-and-remove-inode-in-orphan-dir-in-ocfs2_direct_io-fix don't emit a call to _moddi3 on i386 Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Joseph Qi <joseph.qi@xxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Weiwei Wang <wangww631@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/aops.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff -puN fs/ocfs2/aops.c~ocfs2-add-and-remove-inode-in-orphan-dir-in-ocfs2_direct_io-fix fs/ocfs2/aops.c --- a/fs/ocfs2/aops.c~ocfs2-add-and-remove-inode-in-orphan-dir-in-ocfs2_direct_io-fix +++ a/fs/ocfs2/aops.c @@ -29,6 +29,7 @@ #include <linux/mpage.h> #include <linux/quotaops.h> #include <linux/blkdev.h> +#include <linux/math64.h> #include <cluster/masklog.h> @@ -640,13 +641,20 @@ static ssize_t ocfs2_direct_IO_write(str journal_t *journal = osb->journal->j_journal; u32 p_cpos = 0; u32 v_cpos = ocfs2_clusters_for_bytes(osb->sb, offset); - u32 zero_len = offset % (1 << osb->s_clustersize_bits); - int cluster_align = offset % (1 << osb->s_clustersize_bits) ? 0 : 1; + u32 zero_len; + int cluster_align; + loff_t final_size = offset + count; int append_write = offset >= i_size_read(inode) ? 1 : 0; unsigned int num_clusters = 0; unsigned int ext_flags = 0; - loff_t final_size = offset + count; + { + loff_t o = offset; + + zero_len = do_div(o, 1 << osb->s_clustersize_bits); + cluster_align = !!zero_len; + } + /* * when final_size > inode->i_size, inode->i_size will be * updated after direct write, so add the inode to orphan _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch rtc-pm8xxx-rework-to-support-pm8941-rtc-checkpatch-fixes.patch rtc-pm8xxx-rework-to-support-pm8941-rtc-fix.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch input-route-kbd-leds-through-the-generic-leds-layer.patch o2dlm-fix-null-pointer-dereference-in-o2dlm_blocking_ast_wrapper-checkpatch-fixes.patch ocfs2-free-inode-when-i_count-becomes-zero.patch ocfs2-add-and-remove-inode-in-orphan-dir-in-ocfs2_direct_io-fix-fix.patch ocfs2-do-not-fallback-to-buffer-i-o-write-if-fill-holes-checkpatch-fixes.patch mm.patch mm-memcontrol-lockless-page-counters-fix.patch mm-memcontrol-lockless-page-counters-fix-fix.patch kernel-res_counter-remove-the-unused-api-fix.patch mm-compaction-simplify-deferred-compaction-fix.patch mm-memcontrol-remove-unnecessary-pcg_used-pc-mem_cgroup-valid-flag-fix.patch mm-memcontrol-fold-mem_cgroup_start_move-mem_cgroup_end_move-fix.patch lib-show_mem-this-patch-adds-cma-reserved-infromation-fix.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch do_shared_fault-check-that-mmap_sem-is-held.patch fs-proc-use-a-rb-tree-for-the-directory-entries-fix.patch init-allow-config_init_fallback=n-to-disable-defaults-if-init=-fails-checkpatch-fixes.patch rtc-omap-add-support-for-pmic_power_en-v3-fix.patch sysctl-terminate-strings-also-on-r-fix.patch ipc-semc-chance-memory-barrier-in-sem_lock-to-smp_rmb-fix.patch ipc-semc-chance-memory-barrier-in-sem_lock-to-smp_rmb-fix-fix.patch ipc-msg-increase-msgmni-remove-scaling-checkpatch-fixes.patch linux-next.patch drivers-gpio-gpio-zevioc-fix-build.patch mm-cma-make-kmemleak-ignore-cma-regions.patch mm-replace-remap_file_pages-syscall-with-emulation.patch debugging-keep-track-of-page-owners.patch debugging-keep-track-of-page-owners-fix.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.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