From nobody Thu Sep 18 11:24:38 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 688DBC352A1 for ; Wed, 7 Dec 2022 07:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229816AbiLGHUW (ORCPT ); Wed, 7 Dec 2022 02:20:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229738AbiLGHT5 (ORCPT ); Wed, 7 Dec 2022 02:19:57 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF40F32057; Tue, 6 Dec 2022 23:19:55 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NRpZZ5LM9z4f3sC7; Wed, 7 Dec 2022 15:19:50 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgBniteWPpBj6qE0Bw--.52253S9; Wed, 07 Dec 2022 15:19:53 +0800 (CST) From: Ye Bin To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jack@suse.cz, Ye Bin Subject: [PATCH v2 5/6] ext4: rename xattr_find_entry() and __xattr_check_inode() Date: Wed, 7 Dec 2022 15:40:42 +0800 Message-Id: <20221207074043.1286731-6-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221207074043.1286731-1-yebin@huaweicloud.com> References: <20221207074043.1286731-1-yebin@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgBniteWPpBj6qE0Bw--.52253S9 X-Coremail-Antispam: 1UD129KBjvJXoW3GrW3AFW3JFyUXw13JF4kCrg_yoW7GFWkpF yUJa4DJr48JryUur40yr17Zw1ag3W7Gay7ZayxC3WSyF1DXwn7tFyFkFn5CFyUur4kWw42 qF43K348u3WSk3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvEb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7 v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF 1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIx AIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI 42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWI evJa73UjIFyTuYvjxUFgAwUUUUU X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ye Bin xattr_find_entry() and __xattr_check_inode() is in EXT4 xattr module. so add 'ext4' prefix to unify name style. Signed-off-by: Ye Bin Reviewed-by: Jan Kara --- fs/ext4/xattr.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index efa623658c12..5c0476ff62c8 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -290,8 +290,9 @@ __ext4_xattr_check_block(struct inode *inode, struct bu= ffer_head *bh, =20 =20 static int -__xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *h= eader, - void *end, const char *function, unsigned int line) +__ext4_xattr_check_inode(struct inode *inode, + struct ext4_xattr_ibody_header *header, void *end, + const char *function, unsigned int line) { int error =3D -EFSCORRUPTED; =20 @@ -307,12 +308,12 @@ __xattr_check_inode(struct inode *inode, struct ext4_= xattr_ibody_header *header, return error; } =20 -#define xattr_check_inode(inode, header, end) \ - __xattr_check_inode((inode), (header), (end), __func__, __LINE__) +#define ext4_xattr_check_inode(inode, header, end) \ + __ext4_xattr_check_inode((inode), (header), (end), __func__, __LINE__) =20 static int -xattr_find_entry(struct inode *inode, struct ext4_xattr_entry **pentry, - void *end, int name_index, const char *name, int sorted) +ext4_xattr_find_entry(struct inode *inode, struct ext4_xattr_entry **pentr= y, + void *end, int name_index, const char *name, int sorted) { struct ext4_xattr_entry *entry, *next; size_t name_len; @@ -577,7 +578,7 @@ ext4_xattr_block_get(struct inode *inode, int name_inde= x, const char *name, ext4_xattr_block_cache_insert(ea_block_cache, bh); entry =3D BFIRST(bh); end =3D bh->b_data + bh->b_size; - error =3D xattr_find_entry(inode, &entry, end, name_index, name, 1); + error =3D ext4_xattr_find_entry(inode, &entry, end, name_index, name, 1); if (error) goto cleanup; size =3D le32_to_cpu(entry->e_value_size); @@ -628,11 +629,11 @@ ext4_xattr_ibody_get(struct inode *inode, int name_in= dex, const char *name, raw_inode =3D ext4_raw_inode(&iloc); header =3D IHDR(inode, raw_inode); end =3D (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size; - error =3D xattr_check_inode(inode, header, end); + error =3D ext4_xattr_check_inode(inode, header, end); if (error) goto cleanup; entry =3D IFIRST(header); - error =3D xattr_find_entry(inode, &entry, end, name_index, name, 0); + error =3D ext4_xattr_find_entry(inode, &entry, end, name_index, name, 0); if (error) goto cleanup; size =3D le32_to_cpu(entry->e_value_size); @@ -773,7 +774,7 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buff= er, size_t buffer_size) raw_inode =3D ext4_raw_inode(&iloc); header =3D IHDR(inode, raw_inode); end =3D (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size; - error =3D xattr_check_inode(inode, header, end); + error =3D ext4_xattr_check_inode(inode, header, end); if (error) goto cleanup; error =3D ext4_xattr_list_entries(dentry, IFIRST(header), @@ -859,7 +860,7 @@ int ext4_get_inode_usage(struct inode *inode, qsize_t *= usage) raw_inode =3D ext4_raw_inode(&iloc); header =3D IHDR(inode, raw_inode); end =3D (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size; - ret =3D xattr_check_inode(inode, header, end); + ret =3D ext4_xattr_check_inode(inode, header, end); if (ret) goto out; =20 @@ -1862,8 +1863,8 @@ ext4_xattr_block_find(struct inode *inode, struct ext= 4_xattr_info *i, bs->s.first =3D BFIRST(bs->bh); bs->s.end =3D bs->bh->b_data + bs->bh->b_size; bs->s.here =3D bs->s.first; - error =3D xattr_find_entry(inode, &bs->s.here, bs->s.end, - i->name_index, i->name, 1); + error =3D ext4_xattr_find_entry(inode, &bs->s.here, bs->s.end, + i->name_index, i->name, 1); if (error && error !=3D -ENODATA) return error; bs->s.not_found =3D error; @@ -2222,12 +2223,12 @@ int ext4_xattr_ibody_find(struct inode *inode, stru= ct ext4_xattr_info *i, is->s.here =3D is->s.first; is->s.end =3D (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size; if (ext4_test_inode_state(inode, EXT4_STATE_XATTR)) { - error =3D xattr_check_inode(inode, header, is->s.end); + error =3D ext4_xattr_check_inode(inode, header, is->s.end); if (error) return error; /* Find the named attribute. */ - error =3D xattr_find_entry(inode, &is->s.here, is->s.end, - i->name_index, i->name, 0); + error =3D ext4_xattr_find_entry(inode, &is->s.here, is->s.end, + i->name_index, i->name, 0); if (error && error !=3D -ENODATA) return error; is->s.not_found =3D error; @@ -2742,7 +2743,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, i= nt new_extra_isize, min_offs =3D end - base; total_ino =3D sizeof(struct ext4_xattr_ibody_header) + sizeof(u32); =20 - error =3D xattr_check_inode(inode, header, end); + error =3D ext4_xattr_check_inode(inode, header, end); if (error) goto cleanup; =20 --=20 2.31.1