Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / qnx4 / inode.c

diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index aa9dadb..2ecd46f 100644 (file)
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -63,6 +63,7 @@ int qnx4_sync_inode(struct inode *inode)
 static void qnx4_delete_inode(struct inode *inode)
 {
        QNX4DEBUG(("qnx4: deleting inode [%lu]\n", (unsigned long) inode->i_ino));
+       truncate_inode_pages(&inode->i_data, 0);
        inode->i_size = 0;
        qnx4_truncate(inode);
        lock_kernel();
@@ -78,7 +79,7 @@ static void qnx4_write_super(struct super_block *sb)
        unlock_kernel();
 }
 
-static void qnx4_write_inode(struct inode *inode, int unused)
+static int qnx4_write_inode(struct inode *inode, int unused)
 {
        struct qnx4_inode_entry *raw_inode;
        int block, ino;
@@ -87,12 +88,12 @@ static void qnx4_write_inode(struct inode *inode, int unused)
 
        QNX4DEBUG(("qnx4: write inode 1.\n"));
        if (inode->i_nlink == 0) {
-               return;
+               return 0;
        }
        if (!ino) {
                printk("qnx4: bad inode number on dev %s: %d is out of range\n",
                       inode->i_sb->s_id, ino);
-               return;
+               return -EIO;
        }
        QNX4DEBUG(("qnx4: write inode 2.\n"));
        block = ino / QNX4_INODES_PER_BLOCK;
@@ -101,7 +102,7 @@ static void qnx4_write_inode(struct inode *inode, int unused)
                printk("qnx4: major problem: unable to read inode from dev "
                       "%s\n", inode->i_sb->s_id);
                unlock_kernel();
-               return;
+               return -EIO;
        }
        raw_inode = ((struct qnx4_inode_entry *) bh->b_data) +
            (ino % QNX4_INODES_PER_BLOCK);
@@ -117,6 +118,7 @@ static void qnx4_write_inode(struct inode *inode, int unused)
        mark_buffer_dirty(bh);
        brelse(bh);
        unlock_kernel();
+       return 0;
 }
 
 #endif
@@ -161,8 +163,8 @@ static int qnx4_remount(struct super_block *sb, int *flags, char *data)
        return 0;
 }
 
-struct buffer_head *qnx4_getblk(struct inode *inode, int nr,
-                                int create)
+static struct buffer_head *qnx4_getblk(struct inode *inode, int nr,
+                                      int create)
 {
        struct buffer_head *result = NULL;
 
@@ -188,7 +190,7 @@ struct buffer_head *qnx4_getblk(struct inode *inode, int nr,
        }
        tst = tmp;
 #endif
-       inode->i_ctime = CURRENT_TIME;
+       inode->i_ctime = CURRENT_TIME_SEC;
        mark_inode_dirty(inode);
        return result;
 }
@@ -211,7 +213,7 @@ struct buffer_head *qnx4_bread(struct inode *inode, int block, int create)
        return NULL;
 }
 
-int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_head *bh, int create )
+static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_head *bh, int create )
 {
        unsigned long phys;
 
@@ -232,10 +234,10 @@ unsigned long qnx4_block_map( struct inode *inode, long iblock )
        int ix;
        long offset, i_xblk;
        unsigned long block = 0;
-       struct buffer_head *bh = 0;
-       struct qnx4_xblk *xblk = 0;
+       struct buffer_head *bh = NULL;
+       struct qnx4_xblk *xblk = NULL;
        struct qnx4_inode_entry *qnx4_inode = qnx4_raw_inode(inode);
-       qnx4_nxtnt_t nxtnt = le16_to_cpu(qnx4_inode->di_num_xtnts);
+       u16 nxtnt = le16_to_cpu(qnx4_inode->di_num_xtnts);
 
        if ( iblock < le32_to_cpu(qnx4_inode->di_first_xtnt.xtnt_size) ) {
                // iblock is in the first extent. This is easy.
@@ -269,7 +271,7 @@ unsigned long qnx4_block_map( struct inode *inode, long iblock )
                                i_xblk = le32_to_cpu(xblk->xblk_next_xblk);
                                ix = 0;
                                brelse( bh );
-                               bh = 0;
+                               bh = NULL;
                        }
                }
                if ( bh )
@@ -371,7 +373,7 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent)
                printk("qnx4: unable to read the superblock\n");
                goto outnobh;
        }
-       if ( le32_to_cpu( *(__u32*)bh->b_data ) != QNX4_SUPER_MAGIC ) {
+       if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) {
                if (!silent)
                        printk("qnx4: wrong fsid in superblock.\n");
                goto out;
@@ -446,7 +448,7 @@ static sector_t qnx4_bmap(struct address_space *mapping, sector_t block)
 {
        return generic_block_bmap(mapping,block,qnx4_get_block);
 }
-struct address_space_operations qnx4_aops = {
+static struct address_space_operations qnx4_aops = {
        .readpage       = qnx4_readpage,
        .writepage      = qnx4_writepage,
        .sync_page      = block_sync_page,
@@ -544,7 +546,8 @@ static int init_inodecache(void)
 {
        qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache",
                                             sizeof(struct qnx4_inode_info),
-                                            0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
+                                            0, (SLAB_RECLAIM_ACCOUNT|
+                                               SLAB_MEM_SPREAD),
                                             init_once, NULL);
        if (qnx4_inode_cachep == NULL)
                return -ENOMEM;