From patchwork Sun Oct 8 11:25:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandan Rajendra X-Patchwork-Id: 9991805 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 2D56960364 for ; Sun, 8 Oct 2017 11:25:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C5C6286D7 for ; Sun, 8 Oct 2017 11:25:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2C7F286EC; Sun, 8 Oct 2017 11:24:59 +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 8ACF1286D7 for ; Sun, 8 Oct 2017 11:24:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753245AbdJHLY6 (ORCPT ); Sun, 8 Oct 2017 07:24:58 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:33812 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751651AbdJHLY5 (ORCPT ); Sun, 8 Oct 2017 07:24:57 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v98BNml5011425 for ; Sun, 8 Oct 2017 07:24:56 -0400 Received: from e15.ny.us.ibm.com (e15.ny.us.ibm.com [129.33.205.205]) by mx0a-001b2d01.pphosted.com with ESMTP id 2dey8f1tvs-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Sun, 08 Oct 2017 07:24:56 -0400 Received: from localhost by e15.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 8 Oct 2017 07:24:55 -0400 Received: from b01cxnp23034.gho.pok.ibm.com (9.57.198.29) by e15.ny.us.ibm.com (146.89.104.202) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 8 Oct 2017 07:24:54 -0400 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v98BOrIb40042728; Sun, 8 Oct 2017 11:24:53 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1145D112040; Sun, 8 Oct 2017 07:24:29 -0400 (EDT) Received: from localhost.localdomain.com (unknown [9.85.75.230]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP id 5B902112047; Sun, 8 Oct 2017 07:24:27 -0400 (EDT) From: Chandan Rajendra To: fstests@vger.kernel.org, amir73il@gmail.com Cc: Chandan Rajendra , linux-unionfs@vger.kernel.org, eguan@redhat.com Subject: [PATCH] overlay/038: Miscellaneous fixes Date: Sun, 8 Oct 2017 16:55:35 +0530 X-Mailer: git-send-email 2.9.5 X-TM-AS-GCONF: 00 x-cbid: 17100811-0036-0000-0000-000002778D47 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007861; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000235; SDB=6.00928137; UDB=6.00467062; IPR=6.00708409; BA=6.00005626; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017447; XFM=3.00000015; UTC=2017-10-08 11:24:55 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17100811-0037-0000-0000-00004202BF2F Message-Id: <20171008112535.18975-1-chandan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-10-08_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1710080169 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This commit removes the redundant chown operation which was supposed to cause the test file to be copied up. Also, _overlay_scratch_unmount() is used to unmount the overlay filesystem rather than invoking $UMOUNT_PROG. Signed-off-by: Chandan Rajendra --- tests/overlay/038 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/overlay/038 b/tests/overlay/038 index 57281fa..148995b 100755 --- a/tests/overlay/038 +++ b/tests/overlay/038 @@ -1,7 +1,7 @@ #! /bin/bash # FSQA Test No. 038 # -# Test constant d_ino numbers +# Test consistent d_ino numbers for samefs setup. # #----------------------------------------------------------------------- # @@ -102,10 +102,8 @@ current_d=$($here/src/t_dir_type $impure_dir $impure_dir_st_ino) [[ $current_d == ". d" ]] || \ echo "Before dir becomes impure: Invalid d_ino reported for ." -chown -h 100 $SCRATCH_MNT/test_file -test_file_st_ino=$(stat -c '%i' $SCRATCH_MNT/test_file) - mv $SCRATCH_MNT/test_file $impure_dir +test_file_st_ino=$(stat -c '%i' $impure_dir/test_file) impure=$($GETFATTR_PROG --absolute-names --only-values -n 'trusted.overlay.impure' \ $upperdir/test_dir/impure_dir) @@ -187,7 +185,7 @@ parent_d=$($here/src/t_dir_type $SCRATCH_MNT/test_dir/pure_lower_dir $test_dir_s [[ $parent_d == ".. d" ]] || \ echo "Pure lower in dir which has another lower layer: Invalid d_ino reported for .." -$UMOUNT_PROG $SCRATCH_MNT +_overlay_scratch_unmount echo "Silence is golden" status=0