summaryrefslogtreecommitdiffstats
path: root/fs/ntfs/super.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
commitc7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch)
tree3682407a599b8f9f03fc096298134cafba1c9b2f /fs/ntfs/super.c
parent1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff)
o Merge with Linux 2.1.116.
o New Newport console code. o New G364 console code.
Diffstat (limited to 'fs/ntfs/super.c')
-rw-r--r--fs/ntfs/super.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index f4f82cd9a..7c7b005d3 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -32,7 +32,7 @@
int ntfs_fixup_record(ntfs_volume *vol, char *record, char *magic, int size)
{
int start, count, offset;
- short fixup;
+ unsigned short fixup;
if(!IS_MAGIC(record,magic))
return 0;
@@ -483,13 +483,14 @@ ntfs_search_bits(ntfs_inode* bitmap, int *location, int *count, int flags)
error=ntfs_read_attr(bitmap,bitmap->vol->at_data,
0,start,&io);
if(error)goto fail;
- if(io.size==0)
+ if(io.size==0) {
if(found)
goto success;
else{
error=ENOSPC;
goto fail;
}
+ }
loc=start*8;
cnt=*count;
error=search_bits(bits,&loc,&cnt,io.size);