提交 bacfb7c2 编写于 作者: J Jan Kara

udf: Use lowercase names of quota functions

Use lowercase names of quota functions instead of old uppercase ones.
Signed-off-by: NJan Kara <jack@suse.cz>
上级 5f5fa796
...@@ -206,7 +206,7 @@ static void udf_bitmap_free_blocks(struct super_block *sb, ...@@ -206,7 +206,7 @@ static void udf_bitmap_free_blocks(struct super_block *sb,
((char *)bh->b_data)[(bit + i) >> 3]); ((char *)bh->b_data)[(bit + i) >> 3]);
} else { } else {
if (inode) if (inode)
DQUOT_FREE_BLOCK(inode, 1); vfs_dq_free_block(inode, 1);
udf_add_free_space(sbi, sbi->s_partition, 1); udf_add_free_space(sbi, sbi->s_partition, 1);
} }
} }
...@@ -261,11 +261,11 @@ static int udf_bitmap_prealloc_blocks(struct super_block *sb, ...@@ -261,11 +261,11 @@ static int udf_bitmap_prealloc_blocks(struct super_block *sb,
while (bit < (sb->s_blocksize << 3) && block_count > 0) { while (bit < (sb->s_blocksize << 3) && block_count > 0) {
if (!udf_test_bit(bit, bh->b_data)) if (!udf_test_bit(bit, bh->b_data))
goto out; goto out;
else if (DQUOT_PREALLOC_BLOCK(inode, 1)) else if (vfs_dq_prealloc_block(inode, 1))
goto out; goto out;
else if (!udf_clear_bit(bit, bh->b_data)) { else if (!udf_clear_bit(bit, bh->b_data)) {
udf_debug("bit already cleared for block %d\n", bit); udf_debug("bit already cleared for block %d\n", bit);
DQUOT_FREE_BLOCK(inode, 1); vfs_dq_free_block(inode, 1);
goto out; goto out;
} }
block_count--; block_count--;
...@@ -393,7 +393,7 @@ static int udf_bitmap_new_block(struct super_block *sb, ...@@ -393,7 +393,7 @@ static int udf_bitmap_new_block(struct super_block *sb,
/* /*
* Check quota for allocation of this block. * Check quota for allocation of this block.
*/ */
if (inode && DQUOT_ALLOC_BLOCK(inode, 1)) { if (inode && vfs_dq_alloc_block(inode, 1)) {
mutex_unlock(&sbi->s_alloc_mutex); mutex_unlock(&sbi->s_alloc_mutex);
*err = -EDQUOT; *err = -EDQUOT;
return 0; return 0;
...@@ -452,7 +452,7 @@ static void udf_table_free_blocks(struct super_block *sb, ...@@ -452,7 +452,7 @@ static void udf_table_free_blocks(struct super_block *sb,
/* We do this up front - There are some error conditions that /* We do this up front - There are some error conditions that
could occure, but.. oh well */ could occure, but.. oh well */
if (inode) if (inode)
DQUOT_FREE_BLOCK(inode, count); vfs_dq_free_block(inode, count);
if (udf_add_free_space(sbi, sbi->s_partition, count)) if (udf_add_free_space(sbi, sbi->s_partition, count))
mark_buffer_dirty(sbi->s_lvid_bh); mark_buffer_dirty(sbi->s_lvid_bh);
...@@ -700,7 +700,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb, ...@@ -700,7 +700,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
epos.offset -= adsize; epos.offset -= adsize;
alloc_count = (elen >> sb->s_blocksize_bits); alloc_count = (elen >> sb->s_blocksize_bits);
if (inode && DQUOT_PREALLOC_BLOCK(inode, if (inode && vfs_dq_prealloc_block(inode,
alloc_count > block_count ? block_count : alloc_count)) alloc_count > block_count ? block_count : alloc_count))
alloc_count = 0; alloc_count = 0;
else if (alloc_count > block_count) { else if (alloc_count > block_count) {
...@@ -806,7 +806,7 @@ static int udf_table_new_block(struct super_block *sb, ...@@ -806,7 +806,7 @@ static int udf_table_new_block(struct super_block *sb,
goal_eloc.logicalBlockNum++; goal_eloc.logicalBlockNum++;
goal_elen -= sb->s_blocksize; goal_elen -= sb->s_blocksize;
if (inode && DQUOT_ALLOC_BLOCK(inode, 1)) { if (inode && vfs_dq_alloc_block(inode, 1)) {
brelse(goal_epos.bh); brelse(goal_epos.bh);
mutex_unlock(&sbi->s_alloc_mutex); mutex_unlock(&sbi->s_alloc_mutex);
*err = -EDQUOT; *err = -EDQUOT;
......
...@@ -36,8 +36,8 @@ void udf_free_inode(struct inode *inode) ...@@ -36,8 +36,8 @@ void udf_free_inode(struct inode *inode)
* Note: we must free any quota before locking the superblock, * Note: we must free any quota before locking the superblock,
* as writing the quota to disk may need the lock as well. * as writing the quota to disk may need the lock as well.
*/ */
DQUOT_FREE_INODE(inode); vfs_dq_free_inode(inode);
DQUOT_DROP(inode); vfs_dq_drop(inode);
clear_inode(inode); clear_inode(inode);
...@@ -154,8 +154,8 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) ...@@ -154,8 +154,8 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
insert_inode_hash(inode); insert_inode_hash(inode);
mark_inode_dirty(inode); mark_inode_dirty(inode);
if (DQUOT_ALLOC_INODE(inode)) { if (vfs_dq_alloc_inode(inode)) {
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;
iput(inode); iput(inode);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册