The patch titled
Subject: ocfs2-add-locking-filter-debugfs-file-fix
has been removed from the -mm tree. Its filename was
ocfs2-add-locking-filter-debugfs-file-fix.patch
This patch was dropped because it was folded into ocfs2-add-locking-filter-debugfs-file.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: ocfs2-add-locking-filter-debugfs-file-fix
fix undefined reference to `__udivdi3'
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> [build-tested]
Cc: Changwei Ge <gechangwei@xxxxxxx>
Cc: Gang He <ghe@xxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Joseph Qi <jiangqi903@xxxxxxxxx>
Cc: Jun Piao <piaojun@xxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Mark Fasheh <mark@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dlmglue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/ocfs2/dlmglue.c~ocfs2-add-locking-filter-debugfs-file-fix
+++ a/fs/ocfs2/dlmglue.c
@@ -3115,7 +3115,7 @@ static int ocfs2_dlm_seq_show(struct seq
* otherwise, only dump the last N seconds active lock
* resources.
*/
- if ((now - last) / 1000000 > dlm_debug->d_filter_secs)
+ if (div_u64(now - last, 1000000) > dlm_debug->d_filter_secs)
return 0;
}
#endif
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-add-locking-filter-debugfs-file.patch
ocfs2-use-kmemdup-rather-than-duplicating-its-implementation-checkpatch-fixes.patch
include-linux-pfn_th-remove-pfn_t_to_virt.patch
include-linux-pagemaph-document-trylock_page-return-value.patch
mm-swap-use-rbtree-for-swap_extent-fix.patch
mm-gup-speed-up-check_and_migrate_cma_pages-on-huge-page-fix.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-map_files-fix.patch
