From patchwork Wed Aug 13 13:37:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chintzung cheng X-Patchwork-Id: 379642 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E9794140085 for ; Wed, 13 Aug 2014 23:38:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752547AbaHMNhk (ORCPT ); Wed, 13 Aug 2014 09:37:40 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:41493 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963AbaHMNhk (ORCPT ); Wed, 13 Aug 2014 09:37:40 -0400 Received: by mail-pd0-f174.google.com with SMTP id fp1so14547505pdb.33 for ; Wed, 13 Aug 2014 06:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=1ydoY6iAnMMcuqoaNScBNTQZ5WQMBDUdk1VA787QTGM=; b=x1psrlIQlXamb7p0+jcSCjqvAGM3hsce2wiGnwONLiJ0xX1Z3jBlrat5NYzapBiL+L P9yFN3JfmbuQj2rlTxpcRoIXWFPJCMCDCLVrV5DhaX5VR+S/D6qRYFJAkaLngHfhdBZQ q9N0yZrpIfC1SvuCN7PTrRVJbHZJV6BcIvXRvxdfzwHzB+0sa6hNT7mLqdVD0Nz7UoCm jeKODdTzgmxRXjL65Xjde2SuIjZa3pir3w6basHqD+pBjD0CWHF2YZxJPpnPKf33JrZJ YgkD9Bp6jY4rTuAo4weqKE+8tTXkp8vPyVlYeIKSJ1urTfH1XJPa/pDohEL2UPZ6uaKZ bK2w== X-Received: by 10.66.182.10 with SMTP id ea10mr4035642pac.123.1407937059555; Wed, 13 Aug 2014 06:37:39 -0700 (PDT) Received: from localhost.localdomain ([202.39.79.13]) by mx.google.com with ESMTPSA id x10sm3168815pdp.24.2014.08.13.06.37.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Aug 2014 06:37:38 -0700 (PDT) From: Chin-Tsung Cheng To: tytso@mit.edu Cc: adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, Chin-Tsung Cheng Subject: [PATCH] ext4: include journal blocks of internal journal in df overhead calcs Date: Wed, 13 Aug 2014 21:37:23 +0800 Message-Id: <1407937043-23186-1-git-send-email-chintzung@gmail.com> X-Mailer: git-send-email 1.9.3 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org The journal blocks of external journal device should not be counted as overhead. Signed-off-by: Chin-Tsung Cheng --- fs/ext4/super.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 32b43ad..03b2f62 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3316,9 +3316,10 @@ int ext4_calculate_overhead(struct super_block *sb) memset(buf, 0, PAGE_SIZE); cond_resched(); } - /* Add the journal blocks as well */ - if (sbi->s_journal) - overhead += EXT4_NUM_B2C(sbi, sbi->s_journal->j_maxlen); + /* Add the internal journal blocks as well */ + if ((sbi->s_journal) && + (sbi->s_journal->j_fs_dev == sbi->s_journal->j_dev)) + overhead += EXT4_NUM_B2C(sbi, sbi->s_journal->j_maxlen); sbi->s_overhead = overhead; smp_wmb();