| Message ID | 20241219110027.1440876-6-shikemeng@huaweicloud.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix and cleanups to ext4 namei.c | expand |
On 2024/12/19 19:00, Kemeng Shi wrote: > Remove unused input "inode" in ext4_find_dest_de. > > Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> Looks good to me. Reviewed-by: Zhang Yi <yi.zhang@huawei.com> > --- > 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_file, __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; > > - err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start, > + err = 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 07a1bb570deb..aee1858e6482 100644 > --- a/fs/ext4/namei.c > +++ b/fs/ext4/namei.c > @@ -2024,8 +2024,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir, > return ERR_PTR(err); > } > > -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) > @@ -2111,7 +2110,7 @@ static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname, > csum_size = sizeof(struct ext4_dir_entry_tail); > > if (!de) { > - err = ext4_find_dest_de(dir, inode, bh, bh->b_data, > + err = ext4_find_dest_de(dir, bh, bh->b_data, > blocksize - csum_size, fname, &de); > if (err) > return err;
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_file, __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; - err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start, + err = 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 07a1bb570deb..aee1858e6482 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2024,8 +2024,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir, return ERR_PTR(err); } -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) @@ -2111,7 +2110,7 @@ static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname, csum_size = sizeof(struct ext4_dir_entry_tail); if (!de) { - err = ext4_find_dest_de(dir, inode, bh, bh->b_data, + err = ext4_find_dest_de(dir, bh, bh->b_data, blocksize - csum_size, fname, &de); if (err) return err;
Remove unused input "inode" in ext4_find_dest_de. Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> --- fs/ext4/ext4.h | 3 +-- fs/ext4/inline.c | 2 +- fs/ext4/namei.c | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-)