From e1c4ee40ffef93ca2df12523868c58825a2f38ef Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Sun, 24 Jun 2007 19:22:29 +0200
Subject: [PATCH] --- yaml --- r: 68447 b: refs/heads/master c:
 f79c44980aae3f50fe73e50789641df265953cc6 h: refs/heads/master i:   68445:
 21009d441ddd1b37b16ba406f7c7a055c4b94667   68443:
 0cba61a5623559a99039cda80916eb2a457af660   68439:
 fb971fb18eb94329bea0040e7f198ce86e68bab8   68431:
 0c303e1a4a814aae705f1c1863de8fc0485544ca   68415:
 f8c7535f6f86095b93d6fcdfe786c91d502258fb v: v3

---
 [refs]                 |  2 +-
 trunk/fs/jffs2/write.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ef078ebe021c..109c1c19f0ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fab2c399129273713b7dcc6a54cef17ca124a47f
+refs/heads/master: f79c44980aae3f50fe73e50789641df265953cc6
diff --git a/trunk/fs/jffs2/write.c b/trunk/fs/jffs2/write.c
index c9fe0ab3a329..1406f2ce20a7 100644
--- a/trunk/fs/jffs2/write.c
+++ b/trunk/fs/jffs2/write.c
@@ -173,6 +173,12 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2
 		flash_ofs |= REF_NORMAL;
 	}
 	fn->raw = jffs2_add_physical_node_ref(c, flash_ofs, PAD(sizeof(*ri)+datalen), f->inocache);
+	if (IS_ERR(fn->raw)) {
+		void *hold_err = fn->raw;
+		/* Release the full_dnode which is now useless, and return */
+		jffs2_free_full_dnode(fn);
+		return ERR_PTR(PTR_ERR(hold_err));
+	}
 	fn->ofs = je32_to_cpu(ri->offset);
 	fn->size = je32_to_cpu(ri->dsize);
 	fn->frags = 0;
@@ -291,6 +297,12 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
 	}
 	/* Mark the space used */
 	fd->raw = jffs2_add_physical_node_ref(c, flash_ofs | REF_PRISTINE, PAD(sizeof(*rd)+namelen), f->inocache);
+	if (IS_ERR(fd->raw)) {
+		void *hold_err = fd->raw;
+		/* Release the full_dirent which is now useless, and return */
+		jffs2_free_full_dirent(fd);
+		return ERR_PTR(PTR_ERR(hold_err));
+	}
 
 	if (retried) {
 		jffs2_dbg_acct_sanity_check(c,NULL);