The patch titled Subject: ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans-fix has been added to the -mm tree. Its filename is ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans-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/SubmitChecklist 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: ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans-fix fix missed unlock on error path Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Weiwei Wang <wangww631@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/journal.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff -puN fs/ocfs2/journal.c~ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans-fix fs/ocfs2/journal.c --- a/fs/ocfs2/journal.c~ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans-fix +++ a/fs/ocfs2/journal.c @@ -2160,8 +2160,7 @@ static int ocfs2_recover_orphans(struct ret = ocfs2_inode_lock(inode, &di_bh, 1); if (ret) { mlog_errno(ret); - spin_unlock(&oi->ip_lock); - goto out; + goto out_unlock; } ocfs2_truncate_file(inode, di_bh, i_size_read(inode)); ocfs2_inode_unlock(inode, 1); @@ -2173,14 +2172,13 @@ static int ocfs2_recover_orphans(struct OCFS2_INODE_DEL_FROM_ORPHAN_CREDITS); if (IS_ERR(handle)) { ret = PTR_ERR(handle); - goto out; + goto out_unlock; } ret = ocfs2_del_inode_from_orphan(osb, handle, inode); if (ret) { mlog_errno(ret); ocfs2_commit_trans(osb, handle); - spin_unlock(&oi->ip_lock); - goto out; + goto out_unlock; } ocfs2_commit_trans(osb, handle); } @@ -2200,7 +2198,10 @@ static int ocfs2_recover_orphans(struct inode = iter; } -out: + return ret; + +out_unlock: + spin_unlock(&oi->ip_lock); return ret; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch fs-notify-groupc-make-fsnotify_final_destroy_group-static.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch input-route-kbd-leds-through-the-generic-leds-layer.patch kernel-add-support-for-gcc-5-checkpatch-fixes.patch fs-ocfs2-stack_userc-fix-typo-in-ocfs2_control_release.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-orphan-recovery-types-in-ocfs2_recover_orphans-fix.patch mm.patch fs-proc-task_mmuc-shift-mm_access-from-m_start-to-proc_maps_open-checkpatch-fixes.patch fs-proc-task_mmuc-simplify-the-vma_stop-logic-checkpatch-fixes.patch fs-proc-task_nommuc-change-maps_open-to-use-__seq_open_private-fix.patch fs-proc-task_nommuc-shift-mm_access-from-m_start-to-proc_maps_open-checkpatch-fixes.patch not-adding-modules-range-to-kcore-if-its-equal-to-vmcore-range-checkpatch-fixes.patch mm-slab_commonc-suppress-warning.patch mm-slab_common-move-kmem_cache-definition-to-internal-header-fix.patch memory-hotplug-add-sysfs-zones_online_to-attribute-fix.patch memory-hotplug-add-sysfs-zones_online_to-attribute-fix-2.patch memory-hotplug-add-sysfs-zones_online_to-attribute-fix-3-fix.patch mm-compaction-defer-each-zone-individually-instead-of-preferred-zone-fix.patch mm-compaction-khugepaged-should-not-give-up-due-to-need_resched-fix.patch prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4.patch prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v3-fix.patch include-linux-migrateh-remove-migratepage-define.patch introduce-dump_vma-fix.patch convert-a-few-vm_bug_on-callers-to-vm_bug_on_vma-checkpatch-fixes.patch mm-mmapc-clean-up-config_debug_vm_rb-checks.patch mm-introduce-vm_bug_on_mm-checkpatch-fixes.patch mm-debug-mm-introduce-vm_bug_on_mm-fix-fixpatch-fix.patch mm-debugc-use-pr_emerg.patch mm-hugetlb-reduce-arch-dependent-code-around-follow_huge_-fix.patch drivers-dma-coherent-add-initialization-from-device-tree-fix.patch drivers-dma-coherent-add-initialization-from-device-tree-fix-fix.patch drivers-dma-coherent-add-initialization-from-device-tree-checkpatch-fixes.patch drivers-dma-contiguous-add-initialization-from-device-tree-checkpatch-fixes.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch zram-zram-memory-size-limitation-fix.patch zram-zram-memory-size-limitation-fix-fix.patch do_shared_fault-check-that-mmap_sem-is-held.patch acct-eliminate-compile-warning-fix.patch checkpatch-fix-spello.patch rtc-rk808-add-rtc-driver-for-rk808-fix.patch rtc-bq32000-add-trickle-charger-option-with-device-tree-binding-checkpatch-fixes.patch rtc-max77686-use-ffs-to-calculate-tm_wday-fix.patch rtc-add-driver-for-maxim-77802-pmic-real-time-clock-v10-fix.patch rtc-pm8xxx-rework-to-support-pm8941-rtc-checkpatch-fixes.patch x86-optimize-resource-lookups-for-ioremap-fix.patch init-resolve-shadow-warnings-checkpatch-fixes.patch linux-next.patch linux-next-rejects.patch linux-next-git-rejects.patch drivers-gpio-gpio-zevioc-fix-build.patch arch-x86-kernel-cpu-commonc-fix-unused-symbol-warning.patch mem-hotplug-fix-boot-failed-in-case-all-the-nodes-are-hotpluggable-checkpatch-fixes.patch lib-string_helpers-introduce-string_escape_mem-fix.patch lib-vsprintf-add-%pe-format-specifier-fix.patch wireless-hostap-proc-print-properly-escaped-ssid-fix.patch wireless-hostap-proc-print-properly-escaped-ssid-fix-2.patch watchdog-control-hard-lockup-detection-default-fix.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