Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761119AbZATWC3 (ORCPT ); Tue, 20 Jan 2009 17:02:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756962AbZATWB4 (ORCPT ); Tue, 20 Jan 2009 17:01:56 -0500 Received: from e35.co.us.ibm.com ([32.97.110.153]:49529 "EHLO e35.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755934AbZATWBx (ORCPT ); Tue, 20 Jan 2009 17:01:53 -0500 Subject: Re: [PATCH 10/11] ext4: Remove unnecessary quota functions From: Mingming Cao To: Jan Kara Cc: linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org In-Reply-To: <1232129299-22018-11-git-send-email-jack@suse.cz> References: <1232129299-22018-1-git-send-email-jack@suse.cz> <1232129299-22018-2-git-send-email-jack@suse.cz> <1232129299-22018-3-git-send-email-jack@suse.cz> <1232129299-22018-4-git-send-email-jack@suse.cz> <1232129299-22018-5-git-send-email-jack@suse.cz> <1232129299-22018-6-git-send-email-jack@suse.cz> <1232129299-22018-7-git-send-email-jack@suse.cz> <1232129299-22018-8-git-send-email-jack@suse.cz> <1232129299-22018-9-git-send-email-jack@suse.cz> <1232129299-22018-10-git-send-email-jack@suse.cz> <1232129299-22018-11-git-send-email-jack@suse.cz> Content-Type: text/plain; charset=UTF-8 Organization: IBM Date: Tue, 20 Jan 2009 13:41:54 -0800 Message-Id: <1232487714.6464.15.camel@mingming-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3023 Lines: 87 在 2009-01-16五的 19:08 +0100,Jan Kara写道: > ext4_dquot_initialize() and ext4_dquot_drop() is no longer > needed because of modified quota locking. > > Signed-off-by: Jan Kara Reviewed_by: Mingming Cao > --- > fs/ext4/super.c | 44 ++------------------------------------------ > 1 files changed, 2 insertions(+), 42 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index e5f06a5..f0785fd 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -926,8 +926,6 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page, gfp_ > #define QTYPE2NAME(t) ((t) == USRQUOTA ? "user" : "group") > #define QTYPE2MOPT(on, t) ((t) == USRQUOTA?((on)##USRJQUOTA):((on)##GRPJQUOTA)) > > -static int ext4_dquot_initialize(struct inode *inode, int type); > -static int ext4_dquot_drop(struct inode *inode); > static int ext4_write_dquot(struct dquot *dquot); > static int ext4_acquire_dquot(struct dquot *dquot); > static int ext4_release_dquot(struct dquot *dquot); > @@ -942,8 +940,8 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type, > const char *data, size_t len, loff_t off); > > static struct dquot_operations ext4_quota_operations = { > - .initialize = ext4_dquot_initialize, > - .drop = ext4_dquot_drop, > + .initialize = dquot_initialize, > + .drop = dquot_drop, > .alloc_space = dquot_alloc_space, > .alloc_inode = dquot_alloc_inode, > .free_space = dquot_free_space, > @@ -3378,44 +3376,6 @@ static inline struct inode *dquot_to_inode(struct dquot *dquot) > return sb_dqopt(dquot->dq_sb)->files[dquot->dq_type]; > } > > -static int ext4_dquot_initialize(struct inode *inode, int type) > -{ > - handle_t *handle; > - int ret, err; > - > - /* We may create quota structure so we need to reserve enough blocks */ > - handle = ext4_journal_start(inode, 2*EXT4_QUOTA_INIT_BLOCKS(inode->i_sb)); > - if (IS_ERR(handle)) > - return PTR_ERR(handle); > - ret = dquot_initialize(inode, type); > - err = ext4_journal_stop(handle); > - if (!ret) > - ret = err; > - return ret; > -} > - > -static int ext4_dquot_drop(struct inode *inode) > -{ > - handle_t *handle; > - int ret, err; > - > - /* We may delete quota structure so we need to reserve enough blocks */ > - handle = ext4_journal_start(inode, 2*EXT4_QUOTA_DEL_BLOCKS(inode->i_sb)); > - if (IS_ERR(handle)) { > - /* > - * We call dquot_drop() anyway to at least release references > - * to quota structures so that umount does not hang. > - */ > - dquot_drop(inode); > - return PTR_ERR(handle); > - } > - ret = dquot_drop(inode); > - err = ext4_journal_stop(handle); > - if (!ret) > - ret = err; > - return ret; > -} > - > static int ext4_write_dquot(struct dquot *dquot) > { > int ret, err; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/