vserver 1.9.5.x5

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

diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index aa9dadb..d46a09f 100644 (file)
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -78,7 +78,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 +87,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 +101,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 +117,7 @@ static void qnx4_write_inode(struct inode *inode, int unused)
        mark_buffer_dirty(bh);
        brelse(bh);
        unlock_kernel();
+       return 0;
 }
 
 #endif
@@ -188,7 +189,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;
 }
@@ -232,8 +233,8 @@ 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);
 
@@ -269,7 +270,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 )
@@ -544,7 +545,7 @@ 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,
                                             init_once, NULL);
        if (qnx4_inode_cachep == NULL)
                return -ENOMEM;