ocfs2: fix race between crashed dio and rm

[deliverable/linux.git] / fs / ocfs2 / journal.c

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 3bfd36a23e401b403e09aa8f5fbde2f3242f4011..52948af646b63ea29701f40f3f99f336bfef5717 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -2210,7 +2210,9 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb,
                         * ocfs2_delete_inode. */
                        oi->ip_flags |= OCFS2_INODE_MAYBE_ORPHANED;
                        spin_unlock(&oi->ip_lock);
-               } else if ((orphan_reco_type == ORPHAN_NEED_TRUNCATE) &&
+               }
+
+               if ((orphan_reco_type == ORPHAN_NEED_TRUNCATE) &&
                                (di->i_flags & cpu_to_le32(OCFS2_DIO_ORPHANED_FL))) {
                        ret = ocfs2_truncate_file(inode, di_bh,
                                        i_size_read(inode));