adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

ext2: Use lowercase names of quota functions

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

Signed-off-by: Jan Kara <jack@suse.cz>
CC: linux-ext4@vger.kernel.org
This commit is contained in:
Jan Kara 2009-01-26 16:52:06 +01:00
parent 314649558d
commit 6f90bee506
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/ext2/balloc.c
View file

@ -570,7 +570,7 @@ do_more:
error_return: error_return:
brelse(bitmap_bh); brelse(bitmap_bh);
release_blocks(sb, freed); 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. * Check quota for allocation of this block.
*/ */
if (DQUOT_ALLOC_BLOCK(inode, num)) { if (vfs_dq_alloc_block(inode, num)) {
*errp = -EDQUOT; *errp = -EDQUOT;
return 0; return 0;
} }
@ -1409,7 +1409,7 @@ allocated:
*errp = 0; *errp = 0;
brelse(bitmap_bh); brelse(bitmap_bh);
DQUOT_FREE_BLOCK(inode, *count-num); vfs_dq_free_block(inode, *count-num);
*count = num; *count = num;
return ret_block; return ret_block;
@ -1420,7 +1420,7 @@ out:
* Undo the block allocation * Undo the block allocation
*/ */
if (!performed_allocation) if (!performed_allocation)
DQUOT_FREE_BLOCK(inode, *count); vfs_dq_free_block(inode, *count);
brelse(bitmap_bh); brelse(bitmap_bh);
return 0; return 0;
} }

10
fs/ext2/ialloc.c
View file

@ -121,8 +121,8 @@ void ext2_free_inode (struct inode * inode)
if (!is_bad_inode(inode)) { if (!is_bad_inode(inode)) {
/* Quota is already initialized in iput() */ /* Quota is already initialized in iput() */
ext2_xattr_delete_inode(inode); ext2_xattr_delete_inode(inode);
DQUOT_FREE_INODE(inode); vfs_dq_free_inode(inode);
DQUOT_DROP(inode); vfs_dq_drop(inode);
} }
es = EXT2_SB(sb)->s_es; es = EXT2_SB(sb)->s_es;
@ -586,7 +586,7 @@ got:
goto fail_drop; goto fail_drop;
} }
if (DQUOT_ALLOC_INODE(inode)) { if (vfs_dq_alloc_inode(inode)) {
err = -EDQUOT; err = -EDQUOT;
goto fail_drop; goto fail_drop;
} }
@ -605,10 +605,10 @@ got:
return inode; return inode;
fail_free_drop: fail_free_drop:
DQUOT_FREE_INODE(inode); vfs_dq_free_inode(inode);
fail_drop: fail_drop:
DQUOT_DROP(inode); vfs_dq_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0; inode->i_nlink = 0;
unlock_new_inode(inode); unlock_new_inode(inode);

2
fs/ext2/inode.c
View file

@ -1444,7 +1444,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
return error; return error;
if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) || if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
(iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) { (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) if (error)
return error; return error;
} }

8
fs/ext2/xattr.c
View file

@ -642,7 +642,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
ea_bdebug(new_bh, "reusing block"); ea_bdebug(new_bh, "reusing block");
error = -EDQUOT; error = -EDQUOT;
if (DQUOT_ALLOC_BLOCK(inode, 1)) { if (vfs_dq_alloc_block(inode, 1)) {
unlock_buffer(new_bh); unlock_buffer(new_bh);
goto cleanup; 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 */ * as if nothing happened and cleanup the unused block */
if (error && error != -ENOSPC) { if (error && error != -ENOSPC) {
if (new_bh && new_bh != old_bh) if (new_bh && new_bh != old_bh)
DQUOT_FREE_BLOCK(inode, 1); vfs_dq_free_block(inode, 1);
goto cleanup; goto cleanup;
} }
} else } 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); le32_add_cpu(&HDR(old_bh)->h_refcount, -1);
if (ce) if (ce)
mb_cache_entry_release(ce); mb_cache_entry_release(ce);
DQUOT_FREE_BLOCK(inode, 1); vfs_dq_free_block(inode, 1);
mark_buffer_dirty(old_bh); mark_buffer_dirty(old_bh);
ea_bdebug(old_bh, "refcount now=%d", ea_bdebug(old_bh, "refcount now=%d",
le32_to_cpu(HDR(old_bh)->h_refcount)); le32_to_cpu(HDR(old_bh)->h_refcount));
@ -794,7 +794,7 @@ ext2_xattr_delete_inode(struct inode *inode)
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
if (IS_SYNC(inode)) if (IS_SYNC(inode))
sync_dirty_buffer(bh); sync_dirty_buffer(bh);
DQUOT_FREE_BLOCK(inode, 1); vfs_dq_free_block(inode, 1);
} }
EXT2_I(inode)->i_file_acl = 0; EXT2_I(inode)->i_file_acl = 0;