Message ID | 20210408070033.123047-1-xuyihang@huawei.com |
---|---|
State | Awaiting Upstream |
Headers | show |
Series | [-next] ext4: fix error return code in ext4_fc_perform_commit() | expand |
Thanks, this looks good. Reviewed-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com> On Thu, Apr 8, 2021 at 12:00 AM Xu Yihang <xuyihang@huawei.com> wrote: > > In case of if not ext4_fc_add_tlv branch, an error return code is missing. > > Fixes: aa75f4d3daae ("ext4: main fast-commit commit path") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Xu Yihang <xuyihang@huawei.com> > --- > fs/ext4/fast_commit.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c > index 7541d0b5d706..312273ed8a9f 100644 > --- a/fs/ext4/fast_commit.c > +++ b/fs/ext4/fast_commit.c > @@ -1088,8 +1088,10 @@ static int ext4_fc_perform_commit(journal_t *journal) > head.fc_tid = cpu_to_le32( > sbi->s_journal->j_running_transaction->t_tid); > if (!ext4_fc_add_tlv(sb, EXT4_FC_TAG_HEAD, sizeof(head), > - (u8 *)&head, &crc)) > + (u8 *)&head, &crc)) { > + ret = -ENOSPC; > goto out; > + } > } > > spin_lock(&sbi->s_fc_lock); > -- > 2.17.1 >
On Thu, Apr 08, 2021 at 03:00:33PM +0800, Xu Yihang wrote: > In case of if not ext4_fc_add_tlv branch, an error return code is missing. > > Fixes: aa75f4d3daae ("ext4: main fast-commit commit path") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Xu Yihang <xuyihang@huawei.com> Thanks, applied. - Ted
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 7541d0b5d706..312273ed8a9f 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1088,8 +1088,10 @@ static int ext4_fc_perform_commit(journal_t *journal) head.fc_tid = cpu_to_le32( sbi->s_journal->j_running_transaction->t_tid); if (!ext4_fc_add_tlv(sb, EXT4_FC_TAG_HEAD, sizeof(head), - (u8 *)&head, &crc)) + (u8 *)&head, &crc)) { + ret = -ENOSPC; goto out; + } } spin_lock(&sbi->s_fc_lock);
In case of if not ext4_fc_add_tlv branch, an error return code is missing. Fixes: aa75f4d3daae ("ext4: main fast-commit commit path") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Xu Yihang <xuyihang@huawei.com> --- fs/ext4/fast_commit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)