From: Milan Lakhani <milan.lakhani@codethink.co.uk>
To: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Cc: linux-safety@lists.elisa.tech, Nghia Le <nghialm78@gmail.com>
Subject: Re: [linux-safety] [PATCH] fs/ext4: Remove unecessary deadstores
Date: Mon, 6 Dec 2021 16:09:38 +0000 [thread overview]
Message-ID: <9285640c-042f-478a-46ab-42b5280426c1@codethink.co.uk> (raw)
In-Reply-To: <CAKXUXMxHScEHRhQCrz2zoeh4ju=v3RyLSaDXqWUTheFF9XE6RA@mail.gmail.com>
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
> <milan.lakhani@codethink.co.uk> 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 <milan.lakhani@codethink.co.uk>
>> ---
>> 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: linux-safety+owner@lists.elisa.tech
> Unsubscribe: https://lists.elisa.tech/g/linux-safety/unsub [milan.lakhani@codethink.co.uk]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
>
--
Milan Lakhani
Codethink Ltd.
3rd Floor Dale House,
35 Dale Street,
Manchester, M1 2HF
United Kingdom
WARNING: multiple messages have this Message-ID (diff)
From: "Milan Lakhani" <milan.lakhani@codethink.co.uk>
To: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Cc: linux-safety@lists.elisa.tech, Nghia Le <nghialm78@gmail.com>
Subject: Re: [linux-safety] [PATCH] fs/ext4: Remove unecessary deadstores
Date: Mon, 6 Dec 2021 16:09:38 +0000 [thread overview]
Message-ID: <9285640c-042f-478a-46ab-42b5280426c1@codethink.co.uk> (raw)
Message-ID: <20211206160938.qLxpwS8GKY56FJAARTm2LsdGocr9MrtXw8AhcFuAeSg@z> (raw)
In-Reply-To: <CAKXUXMxHScEHRhQCrz2zoeh4ju=v3RyLSaDXqWUTheFF9XE6RA@mail.gmail.com>
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
> <milan.lakhani@codethink.co.uk> 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 <milan.lakhani@codethink.co.uk>
>> ---
>> 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
>>
>>
>>
>>
>>
>>
>
>
>
>
>
--
Milan Lakhani
Codethink Ltd.
3rd Floor Dale House,
35 Dale Street,
Manchester, M1 2HF
United Kingdom
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#268): https://lists.elisa.tech/g/linux-safety/message/268
Mute This Topic: https://lists.elisa.tech/mt/87541425/5278000
Group Owner: linux-safety+owner@lists.elisa.tech
Unsubscribe: https://lists.elisa.tech/g/linux-safety/unsub [linux-safety@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2021-12-06 16:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 15:01 [PATCH] fs/ext4: Remove unecessary deadstores Milan Lakhani
2021-12-06 15:01 ` [linux-safety] " Milan Lakhani
2021-12-06 15:36 ` Lukas Bulwahn
2021-12-06 15:36 ` Lukas Bulwahn
2021-12-06 16:09 ` Milan Lakhani [this message]
2021-12-06 16:09 ` Milan Lakhani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9285640c-042f-478a-46ab-42b5280426c1@codethink.co.uk \
--to=milan.lakhani@codethink.co.uk \
--cc=linux-safety@lists.elisa.tech \
--cc=lukas.bulwahn@gmail.com \
--cc=nghialm78@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).