Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4803c30 authored by Estelle Hammache's avatar Estelle Hammache Committed by Thomas Gleixner
Browse files

[JFFS2] Fix write buffer retry case 



Correction of retry case to avoid silent failure of rmdir
when jffs2_wbuf_recover GCs the previous entry (+ corresponding
dnode case).

Signed-off-by: default avatarEstelle Hammache <estelle.hammache@st.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ed3786a5

fs/jffs2/write.c

+32 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: write.c,v 1.87 2004/11/16 20:36:12 dwmw2 Exp $

 * $Id: write.c,v 1.88 2005/01/24 21:13:39 hammache Exp $

 *

 */
@@ -136,6 +136,21 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2 
	raw->__totlen = PAD(sizeof(*ri)+datalen);

	raw->next_phys = NULL;



	if ((alloc_mode!=ALLOC_GC) && (je32_to_cpu(ri->version) < f->highest_version))

	{

		if (! retried)

		{

			BUG();

		}

		else

		{

			D1(printk(KERN_DEBUG "jffs2_write_dnode : dnode_version %d,  highest version %d -> updating dnode\n", 

					     je32_to_cpu(ri->version), f->highest_version));

			ri->version = cpu_to_je32(++f->highest_version);

			ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));

		}

	}



	ret = jffs2_flash_writev(c, vecs, cnt, flash_ofs, &retlen,

				 (alloc_mode==ALLOC_GC)?0:f->inocache->ino);
@@ -280,6 +295,22 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff 
	raw->__totlen = PAD(sizeof(*rd)+namelen);

	raw->next_phys = NULL;



	if ((alloc_mode!=ALLOC_GC) && (je32_to_cpu(rd->version) < f->highest_version))

	{

		if (! retried)

		{

			BUG();

		}

		else

		{

			D1(printk(KERN_DEBUG "jffs2_write_dirent : dirent_version %d,  highest version %d -> updating dirent\n", 

					     je32_to_cpu(rd->version), f->highest_version));

			rd->version = cpu_to_je32(++f->highest_version);

			fd->version = je32_to_cpu(rd->version);

			rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));

		}

	}



	ret = jffs2_flash_writev(c, vecs, 2, flash_ofs, &retlen,

				 (alloc_mode==ALLOC_GC)?0:je32_to_cpu(rd->pino));

	if (ret || (retlen != sizeof(*rd) + namelen)) {