From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: Re: [PATCH 5/8] dquot: move dquot drop responsibiliy into the filesystem Date: Thu, 25 Feb 2010 01:00:34 +0100 Message-ID: <20100225000033.GF3097@quack.suse.cz> References: <20100220115101.469826792@bombadil.infradead.org> <20100220115213.475518279@bombadil.infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: jack@suse.cz, linux-fsdevel@vger.kernel.org To: Christoph Hellwig Return-path: Received: from cantor2.suse.de ([195.135.220.15]:36427 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758636Ab0BYAA0 (ORCPT ); Wed, 24 Feb 2010 19:00:26 -0500 Content-Disposition: inline In-Reply-To: <20100220115213.475518279@bombadil.infradead.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Sat 20-02-10 06:51:06, Christoph Hellwig wrote: > Currently clear_inode calls vfs_dq_drop directly. This means > we tie the quota code into the VFS. Get rid of that and make the > filesystem responsibly for the drop inside the ->clear_inode > superblock operation. > > Signed-off-by: Christoph Hellwig Looks good. Merged. Honza > > Index: linux-2.6/fs/ext2/super.c > =================================================================== > --- linux-2.6.orig/fs/ext2/super.c 2010-02-19 00:34:37.825004031 +0100 > +++ linux-2.6/fs/ext2/super.c 2010-02-19 00:36:12.220253508 +0100 > @@ -194,6 +194,8 @@ static void destroy_inodecache(void) > static void ext2_clear_inode(struct inode *inode) > { > struct ext2_block_alloc_info *rsv = EXT2_I(inode)->i_block_alloc_info; > + > + vfs_dq_drop(inode); > ext2_discard_reservation(inode); > EXT2_I(inode)->i_block_alloc_info = NULL; > if (unlikely(rsv)) > Index: linux-2.6/fs/ext3/super.c > =================================================================== > --- linux-2.6.orig/fs/ext3/super.c 2010-02-19 00:36:11.342272784 +0100 > +++ linux-2.6/fs/ext3/super.c 2010-02-19 00:37:51.823255463 +0100 > @@ -528,6 +528,8 @@ static void destroy_inodecache(void) > static void ext3_clear_inode(struct inode *inode) > { > struct ext3_block_alloc_info *rsv = EXT3_I(inode)->i_block_alloc_info; > + > + vfs_dq_drop(inode); > ext3_discard_reservation(inode); > EXT3_I(inode)->i_block_alloc_info = NULL; > if (unlikely(rsv)) > Index: linux-2.6/fs/ext4/super.c > =================================================================== > --- linux-2.6.orig/fs/ext4/super.c 2010-02-19 00:36:11.349253577 +0100 > +++ linux-2.6/fs/ext4/super.c 2010-02-19 00:37:56.031005358 +0100 > @@ -761,6 +761,7 @@ static void destroy_inodecache(void) > > static void ext4_clear_inode(struct inode *inode) > { > + vfs_dq_drop(inode); > ext4_discard_preallocations(inode); > if (EXT4_JOURNAL(inode)) > jbd2_journal_release_jbd_inode(EXT4_SB(inode->i_sb)->s_journal, > Index: linux-2.6/fs/inode.c > =================================================================== > --- linux-2.6.orig/fs/inode.c 2010-02-19 00:34:37.871003961 +0100 > +++ linux-2.6/fs/inode.c 2010-02-19 00:36:12.241255672 +0100 > @@ -314,7 +314,6 @@ void clear_inode(struct inode *inode) > BUG_ON(!(inode->i_state & I_FREEING)); > BUG_ON(inode->i_state & I_CLEAR); > inode_sync_wait(inode); > - vfs_dq_drop(inode); > if (inode->i_sb->s_op->clear_inode) > inode->i_sb->s_op->clear_inode(inode); > if (S_ISBLK(inode->i_mode) && inode->i_bdev) > Index: linux-2.6/fs/jfs/super.c > =================================================================== > --- linux-2.6.orig/fs/jfs/super.c 2010-02-19 00:34:37.880003612 +0100 > +++ linux-2.6/fs/jfs/super.c 2010-02-19 00:36:12.253005987 +0100 > @@ -131,6 +131,11 @@ static void jfs_destroy_inode(struct ino > kmem_cache_free(jfs_inode_cachep, ji); > } > > +static void jfs_clear_inode(struct inode *inode) > +{ > + vfs_dq_drop(inode); > +} > + > static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf) > { > struct jfs_sb_info *sbi = JFS_SBI(dentry->d_sb); > @@ -745,6 +750,7 @@ static const struct super_operations jfs > .dirty_inode = jfs_dirty_inode, > .write_inode = jfs_write_inode, > .delete_inode = jfs_delete_inode, > + .clear_inode = jfs_clear_inode, > .put_super = jfs_put_super, > .sync_fs = jfs_sync_fs, > .freeze_fs = jfs_freeze, > Index: linux-2.6/fs/ocfs2/inode.c > =================================================================== > --- linux-2.6.orig/fs/ocfs2/inode.c 2010-02-19 00:36:09.946254765 +0100 > +++ linux-2.6/fs/ocfs2/inode.c 2010-02-19 00:36:12.260023517 +0100 > @@ -1087,6 +1087,8 @@ void ocfs2_clear_inode(struct inode *ino > mlog_bug_on_msg(OCFS2_SB(inode->i_sb) == NULL, > "Inode=%lu\n", inode->i_ino); > > + vfs_dq_drop(inode); > + > /* To preven remote deletes we hold open lock before, now it > * is time to unlock PR and EX open locks. */ > ocfs2_open_unlock(inode); > Index: linux-2.6/fs/reiserfs/super.c > =================================================================== > --- linux-2.6.orig/fs/reiserfs/super.c 2010-02-19 00:36:11.387274530 +0100 > +++ linux-2.6/fs/reiserfs/super.c 2010-02-19 00:38:03.698255045 +0100 > @@ -578,6 +578,11 @@ out: > reiserfs_write_unlock_once(inode->i_sb, lock_depth); > } > > +static void reiserfs_clear_inode(struct inode *inode) > +{ > + vfs_dq_drop(inode); > +} > + > #ifdef CONFIG_QUOTA > static ssize_t reiserfs_quota_write(struct super_block *, int, const char *, > size_t, loff_t); > @@ -590,6 +595,7 @@ static const struct super_operations rei > .destroy_inode = reiserfs_destroy_inode, > .write_inode = reiserfs_write_inode, > .dirty_inode = reiserfs_dirty_inode, > + .clear_inode = reiserfs_clear_inode, > .delete_inode = reiserfs_delete_inode, > .put_super = reiserfs_put_super, > .write_super = reiserfs_write_super, > Index: linux-2.6/fs/ufs/super.c > =================================================================== > --- linux-2.6.orig/fs/ufs/super.c 2010-02-19 00:34:37.940003822 +0100 > +++ linux-2.6/fs/ufs/super.c 2010-02-19 00:36:12.284254834 +0100 > @@ -1432,6 +1432,11 @@ static void destroy_inodecache(void) > kmem_cache_destroy(ufs_inode_cachep); > } > > +static void ufs_clear_inode(struct inode *inode) > +{ > + vfs_dq_drop(inode); > +} > + > #ifdef CONFIG_QUOTA > static ssize_t ufs_quota_read(struct super_block *, int, char *,size_t, loff_t); > static ssize_t ufs_quota_write(struct super_block *, int, const char *, size_t, loff_t); > @@ -1442,6 +1447,7 @@ static const struct super_operations ufs > .destroy_inode = ufs_destroy_inode, > .write_inode = ufs_write_inode, > .delete_inode = ufs_delete_inode, > + .clear_inode = ufs_clear_inode, > .put_super = ufs_put_super, > .write_super = ufs_write_super, > .sync_fs = ufs_sync_fs, > -- Jan Kara SUSE Labs, CR