Commit 6bac30bb authored by Fabio M. De Francesco's avatar Fabio M. De Francesco Committed by Damien Le Moal

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

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: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 88084a3d
...@@ -1687,11 +1687,11 @@ static int zonefs_read_super(struct super_block *sb) ...@@ -1687,11 +1687,11 @@ static int zonefs_read_super(struct super_block *sb)
if (ret) if (ret)
goto free_page; goto free_page;
super = kmap(page); super = page_address(page);
ret = -EINVAL; ret = -EINVAL;
if (le32_to_cpu(super->s_magic) != ZONEFS_MAGIC) if (le32_to_cpu(super->s_magic) != ZONEFS_MAGIC)
goto unmap; goto free_page;
stored_crc = le32_to_cpu(super->s_crc); stored_crc = le32_to_cpu(super->s_crc);
super->s_crc = 0; super->s_crc = 0;
...@@ -1699,14 +1699,14 @@ static int zonefs_read_super(struct super_block *sb) ...@@ -1699,14 +1699,14 @@ static int zonefs_read_super(struct super_block *sb)
if (crc != stored_crc) { if (crc != stored_crc) {
zonefs_err(sb, "Invalid checksum (Expected 0x%08x, got 0x%08x)", zonefs_err(sb, "Invalid checksum (Expected 0x%08x, got 0x%08x)",
crc, stored_crc); crc, stored_crc);
goto unmap; goto free_page;
} }
sbi->s_features = le64_to_cpu(super->s_features); sbi->s_features = le64_to_cpu(super->s_features);
if (sbi->s_features & ~ZONEFS_F_DEFINED_FEATURES) { if (sbi->s_features & ~ZONEFS_F_DEFINED_FEATURES) {
zonefs_err(sb, "Unknown features set 0x%llx\n", zonefs_err(sb, "Unknown features set 0x%llx\n",
sbi->s_features); sbi->s_features);
goto unmap; goto free_page;
} }
if (sbi->s_features & ZONEFS_F_UID) { if (sbi->s_features & ZONEFS_F_UID) {
...@@ -1714,7 +1714,7 @@ static int zonefs_read_super(struct super_block *sb) ...@@ -1714,7 +1714,7 @@ static int zonefs_read_super(struct super_block *sb)
le32_to_cpu(super->s_uid)); le32_to_cpu(super->s_uid));
if (!uid_valid(sbi->s_uid)) { if (!uid_valid(sbi->s_uid)) {
zonefs_err(sb, "Invalid UID feature\n"); 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) ...@@ -1723,7 +1723,7 @@ static int zonefs_read_super(struct super_block *sb)
le32_to_cpu(super->s_gid)); le32_to_cpu(super->s_gid));
if (!gid_valid(sbi->s_gid)) { if (!gid_valid(sbi->s_gid)) {
zonefs_err(sb, "Invalid GID feature\n"); 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) ...@@ -1732,14 +1732,12 @@ static int zonefs_read_super(struct super_block *sb)
if (memchr_inv(super->s_reserved, 0, sizeof(super->s_reserved))) { if (memchr_inv(super->s_reserved, 0, sizeof(super->s_reserved))) {
zonefs_err(sb, "Reserved area is being used\n"); zonefs_err(sb, "Reserved area is being used\n");
goto unmap; goto free_page;
} }
import_uuid(&sbi->s_uuid, super->s_uuid); import_uuid(&sbi->s_uuid, super->s_uuid);
ret = 0; ret = 0;
unmap:
kunmap(page);
free_page: free_page:
__free_page(page); __free_page(page);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment