From patchwork Wed May 30 14:59:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "jeff.liu" X-Patchwork-Id: 162001 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 D758DB704F for ; Thu, 31 May 2012 01:08:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754266Ab2E3PIK (ORCPT ); Wed, 30 May 2012 11:08:10 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:41770 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754206Ab2E3PIJ (ORCPT ); Wed, 30 May 2012 11:08:09 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q4UF6vpH000495 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 May 2012 15:06:58 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q4UF6u1v009429 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 May 2012 15:06:57 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q4UF6ujE015433; Wed, 30 May 2012 10:06:56 -0500 Received: from localhost.localdomain (/123.119.107.100) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 30 May 2012 08:06:55 -0700 From: jeff.liu@oracle.com To: containers@lists.linux-foundation.org Cc: cgroups@vger.kernel.org, jack@suse.cz, glommer@parallels.com, daniel.lezcano@free.fr, tytso@mit.edu, bpm@sgi.com, chris.mason@oracle.com, hch@infradead.org, christopher.jones@oracle.com, david@fromorbit.com, tinguely@sgi.com, tm@tao.ma, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, Jie Liu Subject: [PATCH 10/12] container quota: bill container inodes alloc/free on ext4. Date: Wed, 30 May 2012 22:59:04 +0800 Message-Id: <1338389946-13711-11-git-send-email-jeff.liu@oracle.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1338389946-13711-1-git-send-email-jeff.liu@oracle.com> References: <1338389946-13711-1-git-send-email-jeff.liu@oracle.com> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Bill up container inodes allocation and free on ext4. Signed-off-by: Jie Liu --- fs/ext4/ialloc.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 9f9acac..510fa41 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -31,6 +31,8 @@ #include +#include "../ns_quotaops.h" + /* * ialloc.c contains the inodes allocation and deallocation routines */ @@ -233,6 +235,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode) dquot_initialize(inode); ext4_xattr_delete_inode(handle, inode); dquot_free_inode(inode); + ns_dquot_free_inode(inode); dquot_drop(inode); is_directory = S_ISDIR(inode->i_mode); @@ -861,6 +864,10 @@ got: if (err) goto fail_drop; + err = ns_dquot_alloc_inode(inode); + if (err) + goto fail_drop; + err = ext4_init_acl(handle, inode, dir); if (err) goto fail_free_drop; @@ -902,6 +909,7 @@ really_out: fail_free_drop: dquot_free_inode(inode); + ns_dquot_free_inode(inode); fail_drop: dquot_drop(inode);