mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

zonefs: Call page_address() on page acquired with GFP_KERNEL flag

Browse source 
zonefs_read_super() acquires a page with alloc_page(GFP_KERNEL). That
page cannot come from ZONE_HIGHMEM, thus there's no need to map it with
kmap().

Therefore, use a plain page_address() on that page.

Suggested-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
This commit is contained in:
Fabio M. De Francesco 2022-07-05 16:22:02 +02:00 committed by Damien Le Moal
parent 88084a3df1
commit 6bac30bb8f
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs/zonefs/super.c
View file

@ -1687,11 +1687,11 @@ static int zonefs_read_super(struct super_block *sb)
if (ret)
goto free_page;
super = kmap(page);
super = page_address(page);
ret = -EINVAL;
if (le32_to_cpu(super->s_magic) != ZONEFS_MAGIC)
goto unmap;
goto free_page;
stored_crc = le32_to_cpu(super->s_crc);
super->s_crc = 0;
@ -1699,14 +1699,14 @@ static int zonefs_read_super(struct super_block *sb)
if (crc != stored_crc) {
zonefs_err(sb, "Invalid checksum (Expected 0x%08x, got 0x%08x)",
crc, stored_crc);
goto unmap;
goto free_page;
}
sbi->s_features = le64_to_cpu(super->s_features);
if (sbi->s_features & ~ZONEFS_F_DEFINED_FEATURES) {
zonefs_err(sb, "Unknown features set 0x%llx\n",
sbi->s_features);
goto unmap;
goto free_page;
}
if (sbi->s_features & ZONEFS_F_UID) {
@ -1714,7 +1714,7 @@ static int zonefs_read_super(struct super_block *sb)
le32_to_cpu(super->s_uid));
if (!uid_valid(sbi->s_uid)) {
zonefs_err(sb, "Invalid UID feature\n");
goto unmap;
goto free_page;
}
}
@ -1723,7 +1723,7 @@ static int zonefs_read_super(struct super_block *sb)
le32_to_cpu(super->s_gid));
if (!gid_valid(sbi->s_gid)) {
zonefs_err(sb, "Invalid GID feature\n");
goto unmap;
goto free_page;
}
}
@ -1732,14 +1732,12 @@ static int zonefs_read_super(struct super_block *sb)
if (memchr_inv(super->s_reserved, 0, sizeof(super->s_reserved))) {
zonefs_err(sb, "Reserved area is being used\n");
goto unmap;
goto free_page;
}
import_uuid(&sbi->s_uuid, super->s_uuid);
ret = 0;
unmap:
kunmap(page);
free_page:
__free_page(page);