From 4b9beff27a6f11a7d98a05547fcf72a13720a06d Mon Sep 17 00:00:00 2001
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Fri, 18 Jul 2008 16:47:41 +0300
Subject: [PATCH] --- yaml --- r: 108534 b: refs/heads/master c:
 16dfd804b44ef7156d1c201f100bd0d9dc6b7c4b h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ubifs/debug.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 869228523bd0..22278436d734 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e0f358e29cc91c8eb09e10cbf1f6bb58a62c795
+refs/heads/master: 16dfd804b44ef7156d1c201f100bd0d9dc6b7c4b
diff --git a/trunk/fs/ubifs/debug.c b/trunk/fs/ubifs/debug.c
index 4e3aaeba4eca..0adfb29b8503 100644
--- a/trunk/fs/ubifs/debug.c
+++ b/trunk/fs/ubifs/debug.c
@@ -2208,16 +2208,17 @@ int dbg_leb_read(struct ubi_volume_desc *desc, int lnum, char *buf, int offset,
 int dbg_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf,
 		  int offset, int len, int dtype)
 {
-	int err;
+	int err, failing;
 
 	if (in_failure_mode(desc))
 		return -EIO;
-	if (do_fail(desc, lnum, 1))
+	failing = do_fail(desc, lnum, 1);
+	if (failing)
 		cut_data(buf, len);
 	err = ubi_leb_write(desc, lnum, buf, offset, len, dtype);
 	if (err)
 		return err;
-	if (in_failure_mode(desc))
+	if (failing)
 		return -EIO;
 	return 0;
 }