diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-06-21 15:49:26 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-06-21 15:49:26 -0400 |
| commit | f036adb39976467cf57f577490269594994f9eb4 (patch) | |
| tree | 26e5148f7e5e23ef833d58d630538ddddf57a5ff /fs/ext4/dir.c | |
| parent | 4e19d6b65fb4fc42e352ce9883649e049da14743 (diff) | |
| download | linux-f036adb39976467cf57f577490269594994f9eb4.tar.gz linux-f036adb39976467cf57f577490269594994f9eb4.tar.bz2 linux-f036adb39976467cf57f577490269594994f9eb4.zip | |
ext4: rename "dirent_csum" functions to use "dirblock"
Functions such as ext4_dirent_csum_verify() and ext4_dirent_csum_set()
don't actually operate on a directory entry, but a directory block.
And while they take a struct ext4_dir_entry *dirent as an argument, it
had better be the first directory at the beginning of the direct
block, or things will go very wrong.
Rename the following functions so that things make more sense, and
remove a lot of confusing casts along the way:
ext4_dirent_csum_verify -> ext4_dirblock_csum_verify
ext4_dirent_csum_set -> ext4_dirblock_csum_set
ext4_dirent_csum -> ext4_dirblock_csum
ext4_handle_dirty_dirent_node -> ext4_handle_dirty_dirblock
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/dir.c')
| -rw-r--r-- | fs/ext4/dir.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 3a77b7affd09..86054f31fe4d 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -194,8 +194,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) /* Check the checksum */ if (!buffer_verified(bh) && - !ext4_dirent_csum_verify(inode, - (struct ext4_dir_entry *)bh->b_data)) { + !ext4_dirblock_csum_verify(inode, bh)) { EXT4_ERROR_FILE(file, 0, "directory fails checksum " "at offset %llu", (unsigned long long)ctx->pos); |