[PATCH 2/4] erofs-utils: reserve physical_clusterbits[]
Gao Xiang
xiang at kernel.org
Mon May 10 17:23:01 AEST 2021
Sync up with kernel commit
54e0b6c873dc ("erofs: reserve physical_clusterbits[]")
Signed-off-by: Gao Xiang <xiang at kernel.org>
---
include/erofs/internal.h | 1 -
lib/zmap.c | 13 -------------
2 files changed, 14 deletions(-)
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 1339341a0792..da7be569d8ee 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -164,7 +164,6 @@ struct erofs_inode {
uint16_t z_advise;
uint8_t z_algorithmtype[2];
uint8_t z_logical_clusterbits;
- uint8_t z_physical_clusterbits[2];
};
};
#ifdef WITH_ANDROID
diff --git a/lib/zmap.c b/lib/zmap.c
index e2a54b937b7c..0c5c4f52bbd0 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -20,8 +20,6 @@ int z_erofs_fill_inode(struct erofs_inode *vi)
vi->z_algorithmtype[0] = 0;
vi->z_algorithmtype[1] = 0;
vi->z_logical_clusterbits = LOG_BLOCK_SIZE;
- vi->z_physical_clusterbits[0] = vi->z_logical_clusterbits;
- vi->z_physical_clusterbits[1] = vi->z_logical_clusterbits;
vi->flags |= EROFS_I_Z_INITED;
}
@@ -66,17 +64,6 @@ static int z_erofs_fill_inode_lazy(struct erofs_inode *vi)
vi->nid * 1ULL);
return -EFSCORRUPTED;
}
- vi->z_physical_clusterbits[0] = vi->z_logical_clusterbits +
- ((h->h_clusterbits >> 3) & 3);
-
- if (vi->z_physical_clusterbits[0] != LOG_BLOCK_SIZE) {
- erofs_err("unsupported physical clusterbits %u for nid %llu",
- vi->z_physical_clusterbits[0], (unsigned long long)vi->nid);
- return -EOPNOTSUPP;
- }
-
- vi->z_physical_clusterbits[1] = vi->z_logical_clusterbits +
- ((h->h_clusterbits >> 5) & 7);
vi->flags |= EROFS_I_Z_INITED;
return 0;
}
--
2.20.1
More information about the Linux-erofs
mailing list