From patchwork Fri Feb 2 09:41:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Blagodarenko X-Patchwork-Id: 868540 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ly9s9IKQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zXsTW46Fhz9sPk for ; Fri, 2 Feb 2018 20:42:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751461AbeBBJmW (ORCPT ); Fri, 2 Feb 2018 04:42:22 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35229 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750781AbeBBJmT (ORCPT ); Fri, 2 Feb 2018 04:42:19 -0500 Received: by mail-lf0-f65.google.com with SMTP id a204so30530444lfa.2 for ; Fri, 02 Feb 2018 01:42:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7U5Rut3UGuWYU6XwKeyQkj++bRAK2vxEoS9W6xz6h5c=; b=Ly9s9IKQh15jUnsuE3LNVIqkDuHn8kANipf7PLIYGO+9ES1DePQPIrsfBtMhUoQAYa eOAtR7IkDce0QsHB5D7EI2/hCaUt1hqbMuU8t/osZRBWlvrpdvIEJW/yw/MN0xk3kbPl Uw0lEDVQdoFoa/lCO8hJ/pIvXu3CpQPScWjf9WNaeOYLG4OlfF+/qr08U8oNq9H14Izy /dolS5HR8aygdaIJcQsXqNzZ3R1j/02tI8/80nByM+IaqGOasOTZnvG54F9vYBwrTW2I 05rtfd+zDwAV+VympyoQUywDPbmaGDOQKlCYz2+TN4XsJEAB6bMXKYWf5lm1THcS3wuK CA4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7U5Rut3UGuWYU6XwKeyQkj++bRAK2vxEoS9W6xz6h5c=; b=M0WRlP0C6qnW/u7qBNPofCi6YdtpfXunfoiA4Pp67wTifa61wIoUAY+VT1hvyWHBV5 vPCTFSqe6J+AY4mRvTH2VPrTRhleY1cHgAtvJN3vaOvv7tCO7cOvkmMfyID7TTlILoE4 PVdoovMfbNBezNBtPTtdcwriRLjrF9GJyOjsTdL/ZrtmWk3hk4IL4gwGo2gbPtG9brBJ yts13wCzof71ODeQ6/qhuuwpWqDJ3WAu3IeL6OLzJcDxVDZhIkDgF9w2kp9D/q2G9xEU 3WShZRvK2kc45Y33NxQGGhjgSw0Gr7TJ2Rct/44R2VI4vlnVsx3KFwH5+jA/uQNRdvem nd0g== X-Gm-Message-State: AKwxytfqR4t3S9S76z+QkxYmkCHimjWSdhkUfznOEUj8di3YTivfrFhG A1iO7rqOgKXF05sZyxzp5qNniLkn X-Google-Smtp-Source: AH8x226JNr3+mFhn4ZSh/vKqAXjL+Hge78qO8+Frj0VoPSBVAGfbd/e7F4Hn2C2DkXIaXhNEwr2kEg== X-Received: by 10.46.67.147 with SMTP id z19mr17984880lje.28.1517564537809; Fri, 02 Feb 2018 01:42:17 -0800 (PST) Received: from localhost.localdomain ([95.153.132.136]) by smtp.gmail.com with ESMTPSA id r9sm299132ljc.18.2018.02.02.01.41.39 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 02 Feb 2018 01:42:17 -0800 (PST) From: Artem Blagodarenko To: linux-ext4@vger.kernel.org Cc: adilger.kernel@dilger.ca, Yang Sheng Subject: [PATCH v4 1/4] ext4: Removes static definition of dx_root struct Date: Fri, 2 Feb 2018 12:41:33 +0300 Message-Id: <20180202094136.13032-2-artem.blagodarenko@gmail.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180202094136.13032-1-artem.blagodarenko@gmail.com> References: <20180202094136.13032-1-artem.blagodarenko@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Yang Sheng Removes static definition of dx_root struct. so that "." and ".." dirent can have extra data. This patch does not change any functionality but is required for ext4_data_in_dirent patch. Signed-off-by: Yang Sheng Signed-off-by: Artem Blagodarenko --- fs/ext4/namei.c | 125 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 57 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index c1cf020d1889..0cb6a061aff6 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -193,23 +193,13 @@ struct dx_entry * dirent the two low bits of the hash version will be zero. Therefore, the * hash version mod 4 should never be 0. Sincerely, the paranoia department. */ - -struct dx_root +struct dx_root_info { - struct fake_dirent dot; - char dot_name[4]; - struct fake_dirent dotdot; - char dotdot_name[4]; - struct dx_root_info - { - __le32 reserved_zero; - u8 hash_version; - u8 info_length; /* 8 */ - u8 indirect_levels; - u8 unused_flags; - } - info; - struct dx_entry entries[0]; + __le32 reserved_zero; + u8 hash_version; + u8 info_length; /* 8 */ + u8 indirect_levels; + u8 unused_flags; }; struct dx_node @@ -521,6 +511,17 @@ static inline void dx_set_block(struct dx_entry *entry, ext4_lblk_t value) entry->block = cpu_to_le32(value); } +struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) +{ + /* get dotdot first */ + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_NAME_LEN(1)); + + /* dx root info is after dotdot entry */ + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_NAME_LEN(2)); + + return (struct dx_root_info *)de; +} + static inline unsigned dx_get_hash(struct dx_entry *entry) { return le32_to_cpu(entry->hash); @@ -734,7 +735,7 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, { unsigned count, indirect; struct dx_entry *at, *entries, *p, *q, *m; - struct dx_root *root; + struct dx_root_info *info; struct dx_frame *frame = frame_in; struct dx_frame *ret_err = ERR_PTR(ERR_BAD_DX_DIR); u32 hash; @@ -744,17 +745,17 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, if (IS_ERR(frame->bh)) return (struct dx_frame *) frame->bh; - root = (struct dx_root *) frame->bh->b_data; - if (root->info.hash_version != DX_HASH_TEA && - root->info.hash_version != DX_HASH_HALF_MD4 && - root->info.hash_version != DX_HASH_LEGACY) { + info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data); + if (info->hash_version != DX_HASH_TEA && + info->hash_version != DX_HASH_HALF_MD4 && + info->hash_version != DX_HASH_LEGACY) { ext4_warning_inode(dir, "Unrecognised inode hash code %u", - root->info.hash_version); + info->hash_version); goto fail; } if (fname) hinfo = &fname->hinfo; - hinfo->hash_version = root->info.hash_version; + hinfo->hash_version = info->hash_version; if (hinfo->hash_version <= DX_HASH_TEA) hinfo->hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned; hinfo->seed = EXT4_SB(dir->i_sb)->s_hash_seed; @@ -762,18 +763,17 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, ext4fs_dirhash(fname_name(fname), fname_len(fname), hinfo); hash = hinfo->hash; - if (root->info.unused_flags & 1) { + if (info->unused_flags & 1) { ext4_warning_inode(dir, "Unimplemented hash flags: %#06x", - root->info.unused_flags); + info->unused_flags); goto fail; } - indirect = root->info.indirect_levels; + indirect = info->indirect_levels; if (indirect >= ext4_dir_htree_level(dir->i_sb)) { - ext4_warning(dir->i_sb, - "Directory (ino: %lu) htree depth %#06x exceed" - "supported value", dir->i_ino, - ext4_dir_htree_level(dir->i_sb)); + ext4_warning_inode(dir, + "directory htree depth %u exceeds supported value", + ext4_dir_htree_level(dir->i_sb)); if (ext4_dir_htree_level(dir->i_sb) < EXT4_HTREE_LEVEL) { ext4_warning(dir->i_sb, "Enable large directory " "feature to access it"); @@ -781,14 +781,17 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, goto fail; } - entries = (struct dx_entry *)(((char *)&root->info) + - root->info.info_length); + entries = (struct dx_entry *)(((char *)info) + info->info_length); - if (dx_get_limit(entries) != dx_root_limit(dir, - root->info.info_length)) { + if (dx_get_limit(entries) != + dx_root_limit(dir, (struct ext4_dir_entry_2 *) frame->bh->b_data, + info->info_length)) { ext4_warning_inode(dir, "dx entry: limit %u != root limit %u", dx_get_limit(entries), - dx_root_limit(dir, root->info.info_length)); + dx_root_limit(dir, + (struct ext4_dir_entry_2 *) + frame->bh->b_data, + info->info_length)); goto fail; } @@ -872,7 +875,7 @@ static void dx_release(struct dx_frame *frames) if (frames[0].bh == NULL) return; - info = &((struct dx_root *)frames[0].bh->b_data)->info; + info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data); for (i = 0; i <= info->indirect_levels; i++) { if (frames[i].bh == NULL) break; @@ -1907,17 +1910,16 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, struct inode *inode, struct buffer_head *bh) { struct buffer_head *bh2; - struct dx_root *root; struct dx_frame frames[EXT4_HTREE_LEVEL], *frame; struct dx_entry *entries; - struct ext4_dir_entry_2 *de, *de2; + struct ext4_dir_entry_2 *de, *de2, *dot_de, *dotdot_de; struct ext4_dir_entry_tail *t; char *data1, *top; unsigned len; int retval; unsigned blocksize; ext4_lblk_t block; - struct fake_dirent *fde; + struct dx_root_info *dx_info; int csum_size = 0; if (ext4_has_metadata_csum(inode->i_sb)) @@ -1932,18 +1934,19 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, brelse(bh); return retval; } - root = (struct dx_root *) bh->b_data; + + dot_de = (struct ext4_dir_entry_2 *)bh->b_data; + dotdot_de = ext4_next_entry(dot_de, blocksize); /* The 0th block becomes the root, move the dirents out */ - fde = &root->dotdot; - de = (struct ext4_dir_entry_2 *)((char *)fde + - ext4_rec_len_from_disk(fde->rec_len, blocksize)); - if ((char *) de >= (((char *) root) + blocksize)) { + de = (struct ext4_dir_entry_2 *)((char *)dotdot_de + + ext4_rec_len_from_disk(dotdot_de->rec_len, blocksize)); + if ((char *)de >= (((char *)dot_de) + blocksize)) { EXT4_ERROR_INODE(dir, "invalid rec_len for '..'"); brelse(bh); return -EFSCORRUPTED; } - len = ((char *) root) + (blocksize - csum_size) - (char *) de; + len = ((char *)dot_de) + (blocksize - csum_size) - (char *)de; /* Allocate new block for the 0th block's dirents */ bh2 = ext4_append(handle, dir, &block); @@ -1969,19 +1972,26 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, } /* Initialize the root; the dot dirents already exist */ - de = (struct ext4_dir_entry_2 *) (&root->dotdot); - de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(2), - blocksize); - memset (&root->info, 0, sizeof(root->info)); - root->info.info_length = sizeof(root->info); - root->info.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version; - entries = root->entries; + dotdot_de->rec_len = + ext4_rec_len_to_disk(blocksize - le16_to_cpu(dot_de->rec_len), + blocksize); + + /* initialize hashing info */ + dx_info = dx_get_dx_info(dot_de); + memset(dx_info, 0, sizeof(*dx_info)); + dx_info->info_length = sizeof(*dx_info); + dx_info->hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version; + + entries = (void *)dx_info + sizeof(*dx_info); + dx_set_block(entries, 1); dx_set_count(entries, 1); - dx_set_limit(entries, dx_root_limit(dir, sizeof(root->info))); + dx_set_limit(entries, dx_root_limit(dir, (struct ext4_dir_entry_2 *) + frame->bh->b_data, + sizeof(*dx_info))); /* Initialize as for dx_probe */ - fname->hinfo.hash_version = root->info.hash_version; + fname->hinfo.hash_version = dx_info->hash_version; if (fname->hinfo.hash_version <= DX_HASH_TEA) fname->hinfo.hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned; fname->hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed; @@ -2252,7 +2262,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname, goto journal_error; } } else { - struct dx_root *dxroot; + struct dx_root_info *info; memcpy((char *) entries2, (char *) entries, icount * sizeof(struct dx_entry)); dx_set_limit(entries2, dx_node_limit(dir)); @@ -2260,8 +2270,9 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname, /* Set up root */ dx_set_count(entries, 1); dx_set_block(entries + 0, newblock); - dxroot = (struct dx_root *)frames[0].bh->b_data; - dxroot->info.indirect_levels += 1; + info = dx_get_dx_info((struct ext4_dir_entry_2 *) + frames[0].bh->b_data); + info->indirect_levels += 1; dxtrace(printk(KERN_DEBUG "Creating %d level index...\n", info->indirect_levels));