Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 257ba15c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara
Browse files

dquot: move dquot drop responsibility into the filesystem 



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 responsible for the drop inside the ->clear_inode
superblock operation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent b43fa828

fs/ext2/super.c

+2 −0
Original line number Diff line number Diff line
@@ -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))

fs/ext3/super.c

+2 −0
Original line number Diff line number Diff line
@@ -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))

fs/ext4/super.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

fs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

fs/jfs/super.c

+6 −0
Original line number Diff line number Diff line
@@ -131,6 +131,11 @@ static void jfs_destroy_inode(struct inode *inode) 
	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_super_operations = { 
	.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,