diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-03-13 10:26:06 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-03-31 01:26:56 +0200 |
| commit | 776c4a7ce86f4c95d9fc6307d44a4e9e1a740e40 (patch) | |
| tree | dac4d89de9e884d24db9181b068c4a096b16fc84 /fs/btrfs | |
| parent | d0ee39349311ce823c36ece7fa066827ab8eb7af (diff) | |
| download | linux-776c4a7ce86f4c95d9fc6307d44a4e9e1a740e40.tar.gz linux-776c4a7ce86f4c95d9fc6307d44a4e9e1a740e40.tar.bz2 linux-776c4a7ce86f4c95d9fc6307d44a4e9e1a740e40.zip | |
btrfs: Use sizeof directly instead of a constant variable
The kernel would like to have all stack VLA usage removed[1].
Unfortunately using an integer constant variable as the size of an
array is still considered a VLA. Instead let's use directly sizeof(var)
which removes the VLA usage. Use the occasion to remove csum_size
altogether and use sizeof() also for the size passed to memcmp
[1]: https://lkml.org/lkml/2018/3/7/621
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 156116655a32..b203982d66bc 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -403,8 +403,7 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info, if (csum_type == BTRFS_CSUM_TYPE_CRC32) { u32 crc = ~(u32)0; - const int csum_size = sizeof(crc); - char result[csum_size]; + char result[sizeof(crc)]; /* * The super_block structure does not span the whole @@ -415,7 +414,7 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info, crc, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE); btrfs_csum_final(crc, result); - if (memcmp(raw_disk_sb, result, csum_size)) + if (memcmp(raw_disk_sb, result, sizeof(result))) ret = 1; } |