From patchwork Mon Jul 25 17:27:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 9246097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 65A0560757 for ; Mon, 25 Jul 2016 17:28:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5635D26538 for ; Mon, 25 Jul 2016 17:28:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AADF2705B; Mon, 25 Jul 2016 17:28:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 533D226538 for ; Mon, 25 Jul 2016 17:28:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753376AbcGYR2T (ORCPT ); Mon, 25 Jul 2016 13:28:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38980 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753261AbcGYR2S (ORCPT ); Mon, 25 Jul 2016 13:28:18 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7BA83C05AA40; Mon, 25 Jul 2016 17:28:18 +0000 (UTC) Received: from localhost (ovpn-12-17.pek2.redhat.com [10.72.12.17]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6PHSHaL026206; Mon, 25 Jul 2016 13:28:17 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: linux-unionfs@vger.kernel.org, xzhou@redhat.com, Eryu Guan Subject: [PATCH 2/3] overlay: remove stale file from upperdir Date: Tue, 26 Jul 2016 01:27:49 +0800 Message-Id: <1469467670-22287-2-git-send-email-eguan@redhat.com> In-Reply-To: <1469467670-22287-1-git-send-email-eguan@redhat.com> References: <1469467670-22287-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 25 Jul 2016 17:28:18 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The upper dentry may become stale before we remove it from overlay, e.g. file was removed from upperdir directly, which triggered warning/oops in ovl_remove_and_whiteout(). Commit cfc9fde0b07c ("ovl: verify upper dentry in ovl_remove_and_whiteout()") fixed this issue. Signed-off-by: Eryu Guan --- tests/overlay/012 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/012.out | 2 ++ tests/overlay/group | 1 + 3 files changed, 80 insertions(+) create mode 100755 tests/overlay/012 create mode 100644 tests/overlay/012.out diff --git a/tests/overlay/012 b/tests/overlay/012 new file mode 100755 index 0000000..cfe16f2 --- /dev/null +++ b/tests/overlay/012 @@ -0,0 +1,77 @@ +#! /bin/bash +# FS QA Test 012 +# +# The upper dentry may become stale before we remove it from +# overlay, e.g. file was removed from upperdir directly, which +# triggered warning/oops in ovl_remove_and_whiteout(). +# +# Commit cfc9fde0b07c ("ovl: verify upper dentry in +# ovl_remove_and_whiteout()") 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_scratch + +# remove all files from previous runs +_scratch_mkfs + +lowerdir=$SCRATCH_DEV/$OVERLAY_LOWER_DIR +upperdir=$SCRATCH_DEV/$OVERLAY_UPPER_DIR +mkdir -p $lowerdir/test + +_scratch_mount + +# remove test file to create a whiteout +rmdir $SCRATCH_MNT/test + +# create the test file again and remove it from upperdir directly, make the +# upper dentry become stale +touch $SCRATCH_MNT/test +rm $upperdir/test +# try to remove test file from overlay dir, trigger ovl_remove_and_whiteout, it +# should see stale file handle error, and no warnings/oops are expected. +rm $SCRATCH_MNT/test 2>&1 | _filter_scratch + +# success, all done +status=0 +exit diff --git a/tests/overlay/012.out b/tests/overlay/012.out new file mode 100644 index 0000000..1bfa147 --- /dev/null +++ b/tests/overlay/012.out @@ -0,0 +1,2 @@ +QA output created by 012 +rm: cannot remove 'SCRATCH_MNT/test': Stale file handle diff --git a/tests/overlay/group b/tests/overlay/group index acd8ac4..103e2e1 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -14,3 +14,4 @@ 009 auto quick 010 auto quick whiteout 011 auto quick +012 auto quick