new file mode 100644
@@ -0,0 +1,61 @@
+#! /bin/bash
+# FS QA Test No. btrfs/016
+#
+# Regression test to make sure we can move a subvol into another subvol
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Fusion IO. All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+
+status=1 # failure is the default!
+
+_cleanup()
+{
+ rm -f $tmp.*
+}
+
+trap "_cleanup ; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# real QA test starts here
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+
+rm -f $seqres.full
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount
+$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/test1 >> $seqres.full 2>&1 \
+ || _fail "couldn't create test1"
+$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \
+ || _fail "couldn't create test1"
+mv $SCRATCH_MNT/test1 $SCRATCH_MNT/test2 || _fail "Problem doing move"
+
+echo "Silence is golden"
+status=0 ; exit
new file mode 100644
@@ -0,0 +1,2 @@
+QA output created by 016
+Silence is golden
@@ -18,3 +18,4 @@
013 auto quick
014 auto quick
015 auto quick
+016 auto quick
A user reported a regression where we could no longer rename a subvolume into another subvolume. This is a test case to do just that to make sure we don't regress on this again. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> --- tests/btrfs/016 | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/016.out | 2 ++ tests/btrfs/group | 1 + 3 files changed, 64 insertions(+) create mode 100644 tests/btrfs/016 create mode 100644 tests/btrfs/016.out