diff options
author | Theodore Ts'o <tytso@mit.edu> | 2023-06-08 10:06:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-14 10:35:26 +0200 |
commit | 62a4fee01a9e9c247b3f130fc0170b06072b041e (patch) | |
tree | 5b62a031e8cbd102fa6c75aa35c91553729faaa0 | |
parent | 5fe38021b2154fc03b552bbc10316c800dd23c51 (diff) | |
download | linux-stable-62a4fee01a9e9c247b3f130fc0170b06072b041e.tar.gz linux-stable-62a4fee01a9e9c247b3f130fc0170b06072b041e.tar.bz2 linux-stable-62a4fee01a9e9c247b3f130fc0170b06072b041e.zip |
ext4: only check dquot_initialize_needed() when debugging
commit dea9d8f7643fab07bf89a1155f1f94f37d096a5e upstream.
ext4_xattr_block_set() relies on its caller to call dquot_initialize()
on the inode. To assure that this has happened there are WARN_ON
checks. Unfortunately, this is subject to false positives if there is
an antagonist thread which is flipping the file system at high rates
between r/o and rw. So only do the check if EXT4_XATTR_DEBUG is
enabled.
Link: https://lore.kernel.org/r/20230608044056.GA1418535@mit.edu
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/ext4/xattr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index e6c3bf7ad9b9..c2117b985d4a 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -2021,8 +2021,9 @@ inserted: else { u32 ref; +#ifdef EXT4_XATTR_DEBUG WARN_ON_ONCE(dquot_initialize_needed(inode)); - +#endif /* The old block is released after updating the inode. */ error = dquot_alloc_block(inode, @@ -2090,8 +2091,9 @@ inserted: /* We need to allocate a new block */ ext4_fsblk_t goal, block; +#ifdef EXT4_XATTR_DEBUG WARN_ON_ONCE(dquot_initialize_needed(inode)); - +#endif goal = ext4_group_first_block_no(sb, EXT4_I(inode)->i_block_group); block = ext4_new_meta_blocks(handle, inode, goal, 0, |