From patchwork Sat Mar 11 00:50:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9618279 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 E8D066046A for ; Sat, 11 Mar 2017 00:52:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FC35287B4 for ; Sat, 11 Mar 2017 00:52:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2244D28763; Sat, 11 Mar 2017 00:52:38 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 B6ADC28763 for ; Sat, 11 Mar 2017 00:52:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933425AbdCKAwg (ORCPT ); Fri, 10 Mar 2017 19:52:36 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33235 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933382AbdCKAwc (ORCPT ); Fri, 10 Mar 2017 19:52:32 -0500 Received: by mail-pf0-f193.google.com with SMTP id v190so12418401pfb.0 for ; Fri, 10 Mar 2017 16:52:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CDQANvbpWtv1jbJSDQxmC/az1BU8vx35MoWDrCnhBGo=; b=S1jmOPGJisE1UvhTPGDP+U4Jq5KNyKTvagFxAW91HZvWmvFBp+2zU8IXWpwZsk4Dwy brtHIxh0eYw1gyw+4iDFJ3nOlsda9PDGA+NnmDKso7wCsPf2F0vzI6WFhru4e8RnsPx7 xxa5P/q204SXNzO+eg+UYNpeQNfNzyXq51sMQtqWmhl9a0J4WeG2qXDv1mwXr7IclPUa SYFpF4EQPUg9FhDbFBQllP84zPeUo1ztKbsKGVSEfQ6Q5xzYCnnxP+Y4hqMl2pcja02I uHurJb0cx4yFBxDEfoMbReOL4JKytb/K5Gh51pQOv9fnRcI6pS5rdAQdkHQP0U7/Hfos atDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CDQANvbpWtv1jbJSDQxmC/az1BU8vx35MoWDrCnhBGo=; b=mRjWLzTY8TlzqTm5C1rXBYpWh/vUaUf9Js+4dsCWEgZVCWNs90MMvCq2aVeidpN4Hk 7Rj9KupNTyZ0UCHjM7ypi2LWKvjfWd3tVig/USfpC6TyTFPkAKZemX1hLav2tb0Uusr1 0mPuAdasUEFZ0X1jfmaGLZX9tvurdofWkKohGiZXohbJrOn216mi/elWonKmEDDcWr88 ESdMnGrsfkW7Wfq0Sqc7R5BSkcw9IYUkSIpIiPo7uWnm43WdOreto7AngWWZ8PHI7pF0 LoynvgC1m8zF1bDpeKo+994rJzNe1FlYIYr8UWuzWi5mvp7PJ5tjDq4+Aa4PR7/c4wpA kb6w== X-Gm-Message-State: AMke39l49dVsKV+OcCbN200o6o2YAXx47Oc+QR5+Ap+x9NDIu+MTCl2nN1OkuBHbkFHywg== X-Received: by 10.84.205.70 with SMTP id o6mr29744319plh.176.1489193551292; Fri, 10 Mar 2017 16:52:31 -0800 (PST) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.119.30.131]) by smtp.gmail.com with ESMTPSA id h3sm20685863pfc.82.2017.03.10.16.52.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Mar 2017 16:52:30 -0800 (PST) From: Eric Biggers To: fstests@vger.kernel.org Cc: Theodore Ts'o , Eric Biggers Subject: [PATCH 1/2] common/quota: remove redundant SELinux detection code Date: Fri, 10 Mar 2017 16:50:47 -0800 Message-Id: <20170311005048.128477-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers SELINUX_MOUNT_OPTIONS is already set in common/config. Setting it again in common/quota is not necessary. Nor is SELINUX_MOUNT_OPTIONS specific to quota tests, so common/quota is not the right place for it. Signed-off-by: Eric Biggers --- common/quota | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/quota b/common/quota index c48cc70b..f49728c2 100644 --- a/common/quota +++ b/common/quota @@ -51,13 +51,6 @@ _require_quota() _notrun "disk quotas not supported by this filesystem type: $FSTYP" ;; esac - - # SELinux adds extra xattrs which can mess up our expected output. - # So, mount with a context, and they won't be created - # nfs_t is a "liberal" context so we can use it. - if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then - export SELINUX_MOUNT_OPTIONS="-o context=system_u:object_r:nfs_t:s0" - fi } #