Re: [linux-safety] [PATCH] fs/ext4: Remove unecessary deadstores

Thanks, got it, it should still be assigned to entries2.

On 06/12/2021 15:36, Lukas Bulwahn wrote:
> On Mon, Dec 6, 2021 at 4:01 PM Milan Lakhani
> <[email protected]> wrote:
> I think you do need to provide a commit message. The change looks
> reasonable, except dropping the assignment to frame->entries.
>
> The commit message should explain why this should be dropped.
>
>> Signed-off-by: Milan Lakhani <[email protected]>
>> ---
>>   fs/ext4/namei.c | 5 +----
>>   1 file changed, 1 insertion(+), 4 deletions(-)
>>
>> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
>> index 52c9bd154122..f341478e9740 100644
>> --- a/fs/ext4/namei.c
>> +++ b/fs/ext4/namei.c
>> @@ -2432,7 +2432,6 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname,
>>          if (err != -ENOSPC)
>>                  goto cleanup;
>>
>> -       err = 0;
>>          /* Block full, should compress but for now just split */
>>          dxtrace(printk(KERN_DEBUG "using %u of %u node entries\n",
>>                         dx_get_count(entries), dx_get_limit(entries)));
>> @@ -2507,7 +2506,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname,
>>                          /* Which index block gets the new entry? */
>>                          if (at - entries >= icount1) {
>>                                  frame->at = at - entries - icount1 + entries2;
>> -                               frame->entries = entries = entries2;
>> +                               frame->entries;
> This looks strange: you still want to assign frame->entries = entries2, right?
>
>>                                  swap(frame->bh, bh2);
>>                          }
>>                          dx_insert_block((frame - 1), hash2, newblock);
>> @@ -3183,8 +3182,6 @@ int __ext4_unlink(handle_t *handle, struct inode *dir, const struct qstr *d_name
>>                  retval = ext4_mark_inode_dirty(handle, dir);
>>                  if (retval)
>>                          goto out;
>> -       } else {
>> -               retval = 0;
>>          }
>>          if (inode->i_nlink == 0)
>>                  ext4_warning_inode(inode, "Deleting file '%.*s' with no links",
>> --
>> 2.25.1
>>
>>
>>
>>
>>
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#266): https://lists.elisa.tech/g/linux-safety/message/266
> Mute This Topic: https://lists.elisa.tech/mt/87541425/4617862
> Group Owner: [email protected]
> Unsubscribe: https://lists.elisa.tech/g/linux-safety/unsub [[email protected]]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
>
-- 
Milan Lakhani
Codethink Ltd.
3rd Floor Dale House,
35 Dale Street,
Manchester, M1 2HF
United Kingdom