These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / ocfs2 / inode.c

diff --git a/kernel/fs/ocfs2/inode.c b/kernel/fs/ocfs2/inode.c
index b254416..8f87e05 100644 (file)
--- a/kernel/fs/ocfs2/inode.c
+++ b/kernel/fs/ocfs2/inode.c
@@ -971,6 +971,7 @@ static void ocfs2_delete_inode(struct inode *inode)
        int wipe, status;
        sigset_t oldset;
        struct buffer_head *di_bh = NULL;
+       struct ocfs2_dinode *di = NULL;
 
        trace_ocfs2_delete_inode(inode->i_ino,
                                 (unsigned long long)OCFS2_I(inode)->ip_blkno,
@@ -1025,6 +1026,14 @@ static void ocfs2_delete_inode(struct inode *inode)
                goto bail_unlock_nfs_sync;
        }
 
+       di = (struct ocfs2_dinode *)di_bh->b_data;
+       /* Skip inode deletion and wait for dio orphan entry recovered
+        * first */
+       if (unlikely(di->i_flags & cpu_to_le32(OCFS2_DIO_ORPHANED_FL))) {
+               ocfs2_cleanup_delete_inode(inode, 0);
+               goto bail_unlock_inode;
+       }
+
        /* Query the cluster. This will be the final decision made
         * before we go ahead and wipe the inode. */
        status = ocfs2_query_inode_wipe(inode, di_bh, &wipe);
@@ -1191,17 +1200,19 @@ void ocfs2_evict_inode(struct inode *inode)
 int ocfs2_drop_inode(struct inode *inode)
 {
        struct ocfs2_inode_info *oi = OCFS2_I(inode);
-       int res;
 
        trace_ocfs2_drop_inode((unsigned long long)oi->ip_blkno,
                                inode->i_nlink, oi->ip_flags);
 
-       if (oi->ip_flags & OCFS2_INODE_MAYBE_ORPHANED)
-               res = 1;
-       else
-               res = generic_drop_inode(inode);
+       assert_spin_locked(&inode->i_lock);
+       inode->i_state |= I_WILL_FREE;
+       spin_unlock(&inode->i_lock);
+       write_inode_now(inode, 1);
+       spin_lock(&inode->i_lock);
+       WARN_ON(inode->i_state & I_NEW);
+       inode->i_state &= ~I_WILL_FREE;
 
-       return res;
+       return 1;
 }
 
 /*
@@ -1350,32 +1361,32 @@ int ocfs2_validate_inode_block(struct super_block *sb,
        rc = -EINVAL;
 
        if (!OCFS2_IS_VALID_DINODE(di)) {
-               ocfs2_error(sb, "Invalid dinode #%llu: signature = %.*s\n",
-                           (unsigned long long)bh->b_blocknr, 7,
-                           di->i_signature);
+               rc = ocfs2_error(sb, "Invalid dinode #%llu: signature = %.*s\n",
+                                (unsigned long long)bh->b_blocknr, 7,
+                                di->i_signature);
                goto bail;
        }
 
        if (le64_to_cpu(di->i_blkno) != bh->b_blocknr) {
-               ocfs2_error(sb, "Invalid dinode #%llu: i_blkno is %llu\n",
-                           (unsigned long long)bh->b_blocknr,
-                           (unsigned long long)le64_to_cpu(di->i_blkno));
+               rc = ocfs2_error(sb, "Invalid dinode #%llu: i_blkno is %llu\n",
+                                (unsigned long long)bh->b_blocknr,
+                                (unsigned long long)le64_to_cpu(di->i_blkno));
                goto bail;
        }
 
        if (!(di->i_flags & cpu_to_le32(OCFS2_VALID_FL))) {
-               ocfs2_error(sb,
-                           "Invalid dinode #%llu: OCFS2_VALID_FL not set\n",
-                           (unsigned long long)bh->b_blocknr);
+               rc = ocfs2_error(sb,
+                                "Invalid dinode #%llu: OCFS2_VALID_FL not set\n",
+                                (unsigned long long)bh->b_blocknr);
                goto bail;
        }
 
        if (le32_to_cpu(di->i_fs_generation) !=
            OCFS2_SB(sb)->fs_generation) {
-               ocfs2_error(sb,
-                           "Invalid dinode #%llu: fs_generation is %u\n",
-                           (unsigned long long)bh->b_blocknr,
-                           le32_to_cpu(di->i_fs_generation));
+               rc = ocfs2_error(sb,
+                                "Invalid dinode #%llu: fs_generation is %u\n",
+                                (unsigned long long)bh->b_blocknr,
+                                le32_to_cpu(di->i_fs_generation));
                goto bail;
        }