From patchwork Thu Nov 6 23:51:16 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 7621 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 99BB7DDE1A for ; Fri, 7 Nov 2008 10:51:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752735AbYKFXvZ (ORCPT ); Thu, 6 Nov 2008 18:51:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752763AbYKFXvZ (ORCPT ); Thu, 6 Nov 2008 18:51:25 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:49173 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754244AbYKFXvW (ORCPT ); Thu, 6 Nov 2008 18:51:22 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id mA6NpGoI015848 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 6 Nov 2008 15:51:17 -0800 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id mA6NpGo7030202; Thu, 6 Nov 2008 15:51:16 -0800 Message-Id: <200811062351.mA6NpGo7030202@imap1.linux-foundation.org> Subject: - quota-add-quota-claim-and-release-reserved-quota-blocks-operations.patch removed from -mm tree To: cmm@us.ibm.com, jack@ucw.cz, linux-ext4@vger.kernel.org, mm-commits@vger.kernel.org From: akpm@linux-foundation.org Date: Thu, 06 Nov 2008 15:51:16 -0800 X-Spam-Status: No, hits=-2.873 required=5 tests=AWL,BAYES_00 X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org The patch titled quota: add quota claim and release reserved quota blocks operations has been removed from the -mm tree. Its filename was quota-add-quota-claim-and-release-reserved-quota-blocks-operations.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: quota: add quota claim and release reserved quota blocks operations From: Mingming Cao The reserved quota will be claimed at block allocation time. Any over-booked quota is returned back with the release callback function. Signed-off-by: Mingming Cao Cc: Jan Kara Cc: Signed-off-by: Andrew Morton --- fs/dquot.c | 85 +++++++++++++++++++++++++++++++++++++ include/linux/quota.h | 2 include/linux/quotaops.h | 53 +++++++++++++++++++++++ 3 files changed, 140 insertions(+) diff -puN fs/dquot.c~quota-add-quota-claim-and-release-reserved-quota-blocks-operations fs/dquot.c --- a/fs/dquot.c~quota-add-quota-claim-and-release-reserved-quota-blocks-operations +++ a/fs/dquot.c @@ -846,6 +846,24 @@ static inline void dquot_resv_space(stru dquot->dq_dqb.dqb_rsvspace += number; } +/* + * Claim reserved quota space + */ +static int dquot_claim_reserved_space(struct dquot *dquot, + qsize_t number) +{ + if (dquot->dq_dqb.dqb_rsvspace < number) { + printk("WARNING: reserved quota %llu is not enough for" + "request %llu bytes\n", + dquot->dq_dqb.dqb_rsvspace, number); + return 1; + } + + dquot->dq_dqb.dqb_curspace += number; + dquot->dq_dqb.dqb_rsvspace -= number; + return 0; +} + static inline void dquot_decr_inodes(struct dquot *dquot, qsize_t number) { if (dquot->dq_dqb.dqb_curinodes > number) @@ -1325,6 +1343,71 @@ int dquot_reserve_space(struct inode *in return ret; } +int dquot_claim_space(struct inode *inode, qsize_t number) +{ + int cnt; + int ret = QUOTA_OK; + + if (IS_NOQUOTA(inode)) { + inode_add_bytes(inode, number); + return ret; + } + + down_read(&sb_dqopt(inode->i_sb)->dqptr_sem); + if (IS_NOQUOTA(inode)) { + up_read(&sb_dqopt(inode->i_sb)->dqptr_sem); + inode_add_bytes(inode, number); + return ret; + } + + /* Claim reserved quotas to allocated quotas */ + for (cnt = 0; cnt < MAXQUOTAS; cnt++) { + if (inode->i_dquot[cnt] != NODQUOT) + ret = dquot_claim_reserved_space(inode->i_dquot[cnt], + number); + } + if (ret == NO_QUOTA) { + up_read(&sb_dqopt(inode->i_sb)->dqptr_sem); + return ret; + } + /* Dirtify all the dquots - this can block when journalling */ + for (cnt = 0; cnt < MAXQUOTAS; cnt++) + if (inode->i_dquot[cnt]) + mark_dquot_dirty(inode->i_dquot[cnt]); + up_read(&sb_dqopt(inode->i_sb)->dqptr_sem); + + /* Update inode bytes */ + inode_add_bytes(inode, number); + return ret; +} + +/* + * Release reserved quota space + */ +void dquot_release_reserved_space(struct inode *inode, qsize_t number) +{ + int cnt; + struct dquot *dquot; + + if (IS_NOQUOTA(inode)) + return; + + down_read(&sb_dqopt(inode->i_sb)->dqptr_sem); + if (IS_NOQUOTA(inode)) { + up_read(&sb_dqopt(inode->i_sb)->dqptr_sem); + return; + } + + /* Release reserved dquots */ + for (cnt = 0; cnt < MAXQUOTAS; cnt++) { + if (inode->i_dquot[cnt] != NODQUOT) { + dquot = inode->i_dquot[cnt]; + dquot->dq_dqb.dqb_rsvspace -= number; + } + } + up_read(&sb_dqopt(inode->i_sb)->dqptr_sem); +} + /* * This operation can block, but only after everything is updated */ @@ -2350,6 +2433,8 @@ EXPORT_SYMBOL(dquot_alloc_inode); EXPORT_SYMBOL(dquot_free_space); EXPORT_SYMBOL(dquot_free_inode); EXPORT_SYMBOL(dquot_reserve_space); +EXPORT_SYMBOL(dquot_claim_space); +EXPORT_SYMBOL(dquot_release_reserved_space); EXPORT_SYMBOL(dquot_transfer); EXPORT_SYMBOL(vfs_dq_transfer); EXPORT_SYMBOL(vfs_dq_quota_on_remount); diff -puN include/linux/quota.h~quota-add-quota-claim-and-release-reserved-quota-blocks-operations include/linux/quota.h --- a/include/linux/quota.h~quota-add-quota-claim-and-release-reserved-quota-blocks-operations +++ a/include/linux/quota.h @@ -293,6 +293,8 @@ struct dquot_operations { int (*mark_dirty) (struct dquot *); /* Dquot is marked dirty */ int (*write_info) (struct super_block *, int); /* Write of quota "superblock" */ int (*reserve_space) (struct inode *, qsize_t, int); /* reserve quota for delayed block allocation */ + int (*claim_space) (struct inode *, qsize_t); /* claim reserved quota for delayed block allocation */ + void (*release_rsv) (struct inode *, qsize_t); /* release reserved quota for delayed block allocation */ }; /* Operations handling requests from userspace */ diff -puN include/linux/quotaops.h~quota-add-quota-claim-and-release-reserved-quota-blocks-operations include/linux/quotaops.h --- a/include/linux/quotaops.h~quota-add-quota-claim-and-release-reserved-quota-blocks-operations +++ a/include/linux/quotaops.h @@ -28,6 +28,11 @@ int dquot_drop(struct inode *inode); int dquot_alloc_space(struct inode *inode, qsize_t number, int prealloc); int dquot_alloc_inode(const struct inode *inode, qsize_t number); +int dquot_reserve_space(struct inode *inode, qsize_t number, int prealloc); +int dquot_claim_space(struct inode *inode, qsize_t number); +void dquot_release_reserved_space(struct inode *inode, qsize_t number); + + int dquot_free_space(struct inode *inode, qsize_t number); int dquot_free_inode(const struct inode *inode, qsize_t number); @@ -196,6 +201,31 @@ static inline int vfs_dq_alloc_inode(str return 0; } +/* + * Convert in-memory reserved quotas to real consumed quotas + */ +static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr) +{ + if (sb_any_quota_active(inode->i_sb)){ + if (inode->i_sb->dq_op->claim_space(inode, nr) == NO_QUOTA) + return 1; + } + else + inode_add_bytes(inode, nr); + + mark_inode_dirty(inode); + return 0; +} + +/* + * Release reserved (in-memory) quotas + */ +static inline void vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr) +{ + if (sb_any_quota_active(inode->i_sb)) + inode->i_sb->dq_op->release_rsv(inode, nr); +} + static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr) { if (sb_any_quota_active(inode->i_sb)) @@ -347,6 +377,16 @@ static inline int vfs_dq_reserve_space(s return 0; } +static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr) +{ + return vfs_dq_alloc_space(inode, nr); +} + +static inline int vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr) +{ + return 0; +} + static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr) { inode_sub_bytes(inode, nr); @@ -391,6 +431,17 @@ static inline int vfs_dq_reserve_block(s nr << inode->i_sb->s_blocksize_bits); } +static inline int vfs_dq_claim_block(struct inode *inode, qsize_t nr) +{ + return vfs_dq_claim_space(inode, + nr << inode->i_sb->s_blocksize_bits); +} + +static inline void vfs_dq_release_reservation(struct inode *inode, qsize_t nr) +{ + vfs_dq_release_reservation_space(inode, nr << inode->i_sb->s_blocksize_bits); +} + static inline void vfs_dq_free_block_nodirty(struct inode *inode, qsize_t nr) { vfs_dq_free_space_nodirty(inode, nr << inode->i_sb->s_blocksize_bits); @@ -420,6 +471,8 @@ static inline void vfs_dq_free_block(str vfs_dq_alloc_block_nodirty(inode, nr) #define DQUOT_ALLOC_BLOCK(inode, nr) vfs_dq_alloc_block(inode, nr) #define DQUOT_RESERVE_BLOCK(inode, nr) vfs_dq_reserve_block(inode, nr) +#define DQUOT_CLAIM_BLOCK(inode, nr) vfs_dq_claim_block(inode, nr) +#define DQUOT_RELEASE_RSV_BLOCK(inode, nr) vfs_dq_release_reservation(inode, nr) #define DQUOT_ALLOC_INODE(inode) vfs_dq_alloc_inode(inode) #define DQUOT_FREE_SPACE_NODIRTY(inode, nr) \ vfs_dq_free_space_nodirty(inode, nr)