lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <1562244632-134963-1-git-send-email-yangerkun@huawei.com> Date: Thu, 4 Jul 2019 20:50:32 +0800 From: yangerkun <yangerkun@...wei.com> To: <tytso@....edu>, <jack@...e.com> CC: <linux-ext4@...r.kernel.org>, <yangerkun@...wei.com>, <houtao1@...wei.com>, <yi.zhang@...wei.com>, <miaoxie@...wei.com> Subject: [PATCH] ext4: fix warning when turn on dioread_nolock and inline_data mkfs.ext4 -O inline_data /dev/vdb mount -o dioread_nolock /dev/vdb /mnt echo "some inline data..." >> /mnt/test-file echo "some inline data..." >> /mnt/test-file sync With upon script, system will trigger "WARN_ON(!io_end->handle && sbi->s_journal)" since the wrong order between rsv_blocks calculate and destroy inline data for dealloc. Signed-off-by: yangerkun <yangerkun@...wei.com> --- fs/ext4/inode.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c7f77c6..3f2a366 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2769,15 +2769,6 @@ static int ext4_writepages(struct address_space *mapping, goto out_writepages; } - if (ext4_should_dioread_nolock(inode)) { - /* - * We may need to convert up to one extent per block in - * the page and we may dirty the inode. - */ - rsv_blocks = 1 + ext4_chunk_trans_blocks(inode, - PAGE_SIZE >> inode->i_blkbits); - } - /* * If we have inline data and arrive here, it means that * we will soon create the block for the 1st page, so @@ -2796,6 +2787,15 @@ static int ext4_writepages(struct address_space *mapping, ext4_journal_stop(handle); } + if (ext4_should_dioread_nolock(inode)) { + /* + * We may need to convert up to one extent per block in + * the page and we may dirty the inode. + */ + rsv_blocks = 1 + ext4_chunk_trans_blocks(inode, + PAGE_SIZE >> inode->i_blkbits); + } + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) range_whole = 1; -- 2.7.4
Powered by blists - more mailing lists