Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp982843ybt; Wed, 17 Jun 2020 19:53:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYIC8lLr4o4szQBj1GhGwWNgDLT/NLOai213aouJIJ/4eLzwbvsuqhlI5OflTal2odl1gG X-Received: by 2002:a17:906:2304:: with SMTP id l4mr1981755eja.104.1592448826143; Wed, 17 Jun 2020 19:53:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448826; cv=none; d=google.com; s=arc-20160816; b=mkN9ebJhEXWUAAYrAZS9mntfaWymNBN85iT0S/rJdK5MSoOf61jiMJo982YOXaCwak XqUVDKdjYzLJpeorX+LaItAqPA4+ot6gjt/mgDpsNlqlD/UpNbvc9ftQajdvmPZmmlWP pyvm0XnnGZs0te+T7qF4mdz7mSX2RSm8th3EwWw+hEqJCpfWXNLZeiYR2CA1rIM+igLt MBhDXpK4+altKrZ1Ic+wvJyEhdh1i1YIW9uFF4DGoYpRHhUGrLACQBelm5Ap2+EMrqAd n9S9pWI38XQ6gExqGkKCZaLNg31hRSLu4iYAf23R0IWItirUlSnBYtETJWBQMF40lmOT Xnsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YX0+EyvzS0HPB0nX1PA7XmwYKhluB26e1CnepWsUJZs=; b=L1kbmn3q4Kh2azbWeKa4uoFaBFftg1y6TMcekgTHaKHiwj90r9AtJWvVfNfe+bO1hK 99JUuc+HsUpneTXqFpblg8jhGp9nwa96rqW/rbZhjjRW8tGnIWUdPMmPPVTkq7jjsHMX TO2Q/2bFjdbbv19SlARMX6gp2LYsj6sBnTP8XR69u7bsy7ja5AUF9DHsOb1ZPmAc2GNc OwEdgv88i8Rp4Dv9tqxfQFz4tNiD3iv3vs9VLZ+gi+wTga4UyYuxkhj5EMSjvugxYhh8 gFiB8hUBWTlI87io9QQ59TnFemzTCTkYwAjMIF5ogNhJx+eg4LemMdxBhspkoQSkHxNT mBkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qLVmMrDV; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id by19si1088509ejb.216.2020.06.17.19.53.24; Wed, 17 Jun 2020 19:53:46 -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=@kernel.org header.s=default header.b=qLVmMrDV; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387721AbgFRCvr (ORCPT + 99 others); Wed, 17 Jun 2020 22:51:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:34910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727884AbgFRBIy (ORCPT ); Wed, 17 Jun 2020 21:08:54 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0D8E721D7A; Thu, 18 Jun 2020 01:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442533; bh=3nkSWgAAPcJChv3MakksNPZN+UPpc4ypgp0uwpNGb5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qLVmMrDVP/M2tb2i+qV4wKgGY769x3RjaabNWibOX1SbPeev9hyh8G688TxP7A82X Ib9IULJw3I687icBR9W5YxfD/bzkzk0rgE++BjkLCP1roEF0w5qk1e6L8QEUnveF8u WbTB9ivPQmmWsKE3vWgKVLfICnaRzAyNWxiyVq4Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konstantin Khlebnikov , Chao Yu , Jaegeuk Kim , Sasha Levin , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH AUTOSEL 5.7 036/388] f2fs: report delalloc reserve as non-free in statfs for project quota Date: Wed, 17 Jun 2020 21:02:13 -0400 Message-Id: <20200618010805.600873-36-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Konstantin Khlebnikov [ Upstream commit baaa7ebf25c78c5cb712fac16b7f549100beddd3 ] This reserved space isn't committed yet but cannot be used for allocations. For userspace it has no difference from used space. See the same fix in ext4 commit f06925c73942 ("ext4: report delalloc reserve as non-free in statfs for project quota"). Fixes: ddc34e328d06 ("f2fs: introduce f2fs_statfs_project") Signed-off-by: Konstantin Khlebnikov Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index f2dfc21c6abb..c5e8cb31626f 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1292,7 +1292,8 @@ static int f2fs_statfs_project(struct super_block *sb, limit >>= 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) ? -- 2.25.1