[PATCH] ufs: wrong type cast

[safe/jmp/linux-2.6] / fs / ufs / inode.c

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 2b23663..c28b752 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -172,9 +172,10 @@ static void ufs_clear_block(struct inode *inode, struct buffer_head *bh)
                sync_dirty_buffer(bh);
 }
 
-static struct buffer_head * ufs_inode_getfrag (struct inode *inode,
-       unsigned int fragment, unsigned int new_fragment,
-       unsigned int required, int *err, int metadata, long *phys, int *new)
+static struct buffer_head *ufs_inode_getfrag(struct inode *inode,
+                                            unsigned int fragment, unsigned int new_fragment,
+                                            unsigned int required, int *err, int metadata,
+                                            long *phys, int *new, struct page *locked_page)
 {
        struct ufs_inode_info *ufsi = UFS_I(inode);
        struct super_block * sb;
@@ -232,7 +233,8 @@ repeat:
                if (lastblockoff) {
                        p2 = ufsi->i_u1.i_data + lastblock;
                        tmp = ufs_new_fragments (inode, p2, lastfrag, 
-                               fs32_to_cpu(sb, *p2), uspi->s_fpb - lastblockoff, err);
+                                                fs32_to_cpu(sb, *p2), uspi->s_fpb - lastblockoff,
+                                                err, locked_page);
                        if (!tmp) {
                                if (lastfrag != ufsi->i_lastfrag)
                                        goto repeat;
@@ -244,14 +246,16 @@ repeat:
                }
                goal = fs32_to_cpu(sb, ufsi->i_u1.i_data[lastblock]) + uspi->s_fpb;
                tmp = ufs_new_fragments (inode, p, fragment - blockoff, 
-                       goal, required + blockoff, err);
+                                        goal, required + blockoff,
+                                        err, locked_page);
        }
        /*
         * We will extend last allocated block
         */
        else if (lastblock == block) {
-               tmp = ufs_new_fragments (inode, p, fragment - (blockoff - lastblockoff),
-                       fs32_to_cpu(sb, *p), required +  (blockoff - lastblockoff), err);
+               tmp = ufs_new_fragments(inode, p, fragment - (blockoff - lastblockoff),
+                                       fs32_to_cpu(sb, *p), required +  (blockoff - lastblockoff),
+                                       err, locked_page);
        }
        /*
         * We will allocate new block before last allocated block
@@ -259,8 +263,8 @@ repeat:
        else /* (lastblock > block) */ {
                if (lastblock && (tmp = fs32_to_cpu(sb, ufsi->i_u1.i_data[lastblock-1])))
                        goal = tmp + uspi->s_fpb;
-               tmp = ufs_new_fragments (inode, p, fragment - blockoff, 
-                       goal, uspi->s_fpb, err);
+               tmp = ufs_new_fragments(inode, p, fragment - blockoff,
+                                       goal, uspi->s_fpb, err, locked_page);
        }
        if (!tmp) {
                if ((!blockoff && *p) || 
@@ -303,9 +307,10 @@ repeat2:
      */
 }
 
-static struct buffer_head * ufs_block_getfrag (struct inode *inode,
-       struct buffer_head *bh, unsigned int fragment, unsigned int new_fragment, 
-       unsigned int blocksize, int * err, int metadata, long *phys, int *new)
+static struct buffer_head *ufs_block_getfrag(struct inode *inode, struct buffer_head *bh,
+                                            unsigned int fragment, unsigned int new_fragment,
+                                            unsigned int blocksize, int * err, int metadata,
+                                            long *phys, int *new, struct page *locked_page)
 {
        struct super_block * sb;
        struct ufs_sb_private_info * uspi;
@@ -350,7 +355,8 @@ repeat:
                goal = tmp + uspi->s_fpb;
        else
                goal = bh->b_blocknr + uspi->s_fpb;
-       tmp = ufs_new_fragments (inode, p, ufs_blknum(new_fragment), goal, uspi->s_fpb, err);
+       tmp = ufs_new_fragments(inode, p, ufs_blknum(new_fragment), goal,
+                               uspi->s_fpb, err, locked_page);
        if (!tmp) {
                if (fs32_to_cpu(sb, *p))
                        goto repeat;
@@ -424,15 +430,15 @@ int ufs_getfrag_block (struct inode *inode, sector_t fragment, struct buffer_hea
         * it much more readable:
         */
 #define GET_INODE_DATABLOCK(x) \
-               ufs_inode_getfrag(inode, x, fragment, 1, &err, 0, &phys, &new)
+       ufs_inode_getfrag(inode, x, fragment, 1, &err, 0, &phys, &new, bh_result->b_page)
 #define GET_INODE_PTR(x) \
-               ufs_inode_getfrag(inode, x, fragment, uspi->s_fpb, &err, 1, NULL, NULL)
+       ufs_inode_getfrag(inode, x, fragment, uspi->s_fpb, &err, 1, NULL, NULL, bh_result->b_page)
 #define GET_INDIRECT_DATABLOCK(x) \
-               ufs_block_getfrag(inode, bh, x, fragment, sb->s_blocksize, \
-                                 &err, 0, &phys, &new);
+       ufs_block_getfrag(inode, bh, x, fragment, sb->s_blocksize,      \
+                         &err, 0, &phys, &new, bh_result->b_page);
 #define GET_INDIRECT_PTR(x) \
-               ufs_block_getfrag(inode, bh, x, fragment, sb->s_blocksize, \
-                                 &err, 1, NULL, NULL);
+       ufs_block_getfrag(inode, bh, x, fragment, sb->s_blocksize,      \
+                         &err, 1, NULL, NULL, bh_result->b_page);
 
        if (ptr < UFS_NDIR_FRAGMENT) {
                bh = GET_INODE_DATABLOCK(ptr);
@@ -546,6 +552,28 @@ struct address_space_operations ufs_aops = {
        .bmap = ufs_bmap
 };
 
+static void ufs_set_inode_ops(struct inode *inode)
+{
+       if (S_ISREG(inode->i_mode)) {
+               inode->i_op = &ufs_file_inode_operations;
+               inode->i_fop = &ufs_file_operations;
+               inode->i_mapping->a_ops = &ufs_aops;
+       } else if (S_ISDIR(inode->i_mode)) {
+               inode->i_op = &ufs_dir_inode_operations;
+               inode->i_fop = &ufs_dir_operations;
+               inode->i_mapping->a_ops = &ufs_aops;
+       } else if (S_ISLNK(inode->i_mode)) {
+               if (!inode->i_blocks)
+                       inode->i_op = &ufs_fast_symlink_inode_operations;
+               else {
+                       inode->i_op = &page_symlink_inode_operations;
+                       inode->i_mapping->a_ops = &ufs_aops;
+               }
+       } else
+               init_special_inode(inode, inode->i_mode,
+                                  ufs_get_inode_dev(inode->i_sb, UFS_I(inode)));
+}
+
 void ufs_read_inode (struct inode * inode)
 {
        struct ufs_inode_info *ufsi = UFS_I(inode);
@@ -620,23 +648,7 @@ void ufs_read_inode (struct inode * inode)
        }
        ufsi->i_osync = 0;
 
-       if (S_ISREG(inode->i_mode)) {
-               inode->i_op = &ufs_file_inode_operations;
-               inode->i_fop = &ufs_file_operations;
-               inode->i_mapping->a_ops = &ufs_aops;
-       } else if (S_ISDIR(inode->i_mode)) {
-               inode->i_op = &ufs_dir_inode_operations;
-               inode->i_fop = &ufs_dir_operations;
-       } else if (S_ISLNK(inode->i_mode)) {
-               if (!inode->i_blocks)
-                       inode->i_op = &ufs_fast_symlink_inode_operations;
-               else {
-                       inode->i_op = &page_symlink_inode_operations;
-                       inode->i_mapping->a_ops = &ufs_aops;
-               }
-       } else
-               init_special_inode(inode, inode->i_mode,
-                       ufs_get_inode_dev(sb, ufsi));
+       ufs_set_inode_ops(inode);
 
        brelse (bh);
 
@@ -696,23 +708,7 @@ ufs2_inode :
        }
        ufsi->i_osync = 0;
 
-       if (S_ISREG(inode->i_mode)) {
-               inode->i_op = &ufs_file_inode_operations;
-               inode->i_fop = &ufs_file_operations;
-               inode->i_mapping->a_ops = &ufs_aops;
-       } else if (S_ISDIR(inode->i_mode)) {
-               inode->i_op = &ufs_dir_inode_operations;
-               inode->i_fop = &ufs_dir_operations;
-       } else if (S_ISLNK(inode->i_mode)) {
-               if (!inode->i_blocks)
-                       inode->i_op = &ufs_fast_symlink_inode_operations;
-               else {
-                       inode->i_op = &page_symlink_inode_operations;
-                       inode->i_mapping->a_ops = &ufs_aops;
-               }
-       } else   /* TODO  : here ...*/
-               init_special_inode(inode, inode->i_mode,
-                       ufs_get_inode_dev(sb, ufsi));
+       ufs_set_inode_ops(inode);
 
        brelse(bh);