Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3778662pxv; Mon, 19 Jul 2021 08:32:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCFZbnQjbloytZ6BHORdoIriIplQOxxVvU6YyfbgMh4wNnXcHC9/PINhqGnh/HGTGqO/zd X-Received: by 2002:a05:6402:1d01:: with SMTP id dg1mr34711514edb.29.1626708739628; Mon, 19 Jul 2021 08:32:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708739; cv=none; d=google.com; s=arc-20160816; b=ZKH1pTaYqZFYM44ZtFGeLAfQ5bLuOGfsAJ3Ceyw/Od7o9Ej6pGwcPVdB9rnTlg3dke 49drxfb3duML7mvpDhO3fJIi5whCj5MUIt6KMDdsDIPKIkjisxZsXahBFR5o5mhgqZ0O 46QLm6KBbI6NKM2xMRh2b+NE9EGvvFloV3SYXIwGowG0Zz8O2jthaKiSj66NnBhIk7aO DhhDeEbjUTBj6oSyOPchtFYeEpwcGwWtQL9zE0GOdZaTDZvfFgVLSlJZFE5QDeSjntlc HHbucCBYJelTB2VRd34T+VM6VxSrjRjnE4MG+4ai21/1qa52DNcUrzUXRIvdkxx/7COC XWRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qSGND9HKtpcURiN5TWBPbs0OcghS3Ij4OlgrHpyYi+I=; b=L/sLmXpj8pcv8fD5djspg1UF4vF1vYCA1aQAyF6J3pW8rT8G9mnCtJp3KaWL+OrfvA ojfAZlrIcQK2HoH4wqY0MCbKMJTdOqdTydFyAahY0vfkRRXAAR8DpoS/LAtqWHgyMbc3 uhGQ6SfNYkzuhslQljDF3/Lk2XUONMm4+d/xi879MHBBwXMaCNbQqn43M0MyZM1EIk62 rUm8bCWOlBujh+pQYgZ8bI+OUqfJJJ/09Rng6b4TZo8HDg8Zc0eCECltBEgh0pOIjfDo M2mdcwSqksldb9sHc8IrZr85yVYO5FidzHUQB7kozu13GB0FPBE5pDhcgmKaAKEuGUec dzfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="hrv/Qlaw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w7si519511edd.27.2021.07.19.08.31.57; Mon, 19 Jul 2021 08:32:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="hrv/Qlaw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238736AbhGSOuC (ORCPT + 99 others); Mon, 19 Jul 2021 10:50:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:47024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245536AbhGSOen (ORCPT ); Mon, 19 Jul 2021 10:34:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B4386128E; Mon, 19 Jul 2021 15:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707652; bh=cgQeWa6VY+L9UnqvCofy0cc87uTZTbvmtNzBafYrQEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hrv/QlawUh4qdsbAAr/timFCdm2DL56WjGH2byshdh/HDen+ldunalB8vlmlWeRj8 MNDdsxT9uHPwkNvGrZY5Mmgkp+R1DMFPKughZiBrV24yzr+vLLzCUYseLArUB+c1TO cJg57ivWXtBuS2cDzxzrLTB9gbH9J10cqWtTGl/E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mike Marshall , Sasha Levin Subject: [PATCH 4.9 216/245] orangefs: fix orangefs df output. Date: Mon, 19 Jul 2021 16:52:38 +0200 Message-Id: <20210719144947.370813955@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.288257948@linuxfoundation.org> References: <20210719144940.288257948@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Marshall [ Upstream commit 0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83 ] Orangefs df output is whacky. Walt Ligon suggested this might fix it. It seems way more in line with reality now... Signed-off-by: Mike Marshall Signed-off-by: Sasha Levin --- fs/orangefs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 6e35ef6521b4..8972ebc87016 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -185,7 +185,7 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_bavail = (sector_t) new_op->downcall.resp.statfs.blocks_avail; buf->f_files = (sector_t) new_op->downcall.resp.statfs.files_total; buf->f_ffree = (sector_t) new_op->downcall.resp.statfs.files_avail; - buf->f_frsize = sb->s_blocksize; + buf->f_frsize = 0; out_op_release: op_release(new_op); -- 2.30.2