new file mode 100755
@@ -0,0 +1,65 @@
+#! /bin/bash
+# FS QA Test 006
+#
+# Test getcwd() failure after unsuccessful rmdir
+#
+# Upstream commit ce9113bbcbf4 ("ovl: fix getcwd() failure after unsuccessful
+# rmdir") fixed this issue
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2016 Red Hat Inc. 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!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+rm -f $seqres.full
+
+# real QA test starts here
+_supported_fs overlay
+_supported_os Linux
+_require_test
+
+rm -rf $TEST_DIR/$seq
+
+# make a non-empty dir $seq
+mkdir -p $TEST_DIR/$seq/$seq.sub
+# cd to it and call rmdir on it, rmdir should fail
+cd $TEST_DIR/$seq
+rmdir ../$seq >>$seqres.full 2>&1
+# getcwd should return the correct current dir
+pwd | _filter_test_dir
+
+# success, all done
+status=0
+exit
new file mode 100644
@@ -0,0 +1,2 @@
+QA output created by 006
+TEST_DIR/006
@@ -8,3 +8,4 @@
003 auto quick whiteout
004 attr auto copyup quick
005 auto quick copyup whiteout
+006 auto quick