diff options
| author | Eric Biggers | 2017-04-30 05:27:26 +0200 |
|---|---|---|
| committer | Theodore Ts'o | 2017-04-30 05:27:26 +0200 |
| commit | 1bc0af600b011dbbf9bbf39664b858ea2e365729 (patch) | |
| tree | fd59ad97664de94f429398d0557aa7289d19fc24 /fs/ext4/inline.c | |
| parent | jbd2: fix dbench4 performance regression for 'nobarrier' mounts (diff) | |
| download | kernel-qcow2-linux-1bc0af600b011dbbf9bbf39664b858ea2e365729.tar.gz kernel-qcow2-linux-1bc0af600b011dbbf9bbf39664b858ea2e365729.tar.xz kernel-qcow2-linux-1bc0af600b011dbbf9bbf39664b858ea2e365729.zip | |
ext4: trim return value and 'dir' argument from ext4_insert_dentry()
In the initial implementation of ext4 encryption, the filename was
encrypted in ext4_insert_dentry(), which could fail and also required
access to the 'dir' inode. Since then ext4 filename encryption has been
changed to encrypt the filename earlier, so we can revert the additions
to ext4_insert_dentry().
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inline.c')
| -rw-r--r-- | fs/ext4/inline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 375fb1c05d49..d5dea4c293ef 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1034,7 +1034,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle, err = ext4_journal_get_write_access(handle, iloc->bh); if (err) return err; - ext4_insert_dentry(dir, inode, de, inline_size, fname); + ext4_insert_dentry(inode, de, inline_size, fname); ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size); |