From nobody Fri Dec 19 04:53:46 2025 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D81681EEE0; Thu, 23 Jan 2025 08:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737620626; cv=none; b=WCAmTbckIBZMh76tKqW1/LDGVAAHI02uSnNABpdNPqxDl5fDWIPVHdt65daAkwANjI6n4Jx8Q9wUFD03YyBRH8RWe1vMTJOLVXqxc6ZNiiSQUVon09nMA8wPywsUTjjarRX9jxoCZwyRaXIPLa7f7fjj7tgcOK5f+uhAaZCLF0c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737620626; c=relaxed/simple; bh=H7NDqKr80LWAP+4mhvPZE9julSilRF+LPydCHIs9Ra8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=A5p08o0Hk1iPPA06WLIq07bF3rurZljQteYbmGh0lpi7WqnKxU6KIEzv4/TciWu9fnJGNfNPja9gbSN9Rf3jSZ9J54Z00NHwJH3CBMNchjlycfW9sJ98oyw8KjK70jGOsiw/UpyotdVuAdd+9bk/MXMR1++LDOxkQ9r69k5hHXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Ydv8s2zDkz4f3jt0; Thu, 23 Jan 2025 16:23:25 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id DB9B81A083F; Thu, 23 Jan 2025 16:23:40 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgCH7GCL_JFnxur_Bg--.47357S3; Thu, 23 Jan 2025 16:23:40 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, yi.zhang@huaweicloud.com Cc: akpm@osdl.org, shaggy@austin.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] ext4: add missing brelse() for bh2 in ext4_dx_add_entry() Date: Fri, 24 Jan 2025 00:20:48 +0800 Message-Id: <20250123162050.2114499-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250123162050.2114499-1-shikemeng@huaweicloud.com> References: <20250123162050.2114499-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgCH7GCL_JFnxur_Bg--.47357S3 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF15tF17ZF4DtF1rJFy3twb_yoW8urW3pr W5Gas7ZFyxCF129FsxZ3WUXFya9w4xCry7X3y7GrySk347Xrn5Gasrtw1FkF4DJay8W3W5 XF4UKryj9a12yrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQv14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCY1x0262kKe7AKxVWUAVWUtwCF04k20xvY0x0EwIxGrwCF54CYxVCY1x0262kKe7AK xVWUAVWUtwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I 0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAI cVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcV CF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIE c7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRS4EZUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Add missing brelse() for bh2 in ext4_dx_add_entry(). Fixes: ac27a0ec112a ("[PATCH] ext4: initial copy of files from ext3") Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo Reviewed-by: Zhang Yi --- fs/ext4/namei.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1012781ae9b4..adec145b6f7d 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2580,8 +2580,10 @@ static int ext4_dx_add_entry(handle_t *handle, struc= t ext4_filename *fname, BUFFER_TRACE(frame->bh, "get_write_access"); err =3D ext4_journal_get_write_access(handle, sb, frame->bh, EXT4_JTR_NONE); - if (err) + if (err) { + brelse(bh2); goto journal_error; + } if (!add_level) { unsigned icount1 =3D icount/2, icount2 =3D icount - icount1; unsigned hash2 =3D dx_get_hash(entries + icount1); @@ -2592,8 +2594,10 @@ static int ext4_dx_add_entry(handle_t *handle, struc= t ext4_filename *fname, err =3D ext4_journal_get_write_access(handle, sb, (frame - 1)->bh, EXT4_JTR_NONE); - if (err) + if (err) { + brelse(bh2); goto journal_error; + } =20 memcpy((char *) entries2, (char *) (entries + icount1), icount2 * sizeof(struct dx_entry)); @@ -2612,8 +2616,10 @@ static int ext4_dx_add_entry(handle_t *handle, struc= t ext4_filename *fname, dxtrace(dx_show_index("node", ((struct dx_node *) bh2->b_data)->entries)); err =3D ext4_handle_dirty_dx_node(handle, dir, bh2); - if (err) + if (err) { + brelse(bh2); goto journal_error; + } brelse (bh2); err =3D ext4_handle_dirty_dx_node(handle, dir, (frame - 1)->bh); @@ -2638,8 +2644,10 @@ static int ext4_dx_add_entry(handle_t *handle, struc= t ext4_filename *fname, "Creating %d level index...\n", dxroot->info.indirect_levels)); err =3D ext4_handle_dirty_dx_node(handle, dir, frame->bh); - if (err) + if (err) { + brelse(bh2); goto journal_error; + } err =3D ext4_handle_dirty_dx_node(handle, dir, bh2); brelse(bh2); restart =3D 1; --=20 2.30.0 From nobody Fri Dec 19 04:53:46 2025 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DA1220C013; Thu, 23 Jan 2025 08:23:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737620627; cv=none; b=FvRvy4BjdYpVZSZJvopMBt7HvxAeDZ36vzIhNGRlUUG2EiRqieVXUjid08+V4Pb1mK3v1TApU1fJbDxjcDNfUIl4/AlfvFg5uDqJBNFm4mywWHSVDXQn18Qp+yp01lyVNoX+DNZCIymmrM0WQJvsSniyQgTLzacuDT8RmzpHaC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737620627; c=relaxed/simple; bh=g8h+rfSlu5ec4PxXOx6KdQXc9mSKhjQS46BzH8ZWhSo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gKdKmNBtHlkFm6O6+uHgzBw8JoHw3acjULFfPG4cks8YFvglRszjwuUfZqa8202gjvF2xDXEedD4EBqtdRFADqv79jtiItNEzV25e8zCY5YuAgO6MFTEdbMWeTp54L71DUobsU8BBgtHrk37WBOg3jkFmhwFeLJ5xTJS0/dKIiI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Ydv8s5Vzgz4f3jt3; Thu, 23 Jan 2025 16:23:25 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 41C251A083F; Thu, 23 Jan 2025 16:23:41 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgCH7GCL_JFnxur_Bg--.47357S4; Thu, 23 Jan 2025 16:23:41 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, yi.zhang@huaweicloud.com Cc: akpm@osdl.org, shaggy@austin.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] ext4: remove unneeded forward declaration in namei.c Date: Fri, 24 Jan 2025 00:20:49 +0800 Message-Id: <20250123162050.2114499-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250123162050.2114499-1-shikemeng@huaweicloud.com> References: <20250123162050.2114499-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgCH7GCL_JFnxur_Bg--.47357S4 X-Coremail-Antispam: 1UD129KBjvJXoW7uryUAr47trWDZw47KFWUtwb_yoW8KrW5pF 4fJ3W5Kr48XF1DuFW8Zw4xAw1a9w1kW3srJrZrG34rKFy7tr12q3ZrJr4xZFy5try8WF12 yFs8Kry5Ca18WrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUH0b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxkF7I0En4kS14v26r126r1DMxAIw28IcxkI7VAKI48JMxAqzxv26xkF 7I0En4kS14v26r126r1DMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JV WxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAI cVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRMCzZJUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Remove unneeded forward declaration in namei.c Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo Reviewed-by: Zhang Yi --- fs/ext4/namei.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index adec145b6f7d..c3a80df51328 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -291,36 +291,6 @@ struct dx_tail { __le32 dt_checksum; /* crc32c(uuid+inum+dirblock) */ }; =20 -static inline ext4_lblk_t dx_get_block(struct dx_entry *entry); -static void dx_set_block(struct dx_entry *entry, ext4_lblk_t value); -static inline unsigned dx_get_hash(struct dx_entry *entry); -static void dx_set_hash(struct dx_entry *entry, unsigned value); -static unsigned dx_get_count(struct dx_entry *entries); -static unsigned dx_get_limit(struct dx_entry *entries); -static void dx_set_count(struct dx_entry *entries, unsigned value); -static void dx_set_limit(struct dx_entry *entries, unsigned value); -static unsigned dx_root_limit(struct inode *dir, unsigned infosize); -static unsigned dx_node_limit(struct inode *dir); -static struct dx_frame *dx_probe(struct ext4_filename *fname, - struct inode *dir, - struct dx_hash_info *hinfo, - struct dx_frame *frame); -static void dx_release(struct dx_frame *frames); -static int dx_make_map(struct inode *dir, struct buffer_head *bh, - struct dx_hash_info *hinfo, - struct dx_map_entry *map_tail); -static void dx_sort_map(struct dx_map_entry *map, unsigned count); -static struct ext4_dir_entry_2 *dx_move_dirents(struct inode *dir, char *f= rom, - char *to, struct dx_map_entry *offsets, - int count, unsigned int blocksize); -static struct ext4_dir_entry_2 *dx_pack_dirents(struct inode *dir, char *b= ase, - unsigned int blocksize); -static void dx_insert_block(struct dx_frame *frame, - u32 hash, ext4_lblk_t block); -static int ext4_htree_next_block(struct inode *dir, __u32 hash, - struct dx_frame *frame, - struct dx_frame *frames, - __u32 *start_hash); static struct buffer_head * ext4_dx_find_entry(struct inode *dir, struct ext4_filename *fname, struct ext4_dir_entry_2 **res_dir); --=20 2.30.0 From nobody Fri Dec 19 04:53:46 2025 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FF4520C01E; Thu, 23 Jan 2025 08:23:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737620626; cv=none; b=hzwu2v19iCBMX2UecemkjXxutTeyOnaGsoWupR3FRTCsK7c31yqzNycDfzh4t4jqYhbQ2bdn+i+kI3keA8nB7dQG8euLEk+EBWP9FoUsKlSlN6EwwcNQhHB4c2EXA89SJJ/8lWpEuXkD5ngtg5nS47Ob6dbwwNutj4fo8MhIyD4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737620626; c=relaxed/simple; bh=6I/D6FfPnEvEfKs2R4SW6zvONpTUPw9Kzrx2lTpXUI4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bk7Ks6yIIsiGSdANTEqxf6fNsZDWmFMoAFKsky+Vnb3iMtfbpwXja0WNuWP9pBJQnDnh98OFTQXtSlYVJntZFQ3pRHFo+kljHIZRn1EVgDU7/p09jSlF8sq0KygWGWm7UBDYm8KaAB0sR/w8W/k6WCb01JovA+zJV557HbNhfiM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Ydv8t149tz4f3jt8; Thu, 23 Jan 2025 16:23:26 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 9BD381A121F; Thu, 23 Jan 2025 16:23:41 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgCH7GCL_JFnxur_Bg--.47357S5; Thu, 23 Jan 2025 16:23:41 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, yi.zhang@huaweicloud.com Cc: akpm@osdl.org, shaggy@austin.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] ext4: remove unused input "inode" in ext4_find_dest_de Date: Fri, 24 Jan 2025 00:20:50 +0800 Message-Id: <20250123162050.2114499-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250123162050.2114499-1-shikemeng@huaweicloud.com> References: <20250123162050.2114499-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgCH7GCL_JFnxur_Bg--.47357S5 X-Coremail-Antispam: 1UD129KBjvJXoW7ur1xKw1kuF1ktF1DZF45trb_yoW8tw15pr Z8J3WDCr4UWF4q9a1xua1UZr1aq3ZrGr47WrWfG34rKrW7XwnYgF13tF10yF15KrWrZ3W2 vFZ8K348Gw13KrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQv14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCY1x0262kKe7AKxVWUAVWUtwCF04k20xvY0x0EwIxGrwCF54CYxVCY1x0262kKe7AK xVWUAVWUtwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I 0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAI cVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcV CF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIE c7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRGXHiUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Remove unused input "inode" in ext4_find_dest_de. Signed-off-by: Kemeng Shi Reviewed-by: Zhang Yi --- fs/ext4/ext4.h | 3 +-- fs/ext4/inline.c | 2 +- fs/ext4/namei.c | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index bbffb76d9a90..f7cec0de2790 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2821,8 +2821,7 @@ extern int ext4_htree_store_dirent(struct file *dir_f= ile, __u32 hash, struct ext4_dir_entry_2 *dirent, struct fscrypt_str *ent_name); extern void ext4_htree_free_dir_info(struct dir_private_info *p); -extern int ext4_find_dest_de(struct inode *dir, struct inode *inode, - struct buffer_head *bh, +extern int ext4_find_dest_de(struct inode *dir, struct buffer_head *bh, void *buf, int buf_size, struct ext4_filename *fname, struct ext4_dir_entry_2 **dest_de); diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 3536ca7e4fcc..29081a04aef5 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1012,7 +1012,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle, int err; struct ext4_dir_entry_2 *de; =20 - err =3D ext4_find_dest_de(dir, inode, iloc->bh, inline_start, + err =3D ext4_find_dest_de(dir, iloc->bh, inline_start, inline_size, fname, &de); if (err) return err; diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index c3a80df51328..9a6331179f27 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2030,8 +2030,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *ha= ndle, struct inode *dir, return ERR_PTR(err); } =20 -int ext4_find_dest_de(struct inode *dir, struct inode *inode, - struct buffer_head *bh, +int ext4_find_dest_de(struct inode *dir, struct buffer_head *bh, void *buf, int buf_size, struct ext4_filename *fname, struct ext4_dir_entry_2 **dest_de) @@ -2117,7 +2116,7 @@ static int add_dirent_to_buf(handle_t *handle, struct= ext4_filename *fname, csum_size =3D sizeof(struct ext4_dir_entry_tail); =20 if (!de) { - err =3D ext4_find_dest_de(dir, inode, bh, bh->b_data, + err =3D ext4_find_dest_de(dir, bh, bh->b_data, blocksize - csum_size, fname, &de); if (err) return err; --=20 2.30.0