From patchwork Wed Jun 22 11:38:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 9192531 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 112836075A for ; Wed, 22 Jun 2016 11:47:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02420283FA for ; Wed, 22 Jun 2016 11:47:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EAA9E283FD; Wed, 22 Jun 2016 11:47:43 +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 853D2283FA for ; Wed, 22 Jun 2016 11:47:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752408AbcFVLrn (ORCPT ); Wed, 22 Jun 2016 07:47:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33584 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751623AbcFVLrm (ORCPT ); Wed, 22 Jun 2016 07:47:42 -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 3DC5785546; Wed, 22 Jun 2016 11:39:22 +0000 (UTC) Received: from localhost (dhcp-12-144.nay.redhat.com [10.66.12.144]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5MBdLhs018946; Wed, 22 Jun 2016 07:39:21 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: linux-unionfs@vger.kernel.org, Eryu Guan Subject: [PATCH 3/3] overlay: create new file over whiteout Date: Wed, 22 Jun 2016 19:38:58 +0800 Message-Id: <1466595538-23719-3-git-send-email-eguan@redhat.com> In-Reply-To: <1466595538-23719-1-git-send-email-eguan@redhat.com> References: <1466595538-23719-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.28]); Wed, 22 Jun 2016 11:39:22 +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 Create file/dir over whiteout by another user, uid/gid of the file/dir should be current fsuid/fsgid, not the mounter's. This upstream kernel patch fixed the issue d0e13f5 ovl: fix uid/gid when creating over whiteout Signed-off-by: Eryu Guan --- tests/overlay/008 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/008.out | 3 ++ tests/overlay/group | 1 + 3 files changed, 89 insertions(+) create mode 100755 tests/overlay/008 create mode 100644 tests/overlay/008.out diff --git a/tests/overlay/008 b/tests/overlay/008 new file mode 100755 index 0000000..cb8667c --- /dev/null +++ b/tests/overlay/008 @@ -0,0 +1,85 @@ +#! /bin/bash +# FS QA Test 008 +# +# Create file/dir over whiteout by another user, uid/gid of the file/dir should +# be current fsuid/fsgid, not the mounter's. +# +# This upstream kernel patch fixed the issue +# d0e13f5 ovl: fix uid/gid when creating over whiteout +# +#----------------------------------------------------------------------- +# 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 +_require_user + +# Remove all files from previous tests +_scratch_mkfs + +# Create test file on lower dir, and chown to fsgqa user +lowerdir=$SCRATCH_DEV/$OVERLAY_LOWER_DIR +mkdir $lowerdir +touch $lowerdir/testfile +chown fsgqa:fsgqa $lowerdir/testfile + +# chown upperdir to fsgqa user, so new file/dir can be created by the user +upperdir=$SCRATCH_DEV/$OVERLAY_UPPER_DIR +mkdir $upperdir +chown fsgqa:fsgqa $upperdir + +_scratch_mount + +# Remove testfile, whiteout created in lowerdir +rm -f $SCRATCH_MNT/testfile + +# Create new file over whiteout and check the file ownership +_user_do "touch $SCRATCH_MNT/testfile" +stat -c %U:%G-%F $SCRATCH_MNT/testfile + +# Create new dir over whiteout and check ownership again +rm -f $SCRATCH_MNT/testfile +_user_do "mkdir $SCRATCH_MNT/testfile" +stat -c %U:%G-%F $SCRATCH_MNT/testfile + +# success, all done +status=0 +exit diff --git a/tests/overlay/008.out b/tests/overlay/008.out new file mode 100644 index 0000000..6e17968 --- /dev/null +++ b/tests/overlay/008.out @@ -0,0 +1,3 @@ +QA output created by 008 +fsgqa:fsgqa-regular empty file +fsgqa:fsgqa-directory diff --git a/tests/overlay/group b/tests/overlay/group index e29e540..874bfdd 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -10,3 +10,4 @@ 005 auto copyup quick 006 auto quick copyup whiteout 007 auto quick +008 auto quick whiteout