diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 488f3da7a6c6..f081aaffe9d8 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -3068,6 +3068,7 @@ void ubifs_tnc_close(struct ubifs_info *c)
 
 		n = atomic_long_read(&c->clean_zn_cnt);
 		freed = ubifs_destroy_tnc_subtree(c, c->zroot.znode);
+		pr_err("free %ld n %ld\n", freed, n);
 		ubifs_assert(c, freed == n);
 		atomic_long_sub(n, &ubifs_clean_zn_cnt);
 	}
diff --git a/fs/ubifs/tnc_commit.c b/fs/ubifs/tnc_commit.c
index 01362ad5f804..9d9d379efb0e 100644
--- a/fs/ubifs/tnc_commit.c
+++ b/fs/ubifs/tnc_commit.c
@@ -989,7 +989,7 @@ static int write_index(struct ubifs_info *c)
 		}
 
 		/* The buffer is full or there are no more znodes to do */
-		err = ubifs_leb_write(c, lnum, c->cbuf, buf_offs, blen);
+		err = -EIO;
 		if (err)
 			return err;
 		buf_offs += blen;

#!/bin/bash
set -e

TMP=/root/temp
umount $TMP 2>/dev/null || true
mkdir -p $TMP

modprobe -r ubifs 2>/dev/null || true
for i in $(seq 0 1)
do
	ubidetach -p /dev/mtd$i 2>/dev/null || true
done
modprobe -r ubi 2>/dev/null || true
modprobe -r nandsim 2>/dev/null || true

mtd=/dev/mtd0
ubi=/dev/ubi0

ID="0xec,0xa1,0x00,0x15" # 128M 128KB 2KB
#ID="0x20,0xa5,0x00,0x15" # 2GB 128KB PEB, 2KB page
#ID="0x20,0xa5,0x00,0x26" # 4G 256KB 4KB 1KB-sub-page
#ID="0x20,0xa7,0x00,0x26" # 4G 256KB 4KB 2KB-sub-page
#ID="0x20,0x33,0x00,0x00" # 16M 16KB PEB, 512 page

modprobe nandsim id_bytes=$ID

# https://github.com/google/fscryptctl
encryption()
{
	head -c 64 /dev/urandom > /tmp/key
	key=$(/root/fscryptctl/fscryptctl add_key $TMP < /tmp/key)
	/root/fscryptctl/fscryptctl set_policy $key $TMP
	/root/fscryptctl/fscryptctl get_policy $TMP
}
authentication()
{
	keyctl clear @s
	keyctl add logon ubifs:foo 12345678901234567890123456789012 @s
}

flash_eraseall /dev/mtd0

if [ "$1" == "1" ]
then
	modprobe ubi mtd="0,2048" fm_autoconvert
	ubimkvol -N vol_a -m -n 0 /dev/ubi0
	modprobe ubifs
#	mkfs.ubifs -j 6221824 -R 0 /dev/ubi0_0
	if [ "$2" == "a" ]
	then
		authentication
		mount -t ubifs /dev/ubi0_0 -o auth_key=ubifs:foo,auth_hash_name=sha256 $TMP
	else
		mount -t ubifs /dev/ubi0_0 $TMP
	fi
	if [ "$2" == "e" ]
	then
		encryption
	fi
else
	nandwrite /dev/mtd0 disk > /dev/null
	modprobe ubi mtd="0,2048" fm_autoconvert
	modprobe ubifs
	#echo 1 > /sys/kernel/debug/ubifs/chk_fs
	mount -t ubifs /dev/ubi0_0 $TMP
fi