JFFS2: fix min/max confusion

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Mon Nov 30 05:59:06 EST 2009


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=0fed784b0f1ecf57d568ae60b2cada43f9d90759
Commit:     0fed784b0f1ecf57d568ae60b2cada43f9d90759
Parent:     2695eab964efaa382168e0351705967bd9deb7ea
Author:     Roel Kluin <roel.kluin at gmail.com>
AuthorDate: Sat Nov 21 16:34:36 2009 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon Nov 30 09:59:48 2009 +0000

    JFFS2: fix min/max confusion
    
    MAX_SUMMARY_SIZE was meant as a limit, not as a minimum
    
    Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 fs/jffs2/summary.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 6caf1e1..800171d 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -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);
 



More information about the linux-mtd-cvs mailing list