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

Commit 6f90bee5 authored by Jan Kara's avatar Jan Kara
Browse files

ext2: Use lowercase names of quota functions 



Use lowercase names of quota functions instead of old uppercase ones.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
CC: linux-ext4@vger.kernel.org
parent 31464955

fs/ext2/balloc.c

+4 −4
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ void ext2_free_blocks (struct inode * inode, unsigned long block, 
error_return:

	brelse(bitmap_bh);

	release_blocks(sb, freed);

	DQUOT_FREE_BLOCK(inode, freed);

	vfs_dq_free_block(inode, freed);

}



/**
@@ -1247,7 +1247,7 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 
	/*

	 * Check quota for allocation of this block.

	 */

	if (DQUOT_ALLOC_BLOCK(inode, num)) {

	if (vfs_dq_alloc_block(inode, num)) {

		*errp = -EDQUOT;

		return 0;

	}
@@ -1409,7 +1409,7 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 


	*errp = 0;

	brelse(bitmap_bh);

	DQUOT_FREE_BLOCK(inode, *count-num);

	vfs_dq_free_block(inode, *count-num);

	*count = num;

	return ret_block;
@@ -1420,7 +1420,7 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 
	 * Undo the block allocation

	 */

	if (!performed_allocation)

		DQUOT_FREE_BLOCK(inode, *count);

		vfs_dq_free_block(inode, *count);

	brelse(bitmap_bh);

	return 0;

}

fs/ext2/ialloc.c

+5 −5
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ void ext2_free_inode (struct inode * inode) 
	if (!is_bad_inode(inode)) {

		/* Quota is already initialized in iput() */

		ext2_xattr_delete_inode(inode);

	    	DQUOT_FREE_INODE(inode);

		DQUOT_DROP(inode);

		vfs_dq_free_inode(inode);

		vfs_dq_drop(inode);

	}



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

	}



	if (DQUOT_ALLOC_INODE(inode)) {

	if (vfs_dq_alloc_inode(inode)) {

		err = -EDQUOT;

		goto fail_drop;

	}
@@ -605,10 +605,10 @@ struct inode *ext2_new_inode(struct inode *dir, int mode) 
	return inode;



fail_free_drop:

	DQUOT_FREE_INODE(inode);

	vfs_dq_free_inode(inode);



fail_drop:

	DQUOT_DROP(inode);

	vfs_dq_drop(inode);

	inode->i_flags |= S_NOQUOTA;

	inode->i_nlink = 0;

	unlock_new_inode(inode);

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr) 
		return error;

	if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||

	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {

		error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;

		error = vfs_dq_transfer(inode, iattr) ? -EDQUOT : 0;

		if (error)

			return error;

	}

fs/ext2/xattr.c

+4 −4
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
				ea_bdebug(new_bh, "reusing block");



				error = -EDQUOT;

				if (DQUOT_ALLOC_BLOCK(inode, 1)) {

				if (vfs_dq_alloc_block(inode, 1)) {

					unlock_buffer(new_bh);

					goto cleanup;

				}
@@ -699,7 +699,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
		 * as if nothing happened and cleanup the unused block */

		if (error && error != -ENOSPC) {

			if (new_bh && new_bh != old_bh)

				DQUOT_FREE_BLOCK(inode, 1);

				vfs_dq_free_block(inode, 1);

			goto cleanup;

		}

	} else
@@ -731,7 +731,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
			le32_add_cpu(&HDR(old_bh)->h_refcount, -1);

			if (ce)

				mb_cache_entry_release(ce);

			DQUOT_FREE_BLOCK(inode, 1);

			vfs_dq_free_block(inode, 1);

			mark_buffer_dirty(old_bh);

			ea_bdebug(old_bh, "refcount now=%d",

				le32_to_cpu(HDR(old_bh)->h_refcount));
@@ -794,7 +794,7 @@ ext2_xattr_delete_inode(struct inode *inode) 
		mark_buffer_dirty(bh);

		if (IS_SYNC(inode))

			sync_dirty_buffer(bh);

		DQUOT_FREE_BLOCK(inode, 1);

		vfs_dq_free_block(inode, 1);

	}

	EXT2_I(inode)->i_file_acl = 0;