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

Commit a269eb18 authored by Jan Kara's avatar Jan Kara
Browse files

ext4: 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>
Acked-by: default avatarMingming Cao <cmm@us.ibm.com>
CC: linux-ext4@vger.kernel.org
parent 81a05227

fs/ext4/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, 
	ext4_mb_free_blocks(handle, inode, block, count,

			    metadata, &dquot_freed_blocks);

	if (dquot_freed_blocks)

		DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);

		vfs_dq_free_block(inode, dquot_freed_blocks);

	return;

}

fs/ext4/ialloc.c

+6 −6
Original line number Diff line number Diff line
@@ -220,10 +220,10 @@ void ext4_free_inode(handle_t *handle, struct inode *inode) 
	 * Note: we must free any quota before locking the superblock,

	 * as writing the quota to disk may need the lock as well.

	 */

	DQUOT_INIT(inode);

	vfs_dq_init(inode);

	ext4_xattr_delete_inode(handle, inode);

	DQUOT_FREE_INODE(inode);

	DQUOT_DROP(inode);

	vfs_dq_free_inode(inode);

	vfs_dq_drop(inode);



	is_directory = S_ISDIR(inode->i_mode);
@@ -915,7 +915,7 @@ got: 
	ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize;



	ret = inode;

	if (DQUOT_ALLOC_INODE(inode)) {

	if (vfs_dq_alloc_inode(inode)) {

		err = -EDQUOT;

		goto fail_drop;

	}
@@ -956,10 +956,10 @@ really_out: 
	return ret;



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/ext4/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -4642,7 +4642,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) 
			error = PTR_ERR(handle);

			goto err_out;

		}

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

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

		if (error) {

			ext4_journal_stop(handle);

			return error;
@@ -5021,7 +5021,7 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode) 
 * i_size has been changed by generic_commit_write() and we thus need

 * to include the updated inode in the current transaction.

 *

 * Also, DQUOT_ALLOC_SPACE() will always dirty the inode when blocks

 * Also, vfs_dq_alloc_block() will always dirty the inode when blocks

 * are allocated to the file.

 *

 * If the inode is marked synchronous, we don't honour that here - doing

fs/ext4/mballoc.c

+2 −2
Original line number Diff line number Diff line
@@ -4587,7 +4587,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, 
			return 0;

		}

		reserv_blks = ar->len;

		while (ar->len && DQUOT_ALLOC_BLOCK(ar->inode, ar->len)) {

		while (ar->len && vfs_dq_alloc_block(ar->inode, ar->len)) {

			ar->flags |= EXT4_MB_HINT_NOPREALLOC;

			ar->len--;

		}
@@ -4663,7 +4663,7 @@ out2: 
	kmem_cache_free(ext4_ac_cachep, ac);

out1:

	if (inquota && ar->len < inquota)

		DQUOT_FREE_BLOCK(ar->inode, inquota - ar->len);

		vfs_dq_free_block(ar->inode, inquota - ar->len);

out3:

	if (!ar->len) {

		if (!EXT4_I(ar->inode)->i_delalloc_reserved_flag)

fs/ext4/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -2092,7 +2092,7 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry) 


	/* Initialize quotas before so that eventual writes go in

	 * separate transaction */

	DQUOT_INIT(dentry->d_inode);

	vfs_dq_init(dentry->d_inode);

	handle = ext4_journal_start(dir, EXT4_DELETE_TRANS_BLOCKS(dir->i_sb));

	if (IS_ERR(handle))

		return PTR_ERR(handle);
@@ -2151,7 +2151,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) 


	/* Initialize quotas before so that eventual writes go

	 * in separate transaction */

	DQUOT_INIT(dentry->d_inode);

	vfs_dq_init(dentry->d_inode);

	handle = ext4_journal_start(dir, EXT4_DELETE_TRANS_BLOCKS(dir->i_sb));

	if (IS_ERR(handle))

		return PTR_ERR(handle);
@@ -2318,7 +2318,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, 
	/* Initialize quotas before so that eventual writes go

	 * in separate transaction */

	if (new_dentry->d_inode)

		DQUOT_INIT(new_dentry->d_inode);

		vfs_dq_init(new_dentry->d_inode);

	handle = ext4_journal_start(old_dir, 2 *

					EXT4_DATA_TRANS_BLOCKS(old_dir->i_sb) +

					EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2);