btrfs-progs (4.4.1-1.1) unstable; urgency=medium

  * Non-maintainer upload.
  * New upstream release.
  * Rename package to btrfs-progs (Closes: #780081)
  * Update standards version to 3.9.7 (no changes needed).
  * debian/control: Add "Breaks" per Gianfranco Costamagna's suggestion
  * Change lintian override to reflect package rename
  * Switch from using postinst and postrm to using triggers
    per Christian Seiler's recommendation.

# imported from the archive

2 files changed, 117 insertions, 0 deletions

diff --git a/tests/fsck-tests/012-leaf-corruption/no_data_extent.tar.xz b/tests/fsck-tests/012-leaf-corruption/no_data_extent.tar.xz
new file mode 100644
index 00000000..547e5455
--- /dev/null
+++ b/tests/fsck-tests/012-leaf-corruption/no_data_extent.tar.xz
diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh b/tests/fsck-tests/012-leaf-corruption/test.sh
new file mode 100755
index 00000000..a308727d
--- /dev/null
+++ b/tests/fsck-tests/012-leaf-corruption/test.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+source $TOP/tests/common
+
+check_prereq btrfs-image
+
+# Check file list for leaf corruption, no regular/preallocated
+# file extent case.
+# Corrupted leaf is 20832256, which contains inode 1862~1872
+#
+# 1862, ref from leaf 20828160 key 24(DIR_ITEM)
+# 1863, ref from leaf 605388 item key 11(DIR_ITEM)
+# 1864, no ref to rebuild, no need to rebuild
+# 1865, ref from leaf 19767296 key 23(DIR_ITEM)
+# 1866-1868 no ref to rebuild, all refs in corrupted leaf
+# 1869, ref from leaf 4976640 key 22(DIR_ITEM)
+# 1870 no ref to rebuild, all refs in corrupted leaf
+# 1871, ref from leaf 19746816 key 38(DIR_ITEM)
+# 1872, ref from leaf 19767296 key 14(DIR_ITEM)
+# The list format is:
+# INO SIZE MODE NAME
+# INO: inode number
+# SIZE: file size, only checked for regular file
+# MODE: raw file mode, get from stat
+# NAME: file name
+leaf_no_data_ext_list=(
+	1862 0 40700 "install.d"
+	1862 0 40700 "install.d"
+	1863 0 40700 "gdb"
+	1865 0 40700 "iptables"
+	1869 0 40700 "snmp"
+	1871 0 100700 "machine-id"
+	1872 0 100700 "adjtime"
+	1877 0 40700 "del"
+)
+
+generate_leaf_corrupt_no_data_ext()
+{
+	dest=$1
+	echo "generating leaf_corrupt_no_data_ext.btrfs-image" >> $RESULTS
+	tar --no-same-owner -xJf ./no_data_extent.tar.xz || \
+		_fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image"
+	$TOP/btrfs-image -r test.img.btrfs-image $dest || \
+		_fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image"
+
+	# leaf at 4206592 and 20905984 contains no regular data
+	# extent, clear its csum to corrupt the leaf.
+	for x in 4206592 20905984; do
+		dd if=/dev/zero of=$dest bs=1 count=32 conv=notrunc seek=$x \
+			1>/dev/null 2>&1
+	done
+}
+
+check_inode()
+{
+	path=$1
+	ino=$2
+	size=$3
+	mode=$4
+	name=$5
+
+	# Check whether the inode exists
+	exists=$($SUDO_HELPER find $path -inum $ino)
+	if [ -z "$exists" ]; then
+		_fail "inode $ino not recovered correctly"
+	fi
+
+	# Check inode type
+	found_mode=$(printf "%o" 0x$($SUDO_HELPER stat $exists -c %f))
+	if [ $found_mode -ne $mode ]; then
+		echo "$found_mode"
+		_fail "inode $ino modes not recovered"
+	fi
+
+	# Check inode size
+	found_size=$($SUDO_HELPER stat $exists -c %s)
+	if [ $mode -ne 41700 -a $found_size -ne $size ]; then
+		_fail "inode $ino size not recovered correctly"
+	fi
+
+	# Check inode name
+	if [ "$(basename $exists)" != "$name" ]; then
+		_fail "inode $ino name not recovered correctly"
+	else
+		return 0
+	fi
+}
+
+# Check salvaged data in the recovered image
+check_leaf_corrupt_no_data_ext()
+{
+	image=$1
+	$SUDO_HELPER mount -o loop $image -o ro $TEST_MNT
+
+	i=0
+	while [ $i -lt ${#leaf_no_data_ext_list[@]} ]; do
+		check_inode $TEST_MNT/lost+found \
+			    ${leaf_no_data_ext_list[i]} \
+			    ${leaf_no_data_ext_list[i + 1]} \
+			    ${leaf_no_data_ext_list[i + 2]} \
+			    ${leaf_no_data_ext_list[i + 3]} \
+			    ${leaf_no_data_ext_list[i + 4]}
+			    ((i+=4))
+	done
+	$SUDO_HELPER umount $TEST_MNT
+}
+
+setup_root_helper
+
+generate_leaf_corrupt_no_data_ext test.img
+check_image test.img
+check_leaf_corrupt_no_data_ext test.img
+
+rm test.img
+rm test.img.btrfs-image
+# Not used, its function is the same as generate_leaf_corrupt_no_data_ext()
+rm generate_image.sh