]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
udf: Use lowercase names of quota functions
authorJan Kara <jack@suse.cz>
Mon, 26 Jan 2009 16:20:46 +0000 (17:20 +0100)
committerJan Kara <jack@suse.cz>
Thu, 26 Mar 2009 01:18:36 +0000 (02:18 +0100)
Use lowercase names of quota functions instead of old uppercase ones.

Signed-off-by: Jan Kara <jack@suse.cz>
fs/udf/balloc.c
fs/udf/ialloc.c

index 1b809bd494bd098a0a7855ba10f300f66a08d46a..2bb788a2acb16bf24ab25a708390e58842f06116 100644 (file)
@@ -206,7 +206,7 @@ static void udf_bitmap_free_blocks(struct super_block *sb,
                                        ((char *)bh->b_data)[(bit + i) >> 3]);
                        } else {
                                if (inode)
-                                       DQUOT_FREE_BLOCK(inode, 1);
+                                       vfs_dq_free_block(inode, 1);
                                udf_add_free_space(sbi, sbi->s_partition, 1);
                        }
                }
@@ -261,11 +261,11 @@ static int udf_bitmap_prealloc_blocks(struct super_block *sb,
                while (bit < (sb->s_blocksize << 3) && block_count > 0) {
                        if (!udf_test_bit(bit, bh->b_data))
                                goto out;
-                       else if (DQUOT_PREALLOC_BLOCK(inode, 1))
+                       else if (vfs_dq_prealloc_block(inode, 1))
                                goto out;
                        else if (!udf_clear_bit(bit, bh->b_data)) {
                                udf_debug("bit already cleared for block %d\n", bit);
-                               DQUOT_FREE_BLOCK(inode, 1);
+                               vfs_dq_free_block(inode, 1);
                                goto out;
                        }
                        block_count--;
@@ -393,7 +393,7 @@ got_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);
                *err = -EDQUOT;
                return 0;
@@ -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
           could occure, but.. oh well */
        if (inode)
-               DQUOT_FREE_BLOCK(inode, count);
+               vfs_dq_free_block(inode, count);
        if (udf_add_free_space(sbi, sbi->s_partition, count))
                mark_buffer_dirty(sbi->s_lvid_bh);
 
@@ -700,7 +700,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
                epos.offset -= adsize;
 
                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 = 0;
                else if (alloc_count > block_count) {
@@ -806,7 +806,7 @@ static int udf_table_new_block(struct super_block *sb,
        goal_eloc.logicalBlockNum++;
        goal_elen -= sb->s_blocksize;
 
-       if (inode && DQUOT_ALLOC_BLOCK(inode, 1)) {
+       if (inode && vfs_dq_alloc_block(inode, 1)) {
                brelse(goal_epos.bh);
                mutex_unlock(&sbi->s_alloc_mutex);
                *err = -EDQUOT;
index 31fc84297ddb545809e2033a2b5d6c4bf427716a..47dbe5613f90ff456b2a52f4a8a4c8aee8f6fb12 100644 (file)
@@ -36,8 +36,8 @@ void udf_free_inode(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_FREE_INODE(inode);
-       DQUOT_DROP(inode);
+       vfs_dq_free_inode(inode);
+       vfs_dq_drop(inode);
 
        clear_inode(inode);
 
@@ -154,8 +154,8 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
        insert_inode_hash(inode);
        mark_inode_dirty(inode);
 
-       if (DQUOT_ALLOC_INODE(inode)) {
-               DQUOT_DROP(inode);
+       if (vfs_dq_alloc_inode(inode)) {
+               vfs_dq_drop(inode);
                inode->i_flags |= S_NOQUOTA;
                inode->i_nlink = 0;
                iput(inode);