diff options
| author | Tao Ma <boyu.mt@taobao.com> | 2012-12-10 14:06:00 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-12-10 14:06:00 -0500 |
| commit | 9f40fe54635b7533f51993d0f5e7f014fc14d33a (patch) | |
| tree | 4fba9eb2fbf97ee21cfecba4746c439e51794030 /fs/ext4/namei.c | |
| parent | 05019a9e7f025133f20c67677c9c8551eca3c6dc (diff) | |
| download | op-kernel-dev-9f40fe54635b7533f51993d0f5e7f014fc14d33a.zip op-kernel-dev-9f40fe54635b7533f51993d0f5e7f014fc14d33a.tar.gz | |
ext4: let ext4_delete_entry() handle inline data
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/namei.c')
| -rw-r--r-- | fs/ext4/namei.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index c10fc26..a32228a 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2158,6 +2158,14 @@ static int ext4_delete_entry(handle_t *handle, { int err, csum_size = 0; + if (ext4_has_inline_data(dir)) { + int has_inline_data = 1; + err = ext4_delete_inline_entry(handle, dir, de_del, bh, + &has_inline_data); + if (has_inline_data) + return err; + } + if (EXT4_HAS_RO_COMPAT_FEATURE(dir->i_sb, EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) csum_size = sizeof(struct ext4_dir_entry_tail); |
