From patchwork Mon Dec 24 07:55:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 208031 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 5B87C2C0092 for ; Mon, 24 Dec 2012 18:42:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673Ab2LXHmW (ORCPT ); Mon, 24 Dec 2012 02:42:22 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:38077 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751954Ab2LXHmU (ORCPT ); Mon, 24 Dec 2012 02:42:20 -0500 Received: by mail-pa0-f47.google.com with SMTP id fa10so3931302pad.20 for ; Sun, 23 Dec 2012 23:42:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=wlXs/zRkOXqn2p3+ocQV0sutzuE3/5BFSnte2brBRQI=; b=j8tLNBKsdribXiRA7GRnfZJajq8ZRB8Gx70qtBUHzqrzo/Q0G40z72xwNCXTDrKqGv XVALc8DTQ/vW78Clfg/WhKGOPMF8Z00S3xUmUlCTXC/Xgablp78u2MFji15sNcsy0mut 3hZBMuWlothIAaMNlUNA2s2aBAPm8TsneFRPnpkpEajKjfPZ89XjMvoU7a6i7kB5tYgN j7jkK4EOr+fXE5Rmhuh32h9q8b04VRy/C6ZPdAj04buVvnhR0GcJTlOXqf+fX8LWQb88 pzPF1MGFpXro2/Nuawop82nXNj/B8XC8RPg1zqskrYEpPFo5RSWWPOBpItW9EWxb8Ugc IMXw== X-Received: by 10.68.136.163 with SMTP id qb3mr64408242pbb.129.1356334940177; Sun, 23 Dec 2012 23:42:20 -0800 (PST) Received: from lz-desktop.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPS id u1sm12392909pav.16.2012.12.23.23.42.18 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 23:42:19 -0800 (PST) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [RFC][PATCH 1/9 v1] ext4: fixup metadata reserve block warning when bigalloc and delalloc are enabled Date: Mon, 24 Dec 2012 15:55:34 +0800 Message-Id: <1356335742-11793-2-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: <1356335742-11793-1-git-send-email-wenqing.lz@taobao.com> References: <1356335742-11793-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu When bigalloc and delalloc are enabled, some stress tests (e.g. xfstest #13) will trigger this warning because all metadata reserved spaces will be released after dirty pages are written out. But we still needs to allocate one block, such as growing the extent tree. So *DO NOT* release these metadata blocks when bigalloc and delaloc are enabled. Signed-off-by: Zheng Liu --- fs/ext4/inode.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index cb1c1ab..91542be 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -375,10 +375,16 @@ void ext4_da_update_reserve_space(struct inode *inode, * We can release all of the reserved metadata blocks * only when we have written all of the delayed * allocation blocks. + * When bigalloc and delalloc are enabled, we couldn't release + * all of reserved metadata blocks, although all delay blocks + * are written out, because it still has some metadata blocks + * which are allocated. */ - percpu_counter_sub(&sbi->s_dirtyclusters_counter, - ei->i_reserved_meta_blocks); - ei->i_reserved_meta_blocks = 0; + if (sbi->s_cluster_ratio == 1) { + percpu_counter_sub(&sbi->s_dirtyclusters_counter, + ei->i_reserved_meta_blocks); + ei->i_reserved_meta_blocks = 0; + } ei->i_da_metadata_calc_len = 0; } spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);