From patchwork Mon Jun 20 13:24:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 9187413 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 4D4926075E for ; Mon, 20 Jun 2016 13:33:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 377E426992 for ; Mon, 20 Jun 2016 13:33:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A6A9276AE; Mon, 20 Jun 2016 13:33:56 +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 BF3C826992 for ; Mon, 20 Jun 2016 13:33:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753343AbcFTNdz (ORCPT ); Mon, 20 Jun 2016 09:33:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46754 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752931AbcFTNdy (ORCPT ); Mon, 20 Jun 2016 09:33:54 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 3011AC05B1C5 for ; Mon, 20 Jun 2016 13:24:36 +0000 (UTC) Received: from localhost (vpn1-6-174.pek2.redhat.com [10.72.6.174]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5KDOYLU032625; Mon, 20 Jun 2016 09:24:35 -0400 From: Zorro Lang To: fstests@vger.kernel.org Cc: sandeen@redhat.com, eguan@redhat.com, cem@redhat.com, Zorro Lang Subject: [PATCH v4 1/2] common/rc: add functions to check or write objects under /sys/fs/$FSTYP Date: Mon, 20 Jun 2016 21:24:32 +0800 Message-Id: <1466429073-10124-1-git-send-email-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 20 Jun 2016 13:24:36 +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 XFS add more configurations in /sys/fs/xfs recently. For use them, this patch add some common functions for: 1. "require" a file/dir in /sys/fs/${FSTYP}. 2. write a file in /sys/fs/${FSTYP}. For common use, these functions can be used by other filesystems. Signed-off-by: Zorro Lang --- Hi, V4 did below changes: 1) function name from *_fs_sys_fs to *_fs_sysfs 2) use $UMOUNT_PROG to instead of umount 3) use _short_dev 4) add comments for new functions 5) other little changes Thanks, Zorro common/rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/common/rc b/common/rc index 51092a0..88c3777 100644 --- a/common/rc +++ b/common/rc @@ -3556,6 +3556,48 @@ run_fsx() fi } +# Test for the existence of a sysfs entry at /sys/fs/$FSTYP/$DEV/$ENTRY +_require_fs_sysfs() +{ + local dev=$1 + local entry=$2 + local tmp_mnt=`mktemp -d` + + if [ ! -b "$dev" -o -z "$entry" ];then + _fail "Usage: _require_fs_sysfs " + fi + + local dname=$(_short_dev $dev) + _mount -t $FSTYP `_common_dev_mount_options` $dev $tmp_mnt + if [ $? -ne 0 ];then + rm -f $tmp_mnt + _fail "_require_fs_sysfs: could not mount, mkfs first in your test?" + elif [ ! -e /sys/fs/${FSTYP}/${dname}/${entry} ];then + $UMOUNT_PROG $tmp_mnt + rm -f $tmp_mnt + _notrun "/sys/fs/${FSTYP}/${dname}/${entry}: No such file or directory" + fi + $UMOUNT_PROG $tmp_mnt + rm -rf $tmp_mnt +} + +# Write "content" into /sys/fs/$FSTYP/$DEV/$ENTRY +_set_fs_sysfs_param() +{ + local dev=$1 + shift + local entry=$1 + shift + local content="$*" + + if [ ! -b "$dev" -o -z "$entry" -o -z "$content" ];then + _fail "Usage: _set_fs_sysfs_param " + fi + + local dname=$(_short_dev $dev) + echo "$content" > /sys/fs/${FSTYP}/${dname}/${entry} +} + init_rc ################################################################################