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

Commit 9f754758 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara
Browse files

dquot: cleanup dquot drop routine 



Get rid of the drop dquot operation - it is now always called from
the filesystem and if a filesystem really needs it's own (which none
currently does) it can just call into it's own routine directly.

Rename the now static low-level dquot_drop helper to __dquot_drop
and vfs_dq_drop to dquot_drop to have a consistent namespace.

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

Documentation/filesystems/Locking

+0 −2
Original line number Diff line number Diff line
@@ -461,7 +461,6 @@ in sys_read() and friends. 
--------------------------- dquot_operations -------------------------------

prototypes:

	int (*initialize) (struct inode *, int);

	int (*drop) (struct inode *);

	int (*write_dquot) (struct dquot *);

	int (*acquire_dquot) (struct dquot *);

	int (*release_dquot) (struct dquot *);
@@ -475,7 +474,6 @@ What filesystem should expect from the generic quota functions: 


		FS recursion	Held locks when called

initialize:	yes		maybe dqonoff_sem

drop:		yes		-

write_dquot:	yes		dqonoff_sem or dqptr_sem

acquire_dquot:	yes		dqonoff_sem or dqptr_sem

release_dquot:	yes		dqonoff_sem or dqptr_sem

fs/ext2/ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void ext2_free_inode (struct inode * inode) 
		/* Quota is already initialized in iput() */

		ext2_xattr_delete_inode(inode);

		dquot_free_inode(inode);

		vfs_dq_drop(inode);

		dquot_drop(inode);

	}



	es = EXT2_SB(sb)->s_es;
@@ -608,7 +608,7 @@ struct inode *ext2_new_inode(struct inode *dir, int mode) 
	dquot_free_inode(inode);



fail_drop:

	vfs_dq_drop(inode);

	dquot_drop(inode);

	inode->i_flags |= S_NOQUOTA;

	inode->i_nlink = 0;

	unlock_new_inode(inode);

fs/ext2/super.c

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

	dquot_drop(inode);

	ext2_discard_reservation(inode);

	EXT2_I(inode)->i_block_alloc_info = NULL;

	if (unlikely(rsv))

fs/ext3/ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void ext3_free_inode (handle_t *handle, struct inode * inode) 
	vfs_dq_init(inode);

	ext3_xattr_delete_inode(handle, inode);

	dquot_free_inode(inode);

	vfs_dq_drop(inode);

	dquot_drop(inode);



	is_directory = S_ISDIR(inode->i_mode);
@@ -622,7 +622,7 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode) 
	dquot_free_inode(inode);



fail_drop:

	vfs_dq_drop(inode);

	dquot_drop(inode);

	inode->i_flags |= S_NOQUOTA;

	inode->i_nlink = 0;

	unlock_new_inode(inode);

fs/ext3/super.c

+1 −2
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ 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);

	dquot_drop(inode);

	ext3_discard_reservation(inode);

	EXT3_I(inode)->i_block_alloc_info = NULL;

	if (unlikely(rsv))
@@ -753,7 +753,6 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type, 


static const struct dquot_operations ext3_quota_operations = {

	.initialize	= dquot_initialize,

	.drop		= dquot_drop,

	.write_dquot	= ext3_write_dquot,

	.acquire_dquot	= ext3_acquire_dquot,

	.release_dquot	= ext3_release_dquot,