Message ID | 159469030110.2914673.4159999275631056215.stgit@magnolia (mailing list archive) |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=oQKh=AZ=vger.kernel.org=linux-xfs-owner@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 20130618 for <patchwork-linux-xfs@patchwork.kernel.org>; Tue, 14 Jul 2020 01:31:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09C1E2192A for <patchwork-linux-xfs@patchwork.kernel.org>; Tue, 14 Jul 2020 01:31:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="XR77sS+f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726456AbgGNBbr (ORCPT <rfc822;patchwork-linux-xfs@patchwork.kernel.org>); Mon, 13 Jul 2020 21:31:47 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:52838 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726149AbgGNBbr (ORCPT <rfc822;linux-xfs@vger.kernel.org>); Mon, 13 Jul 2020 21:31:47 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 06E1RsIW158854; Tue, 14 Jul 2020 01:31:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=lidaS044Cc+NWc2qYUY7R7falR3heXv5JgnC281HlDk=; b=XR77sS+fzTd4YRwlGhuJe3jelovxZYMGawJICt0cUYgN9+7BvZxdHtiHZSuZ8U3Y14co 2AoJegwZVWiuQ2qU5d0oytreDzGbf32tew5uTsF4Y6EHZty98WUAVbbCOqV/Q+KhT9xR ZXgaXzg3djjoCTXSadvSCI4zJ4sM3sJYTrz6z93/7q5pRy1o54bCZVcsZnjrdlzt3wgq 0MfiidwqJbyo3hhVPpbE+m8DRuuoATYqfq0/badzq7Sv5cWJsNFh204s4+Zw9s3fjEYr nnQbxdxGVAqEGRWbJSol8vCqluMUWtatFMI7jahwXbsxK/WfFnGvT5pWF1vMqx0HFBdT ww== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 3275cm2d6v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 14 Jul 2020 01:31:43 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 06E1TY68107106; Tue, 14 Jul 2020 01:31:43 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3020.oracle.com with ESMTP id 327q6r59sb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Jul 2020 01:31:42 +0000 Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 06E1Vfg6013351; Tue, 14 Jul 2020 01:31:41 GMT Received: from localhost (/10.159.128.100) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 13 Jul 2020 18:31:41 -0700 Subject: [PATCH 02/26] xfs: fix inode quota reservation checks From: "Darrick J. Wong" <darrick.wong@oracle.com> To: darrick.wong@oracle.com Cc: Allison Collins <allison.henderson@oracle.com>, Chandan Babu R <chandanrlinux@gmail.com>, Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org Date: Mon, 13 Jul 2020 18:31:41 -0700 Message-ID: <159469030110.2914673.4159999275631056215.stgit@magnolia> In-Reply-To: <159469028734.2914673.17856142063205791176.stgit@magnolia> References: <159469028734.2914673.17856142063205791176.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9681 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=1 phishscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007140008 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9681 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 priorityscore=1501 bulkscore=0 adultscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 impostorscore=0 malwarescore=0 mlxlogscore=999 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007140008 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: <linux-xfs.vger.kernel.org> X-Mailing-List: linux-xfs@vger.kernel.org |
Series |
xfs: remove xfs_disk_quot from incore dquot
|
expand
|
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index c0f73b82c055..ed0ce8b301b4 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -647,7 +647,7 @@ xfs_trans_dqresv( } } if (ninos > 0) { - total_count = be64_to_cpu(dqp->q_core.d_icount) + ninos; + total_count = dqp->q_res_icount + ninos; timer = be32_to_cpu(dqp->q_core.d_itimer); warns = be16_to_cpu(dqp->q_core.d_iwarns); warnlimit = defq->iwarnlimit;