patch-2.3.32 linux/fs/ntfs/fs.c

• Lines: 32
• Date: Thu Dec 9 13:14:30 1999
• Orig file: v2.3.31/linux/fs/ntfs/fs.c
• Orig date: Tue Dec 7 09:32:48 1999

diff -u --recursive --new-file v2.3.31/linux/fs/ntfs/fs.c linux/fs/ntfs/fs.c
@@ -812,6 +812,7 @@
 	struct statfs fs;
 	struct inode *mft;
 	ntfs_volume *vol;
+	ntfs_u64 size;
 	int error;
 
 	ntfs_debug(DEBUG_OTHER, "ntfs_statfs\n");
@@ -820,16 +821,21 @@
 	fs.f_type=NTFS_SUPER_MAGIC;
 	fs.f_bsize=vol->clustersize;
 
-	error = ntfs_get_volumesize( NTFS_SB2VOL( sb ), &fs.f_blocks );
+	error = ntfs_get_volumesize( NTFS_SB2VOL( sb ), &size );
 	if( error )
 		return -error;
+	fs.f_blocks = size;	/* volumesize is in clusters */
 	fs.f_bfree=ntfs_get_free_cluster_count(vol->bitmap);
 	fs.f_bavail=fs.f_bfree;
 
 	/* Number of files is limited by free space only, so we lie here */
 	fs.f_ffree=0;
 	mft=iget(sb,FILE_MFT);
-	fs.f_files=mft->i_size >> vol->mft_recordbits;
+	if (!mft)
+		return -EIO;
+	/* So ... we lie... thus this following cast of loff_t value
+	   is ok here.. */
+	fs.f_files = (unsigned long)mft->i_size / vol->mft_recordsize;
 	iput(mft);
 
 	/* should be read from volume */