From: Ferenc Havasi <havasi@inf.u-szeged.hu>
Date: Fri, 16 Sep 2005 12:58:20 +0000 (+0100)
Subject: [JFFS2] Account summary space in reserved_size.
X-Git-Tag: firefly_0821_release~40572^2~46
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=34c0e906718fa2f85b54b937f79bffdca48ee864;p=firefly-linux-kernel-4.4.55.git

[JFFS2] Account summary space in reserved_size.

Always keep valid data in reserved_size.

It did not cause problems, but the reservation code was unoptimal
when centralized summary was active or the size of the erase block
was very small.

Signed-off-by: Ferenc Havasi <havasi@inf.u-szeged.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index 208b2bdf01e5..2cf576ae1120 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: nodemgmt.c,v 1.125 2005/09/07 08:34:54 havasi Exp $
+ * $Id: nodemgmt.c,v 1.126 2005/09/16 12:58:17 havasi Exp $
  *
  */
 
@@ -307,6 +307,8 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin
 
 			jffs2_close_nextblock(c, jeb);
 			jeb = NULL;
+			/* keep always valid value in reserved_size */
+			reserved_size = PAD(sumsize + c->summary->sum_size + JFFS2_SUMMARY_FRAME_SIZE);
 		}
 	} else {
 		if (jeb && minsize > jeb->free_size) {