Skip to contentSkip to conversation

JFFS2: min/max confusion?

PATCH In review Roel Kluin 2 participants 2 messages Nov 21, 2009 – Nov 26, 2009

Subsystems (2)
Memory technology devices (MTD) Journalling flash file system V2 (JFFS2)
lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 JFFS2: min/max confusion?

MAX_SUMMARY_SIZE was meant as a limit, not as a minimum

Signed-off-by Roel Kluin <[email protected]>
---
 fs/jffs2/summary.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

unless I am mistaken?

fs/jffs2/summary.c +1 -1
index 6caf1e1..800171d 100644
@@ -23,7 +23,7 @@
 
 int jffs2_sum_init(struct jffs2_sb_info *c)
 {
-	uint32_t sum_size = max_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
+	uint32_t sum_size = min_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
 
 	c->summary = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
#1 lore raw
Quoted 14 lines · Roel Kluin

MAX_SUMMARY_SIZE was meant as a limit, not as a minimum

Signed-off-by Roel Kluin <[email protected]>
---
 fs/jffs2/summary.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

unless I am mistaken?

fs/jffs2/summary.c +0 -0
index 6caf1e1..800171d 100644

fs/jffs2/summary.c line 28

Quoted 7 lines
fs/jffs2/summary.c +1 -1
@@ -23,7 +23,7 @@
 
 int jffs2_sum_init(struct jffs2_sb_info *c)
 {
-	uint32_t sum_size = max_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
+	uint32_t sum_size = min_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
 
 	c->summary = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);

This looks right, I've pushed your patch to my l2-mtd tree, thanks.

Signature · 2 lines
Best Regards,
Artem Bityutskiy (Артём Битюцкий)