diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /fs/qnx4 | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'fs/qnx4')
| -rw-r--r-- | fs/qnx4/fsync.c | 6 | ||||
| -rw-r--r-- | fs/qnx4/inode.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/qnx4/fsync.c b/fs/qnx4/fsync.c index e90291f03..26c8d7792 100644 --- a/fs/qnx4/fsync.c +++ b/fs/qnx4/fsync.c @@ -60,6 +60,7 @@ static int sync_block(struct inode *inode, unsigned short *block, int wait) return 0; } +#ifdef WTF static int sync_iblock(struct inode *inode, unsigned short *iblock, struct buffer_head **bh, int wait) { @@ -83,6 +84,7 @@ static int sync_iblock(struct inode *inode, unsigned short *iblock, return -1; return 0; } +#endif static int sync_direct(struct inode *inode, int wait) { @@ -100,6 +102,7 @@ static int sync_direct(struct inode *inode, int wait) return err; } +#ifdef WTF static int sync_indirect(struct inode *inode, unsigned short *iblock, int wait) { int i; @@ -146,8 +149,9 @@ static int sync_dindirect(struct inode *inode, unsigned short *diblock, brelse(dind_bh); return err; } +#endif -int qnx4_sync_file(struct file *file, struct dentry *dentry) +int qnx4_sync_file(struct file *file, struct dentry *dentry, int unused) { struct inode *inode = dentry->d_inode; int wait, err = 0; diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 3576482ca..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; |