From patchwork Sat Jul 23 00:02:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 1001412 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6N08HNr032329 for ; Sat, 23 Jul 2011 00:16:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751418Ab1GWAGC (ORCPT ); Fri, 22 Jul 2011 20:06:02 -0400 Received: from cobra.newdream.net ([66.33.216.30]:44313 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754003Ab1GWAFx (ORCPT ); Fri, 22 Jul 2011 20:05:53 -0400 Received: from localhost.localdomain (ip-64-111-111-107.dreamhost.com [64.111.111.107]) by cobra.newdream.net (Postfix) with ESMTPA id D4577BC964; Fri, 22 Jul 2011 17:09:36 -0700 (PDT) From: Sage Weil To: ceph-devel@vger.kernel.org Cc: Greg Farnum Subject: [PATCH 06/23] ceph: report f_bfree based on kb_avail rather than diffing. Date: Fri, 22 Jul 2011 17:02:45 -0700 Message-Id: <1311379382-9218-7-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1311379382-9218-1-git-send-email-sage@newdream.net> References: <1311379382-9218-1-git-send-email-sage@newdream.net> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 23 Jul 2011 00:16:10 +0000 (UTC) From: Greg Farnum Signed-off-by: Greg Farnum --- fs/ceph/super.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fs/ceph/super.c b/fs/ceph/super.c index f2f77fd..d4757c9 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -73,8 +73,7 @@ static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf) */ buf->f_bsize = 1 << CEPH_BLOCK_SHIFT; buf->f_blocks = le64_to_cpu(st.kb) >> (CEPH_BLOCK_SHIFT-10); - buf->f_bfree = (le64_to_cpu(st.kb) - le64_to_cpu(st.kb_used)) >> - (CEPH_BLOCK_SHIFT-10); + buf->f_bfree = le64_to_cpu(st.kb_avail) >> (CEPH_BLOCK_SHIFT-10); buf->f_bavail = le64_to_cpu(st.kb_avail) >> (CEPH_BLOCK_SHIFT-10); buf->f_files = le64_to_cpu(st.num_objects);