From patchwork Wed Feb 17 10:23:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 8336001 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B8AF29F2F0 for ; Wed, 17 Feb 2016 10:23:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A1C020320 for ; Wed, 17 Feb 2016 10:23:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E13B202E9 for ; Wed, 17 Feb 2016 10:23:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964942AbcBQKX1 (ORCPT ); Wed, 17 Feb 2016 05:23:27 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:56672 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964947AbcBQKXX (ORCPT ); Wed, 17 Feb 2016 05:23:23 -0500 Received: from hch by bombadil.infradead.org with local (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVzGV-0004Ts-F8 for fstests@vger.kernel.org; Wed, 17 Feb 2016 10:23:23 +0000 Date: Wed, 17 Feb 2016 02:23:23 -0800 From: Christoph Hellwig To: fstests@vger.kernel.org Subject: [PATCH] fix _require_fs_space on remote file systems Message-ID: <20160217102323.GA14703@infradead.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the -l flag to df so that it works properly on NFS and co. This fixes various failures in new COW tests on NFS. Signed-off-by: Christoph Hellwig --- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/common/rc b/common/rc index 6abd52d..c91a2f0 100644 --- a/common/rc +++ b/common/rc @@ -1906,7 +1906,7 @@ _require_fs_space() BLOCKS=$2 # in units of 1024 let GB=$BLOCKS/1024/1024 - FREE_BLOCKS=`df -klP $MNT | grep -v Filesystem | awk '{print $4}'` + FREE_BLOCKS=`df -kP $MNT | grep -v Filesystem | awk '{print $4}'` [ $FREE_BLOCKS -lt $BLOCKS ] && \ _notrun "This test requires at least ${GB}GB free on $MNT to run" }