diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /fs/ntfs/super.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'fs/ntfs/super.c')
| -rw-r--r-- | fs/ntfs/super.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 51f14e72b..d7dcb127f 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -253,10 +253,9 @@ int ntfs_release_volume(ntfs_volume *vol) * Writes the volume size into vol_size. Returns 0 if successful * or error. */ -int ntfs_get_volumesize(ntfs_volume *vol, long *vol_size ) +int ntfs_get_volumesize(ntfs_volume *vol, ntfs_u64 *vol_size ) { ntfs_io io; - ntfs_u64 size; char *cluster0; if( !vol_size ) @@ -272,11 +271,8 @@ int ntfs_get_volumesize(ntfs_volume *vol, long *vol_size ) io.do_read=1; io.size=vol->clustersize; ntfs_getput_clusters(vol,0,0,&io); - size=NTFS_GETU64(cluster0+0x28); + *vol_size = NTFS_GETU64(cluster0+0x28); ntfs_free(cluster0); - /* FIXME: more than 2**32 cluster */ - /* FIXME: gcc will emit udivdi3 if we don't truncate it */ - *vol_size = ((unsigned long)size)/vol->clusterfactor; return 0; } |