diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /fs/qnx4 | |
parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'fs/qnx4')
-rw-r--r-- | fs/qnx4/bitmap.c | 19 | ||||
-rw-r--r-- | fs/qnx4/fsync.c | 2 | ||||
-rw-r--r-- | fs/qnx4/inode.c | 3 |
3 files changed, 2 insertions, 22 deletions
diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c index b185960db..03e89e64d 100644 --- a/fs/qnx4/bitmap.c +++ b/fs/qnx4/bitmap.c @@ -153,25 +153,6 @@ static void qnx4_clear_inode(struct inode *inode) void qnx4_free_inode(struct inode *inode) { - if (!inode) { - return; - } - if (!inode->i_dev) { - printk("free_inode: inode has no device\n"); - return; - } - if (inode->i_count > 1) { - printk("free_inode: inode has count=%d\n", inode->i_count); - return; - } - if (inode->i_nlink) { - printk("free_inode: inode has nlink=%d\n", inode->i_nlink); - return; - } - if (!inode->i_sb) { - printk("free_inode: inode on nonexistent device\n"); - return; - } if (inode->i_ino < 1) { printk("free_inode: inode 0 or nonexistent inode\n"); return; diff --git a/fs/qnx4/fsync.c b/fs/qnx4/fsync.c index e90291f03..e8f079c24 100644 --- a/fs/qnx4/fsync.c +++ b/fs/qnx4/fsync.c @@ -147,7 +147,7 @@ static int sync_dindirect(struct inode *inode, unsigned short *diblock, return err; } -int qnx4_sync_file(struct file *file, struct dentry *dentry) +int qnx4_sync_file(struct file *file, struct dentry *dentry, int datasync) { struct inode *inode = dentry->d_inode; int wait, err = 0; diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 60393eb91..0785ee368 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -73,7 +73,7 @@ static void qnx4_write_super(struct super_block *sb) sb->s_dirt = 0; } -static void qnx4_write_inode(struct inode *inode) +static void qnx4_write_inode(struct inode *inode, int unused) { struct qnx4_inode_entry *raw_inode; int block, ino; @@ -340,7 +340,6 @@ static struct super_block *qnx4_read_super(struct super_block *s, set_blocksize(dev, QNX4_BLOCK_SIZE); s->s_blocksize = QNX4_BLOCK_SIZE; s->s_blocksize_bits = QNX4_BLOCK_SIZE_BITS; - s->s_dev = dev; /* Check the boot signature. Since the qnx4 code is dangerous, we should leave as quickly as possible |