v2.4.10.4 -> v2.4.10.5

[linux-flexiantxendom0-3.2.10.git] / fs / udf / balloc.c

diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 0aa448b..0d82b45 100644 (file)
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -142,7 +142,7 @@ static inline int load_block_bitmap(struct super_block *sb,
        return slot;
 }
 
-static void udf_bitmap_free_blocks(const struct inode * inode,
+static void udf_bitmap_free_blocks(struct inode * inode,
        struct udf_bitmap *bitmap, lb_addr bloc, Uint32 offset, Uint32 count)
 {
        struct buffer_head * bh = NULL;
@@ -200,7 +200,7 @@ do_more:
                }
                else
                {
-                       DQUOT_FREE_BLOCK(sb, inode, 1);
+                       DQUOT_FREE_BLOCK(inode, 1);
                        if (UDF_SB_LVIDBH(sb))
                        {
                                UDF_SB_LVID(sb)->freeSpaceTable[UDF_SB_PARTITION(sb)] =
@@ -223,7 +223,7 @@ error_return:
        return;
 }
 
-static int udf_bitmap_prealloc_blocks(const struct inode * inode,
+static int udf_bitmap_prealloc_blocks(struct inode * inode,
        struct udf_bitmap *bitmap, Uint16 partition, Uint32 first_block,
        Uint32 block_count)
 {
@@ -265,12 +265,12 @@ repeat:
        {
                if (!udf_test_bit(bit, bh->b_data))
                        goto out;
-               else if (DQUOT_PREALLOC_BLOCK(sb, inode, 1))
+               else if (DQUOT_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(sb, inode, 1);
+                       DQUOT_FREE_BLOCK(inode, 1);
                        goto out;
                }
                block_count --;
@@ -293,7 +293,7 @@ out:
        return alloc_count;
 }
 
-static int udf_bitmap_new_block(const struct inode * inode,
+static int udf_bitmap_new_block(struct inode * inode,
        struct udf_bitmap *bitmap, Uint16 partition, Uint32 goal, int *err)
 {
        int newbit, bit=0, block, block_group, group_start;
@@ -404,7 +404,7 @@ got_block:
        /*
         * Check quota for allocation of this block.
         */
-       if (DQUOT_ALLOC_BLOCK(sb, inode, 1))
+       if (DQUOT_ALLOC_BLOCK(inode, 1))
        {
                unlock_super(sb);
                *err = -EDQUOT;
@@ -439,7 +439,7 @@ error_return:
        return 0;
 }
 
-static void udf_table_free_blocks(const struct inode * inode,
+static void udf_table_free_blocks(struct inode * inode,
        struct inode * table, lb_addr bloc, Uint32 offset, Uint32 count)
 {
        struct super_block * sb;
@@ -475,7 +475,7 @@ static void udf_table_free_blocks(const struct inode * inode,
 
        /* We do this up front - There are some error conditions that could occure,
           but.. oh well */
-       DQUOT_FREE_BLOCK(sb, inode, count);
+       DQUOT_FREE_BLOCK(inode, count);
        if (UDF_SB_LVIDBH(sb))
        {
                UDF_SB_LVID(sb)->freeSpaceTable[UDF_SB_PARTITION(sb)] =
@@ -690,7 +690,7 @@ error_return:
        return;
 }
 
-static int udf_table_prealloc_blocks(const struct inode * inode,
+static int udf_table_prealloc_blocks(struct inode * inode,
        struct inode *table, Uint16 partition, Uint32 first_block,
        Uint32 block_count)
 {
@@ -887,7 +887,7 @@ static int udf_table_new_block(const struct inode * inode,
        return newblock;
 }
 
-inline void udf_free_blocks(const struct inode * inode, lb_addr bloc,
+inline void udf_free_blocks(struct inode * inode, lb_addr bloc,
        Uint32 offset, Uint32 count)
 {
        if (UDF_SB_PARTFLAGS(inode->i_sb, bloc.partitionReferenceNum) & UDF_PART_FLAG_UNALLOC_BITMAP)
@@ -918,7 +918,7 @@ inline void udf_free_blocks(const struct inode * inode, lb_addr bloc,
                return;
 }
 
-inline int udf_prealloc_blocks(const struct inode * inode, Uint16 partition,
+inline int udf_prealloc_blocks(struct inode * inode, Uint16 partition,
        Uint32 first_block, Uint32 block_count)
 {
        if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_UNALLOC_BITMAP)
@@ -949,7 +949,7 @@ inline int udf_prealloc_blocks(const struct inode * inode, Uint16 partition,
                return 0;
 }
 
-inline int udf_new_block(const struct inode * inode, Uint16 partition,
+inline int udf_new_block(struct inode * inode, Uint16 partition,
        Uint32 goal, int *err)
 {
        if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_UNALLOC_BITMAP)