generic: fix min/max confusion in jffs2_sum_init on 2.6.32

SVN-Revision: 24652
This commit is contained in:
Gabor Juhos 2010-12-17 20:34:26 +00:00
parent cafe08a1b2
commit 96da72dc56
1 changed files with 25 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From 0fed784b0f1ecf57d568ae60b2cada43f9d90759 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Sat, 21 Nov 2009 16:34:36 +0100
Subject: [PATCH] JFFS2: fix min/max confusion
MAX_SUMMARY_SIZE was meant as a limit, not as a minimum
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
fs/jffs2/summary.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--- 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);