summaryrefslogtreecommitdiffstats
path: root/fs/sysv/truncate.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
commit78c388aed2b7184182c08428db1de6c872d815f5 (patch)
tree4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /fs/sysv/truncate.c
parenteb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff)
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'fs/sysv/truncate.c')
-rw-r--r--fs/sysv/truncate.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/sysv/truncate.c b/fs/sysv/truncate.c
index 7c919caff..c318648a9 100644
--- a/fs/sysv/truncate.c
+++ b/fs/sysv/truncate.c
@@ -41,8 +41,8 @@ static int trunc_direct(struct inode * inode)
{
struct super_block * sb;
unsigned int i;
- unsigned long * p;
- unsigned long block;
+ u32 * p;
+ u32 block;
struct buffer_head * bh;
int retry = 0;
@@ -71,7 +71,7 @@ repeat:
return retry;
}
-static int trunc_indirect(struct inode * inode, unsigned long offset, unsigned long * p, int convert, unsigned char * dirt)
+static int trunc_indirect(struct inode * inode, unsigned long offset, sysv_zone_t * p, int convert, unsigned char * dirt)
{
unsigned long indtmp, indblock;
struct super_block * sb;
@@ -140,14 +140,14 @@ done:
return retry;
}
-static int trunc_dindirect(struct inode * inode, unsigned long offset, unsigned long * p, int convert, unsigned char * dirt)
+static int trunc_dindirect(struct inode * inode, unsigned long offset, sysv_zone_t * p, int convert, unsigned char * dirt)
{
- unsigned long indtmp, indblock;
+ u32 indtmp, indblock;
struct super_block * sb;
struct buffer_head * indbh;
unsigned int i;
sysv_zone_t * ind;
- unsigned long tmp, block;
+ u32 tmp, block;
int retry = 0;
indblock = indtmp = *p;
@@ -197,14 +197,14 @@ done:
return retry;
}
-static int trunc_tindirect(struct inode * inode, unsigned long offset, unsigned long * p, int convert, unsigned char * dirt)
+static int trunc_tindirect(struct inode * inode, unsigned long offset, sysv_zone_t * p, int convert, unsigned char * dirt)
{
- unsigned long indtmp, indblock;
+ u32 indtmp, indblock;
struct super_block * sb;
struct buffer_head * indbh;
unsigned int i;
sysv_zone_t * ind;
- unsigned long tmp, block;
+ u32 tmp, block;
int retry = 0;
indblock = indtmp = *p;