ldiskfs/kernel_patches/patches/rhel7/ext4-hash-indexed-dir-dotdot-update.patch

   1 Index: linux-3.10.0-123.9.3.el7.x86_64/fs/ext4/namei.c
   2 ===================================================================
   3 --- linux-3.10.0-123.9.3.el7.x86_64.orig/fs/ext4/namei.c
   4 +++ linux-3.10.0-123.9.3.el7.x86_64/fs/ext4/namei.c
   5 @@ -1894,6 +1894,72 @@ static int make_indexed_dir(handle_t *ha
   6         return retval;
   7  }
   8
   9 +/* update ".." for hash-indexed directory, split the item "." if necessary */
  10 +static int ext4_update_dotdot(handle_t *handle, struct dentry *dentry,
  11 +                                struct inode *inode)
  12 +{
  13 +       struct inode * dir = dentry->d_parent->d_inode;
  14 +       struct buffer_head * dir_block;
  15 +       struct ext4_dir_entry_2 * de;
  16 +       int len, journal = 0, err = 0;
  17 +
  18 +       if (IS_ERR(handle))
  19 +               return PTR_ERR(handle);
  20 +
  21 +       if (IS_DIRSYNC(dir))
  22 +               handle->h_sync = 1;
  23 +
  24 +       dir_block = ext4_bread(handle, dir, 0, 0, &err);
  25 +       if (!dir_block)
  26 +               goto out;
  27 +
  28 +       de = (struct ext4_dir_entry_2 *)dir_block->b_data;
  29 +       /* the first item must be "." */
  30 +       assert(de->name_len == 1 && de->name[0] == '.');
  31 +       len = le16_to_cpu(de->rec_len);
  32 +       assert(len >= EXT4_DIR_REC_LEN(1));
  33 +       if (len > EXT4_DIR_REC_LEN(1)) {
  34 +               BUFFER_TRACE(dir_block, "get_write_access");
  35 +               err = ext4_journal_get_write_access(handle, dir_block);
  36 +               if (err)
  37 +                       goto out_journal;
  38 +
  39 +               journal = 1;
  40 +               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
  41 +       }
  42 +
  43 +       len -= EXT4_DIR_REC_LEN(1);
  44 +       assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
  45 +       de = (struct ext4_dir_entry_2 *)
  46 +                       ((char *) de + le16_to_cpu(de->rec_len));
  47 +       if (!journal) {
  48 +               BUFFER_TRACE(dir_block, "get_write_access");
  49 +               err = ext4_journal_get_write_access(handle, dir_block);
  50 +               if (err)
  51 +                       goto out_journal;
  52 +       }
  53 +
  54 +       de->inode = cpu_to_le32(inode->i_ino);
  55 +       if (len > 0)
  56 +               de->rec_len = cpu_to_le16(len);
  57 +       else
  58 +               assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
  59 +       de->name_len = 2;
  60 +       strcpy (de->name, "..");
  61 +       ext4_set_de_type(dir->i_sb, de, S_IFDIR);
  62 +
  63 +out_journal:
  64 +       if (journal) {
  65 +               BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
  66 +               err = ext4_handle_dirty_dirent_node(handle, dir, dir_block);
  67 +               ext4_mark_inode_dirty(handle, dir);
  68 +       }
  69 +       brelse (dir_block);
  70 +
  71 +out:
  72 +       return err;
  73 +}
  74 +
  75  /*
  76   *     ext4_add_entry()
  77   *
  78 @@ -1938,6 +2004,9 @@ int ext4_add_entry(handle_t *handle, str
  79         }
  80
  81         if (is_dx(dir)) {
  82 +               if (dentry->d_name.len == 2 &&
  83 +                   memcmp(dentry->d_name.name, "..", 2) == 0)
  84 +                       return ext4_update_dotdot(handle, dentry, inode);
  85                 retval = ext4_dx_add_entry(handle, dentry, inode);
  86                 if (!retval || (retval != ERR_BAD_DX_DIR))
  87                         return retval;