LU-5510 scrub: ldiskfs_create_inode returns locked inode

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / sles11sp2 / ext4-osd-iop-common.patch

diff --git a/ldiskfs/kernel_patches/patches/sles11sp2/ext4-osd-iop-common.patch b/ldiskfs/kernel_patches/patches/sles11sp2/ext4-osd-iop-common.patch
index 3581df0..9c48794 100644 (file)
--- a/ldiskfs/kernel_patches/patches/sles11sp2/ext4-osd-iop-common.patch
+++ b/ldiskfs/kernel_patches/patches/sles11sp2/ext4-osd-iop-common.patch
@@ -99,11 +99,13 @@
  /*
   * DIR_NLINK feature is set if 1) nlinks > EXT4_LINK_MAX or 2) nlinks == 2,
   * since this indicates that nlinks count was previously 1.
-@@ -1808,6 +1811,28 @@ static unsigned ext4_dentry_goal(struct
+@@ -1808,6 +1811,29 @@ static unsigned ext4_dentry_goal(struct
        return inum;
  }
 
-+struct inode *ext4_create_inode(handle_t *handle, struct inode * dir, int mode)
++ /* Return locked inode, then the caller can modify the inode's states/flags
++  * before others finding it. The caller should unlock the inode by itself. */
++struct inode *ext4_create_inode(handle_t *handle, struct inode *dir, int mode)
 +{
 +      struct inode *inode;
 +
@@ -111,7 +113,7 @@
 +                             EXT4_SB(dir->i_sb)->s_inode_goal);
 +      if (!IS_ERR(inode)) {
 +              if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISFIFO(mode)) {
-+#ifdef CONFIG_LDISKFS_FS_XATTR
++#ifdef CONFIG_EXT4_FS_XATTR
 +                      inode->i_op = &ext4_special_inode_operations;
 +#endif
 +              } else {
@@ -119,7 +121,6 @@
 +                      inode->i_fop = &ext4_file_operations;
 +                      ext4_set_aops(inode);
 +              }
-+              unlock_new_inode(inode);
 +      }
 +      return inode;
 +}
@@ -128,7 +129,7 @@
  /*
   * By the time this is called, we already have created
   * the directory cache entry for the new file, but it
-@@ -1886,46 +1911,32 @@ retry:
+@@ -1886,46 +1912,32 @@ retry:
        return err;
  }
 
@@ -183,7 +184,7 @@
        de = (struct ext4_dir_entry_2 *) dir_block->b_data;
        de->inode = cpu_to_le32(inode->i_ino);
        de->name_len = 1;
-@@ -1944,18 +1955,47 @@ retry:
+@@ -1944,18 +1956,47 @@ retry:
        BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
        err = ext4_handle_dirty_metadata(handle, inode, dir_block);
        if (err)
@@ -241,7 +242,7 @@
        ext4_inc_count(handle, dir);
        ext4_update_dx_flag(dir);
        err = ext4_mark_inode_dirty(handle, dir);
-@@ -1964,11 +2004,16 @@ out_clear_inode:
+@@ -1964,11 +2005,16 @@ out_clear_inode:
        d_instantiate(dentry, inode);
        unlock_new_inode(inode);
  out_stop: