From patchwork Fri Feb 2 10:40:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 868547 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru header.b="AGFxs/hZ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zXtwt5VLKz9s72 for ; Fri, 2 Feb 2018 21:47:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751581AbeBBKrl (ORCPT ); Fri, 2 Feb 2018 05:47:41 -0500 Received: from forwardcorp1j.cmail.yandex.net ([5.255.227.105]:50424 "EHLO forwardcorp1j.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbeBBKrk (ORCPT ); Fri, 2 Feb 2018 05:47:40 -0500 X-Greylist: delayed 449 seconds by postgrey-1.27 at vger.kernel.org; Fri, 02 Feb 2018 05:47:40 EST Received: from smtpcorp1o.mail.yandex.net (smtpcorp1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::30]) by forwardcorp1j.cmail.yandex.net (Yandex) with ESMTP id 752F520EC5; Fri, 2 Feb 2018 13:40:09 +0300 (MSK) Received: from smtpcorp1o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtpcorp1o.mail.yandex.net (Yandex) with ESMTP id 6E6D42440C73; Fri, 2 Feb 2018 13:40:09 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:460:b4b7:f0f3:4b10:5639]) by smtpcorp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id G8fNGHu00W-e9GeRSZP; Fri, 02 Feb 2018 13:40:09 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1517568009; bh=SACxo+WojMozBdqoPPybCMba7Htpxnc902s1/9mkRjA=; h=Subject:From:To:Cc:Date:Message-ID; b=AGFxs/hZ8UIW6IuMvWMjM03BBTCKDqftIPu9/z16RJSyvjJ2ZGDB4YtU+S3YCIFPr DtoYxrIPSKBZ9x3+3/n7jBxzvh3xC/mB3eyi3BQApWOQltX6q7lpdaQf1BI1h93I+w 38rUUH2P9n1N1zS7WSQB8SE3uZBQ6Q08yDK5z22c= Authentication-Results: smtpcorp1o.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] ext4: report delalloc reserve as non-free in statfs mangled by project quota From: Konstantin Khlebnikov To: Andreas Dilger , linux-ext4@vger.kernel.org, Theodore Ts'o , linux-kernel@vger.kernel.org Cc: Dmitry Monakhov , Li Xi , Jan Kara Date: Fri, 02 Feb 2018 13:40:05 +0300 Message-ID: <151756800585.979296.13086151972011935611.stgit@buzz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This reserved space isn't committed yet but cannot be used for allocations. For userspace it has no difference from used space. XFS already does this. Signed-off-by: Konstantin Khlebnikov Fixes: 689c958cbe6b ("ext4: add project quota support") Reviewed-by: Jan Kara --- fs/ext4/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 5de959fb0244..13ce97b9e820 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5227,7 +5227,8 @@ static int ext4_statfs_project(struct super_block *sb, dquot->dq_dqb.dqb_bsoftlimit : dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits; if (limit && buf->f_blocks > limit) { - curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits; + curblock = (dquot->dq_dqb.dqb_curspace + + dquot->dq_dqb.dqb_rsvspace) >> sb->s_blocksize_bits; buf->f_blocks = limit; buf->f_bfree = buf->f_bavail = (buf->f_blocks > curblock) ?