patch-2.4.9 linux/fs/ntfs/inode.c

• Lines: 27
• Date: Wed Aug 15 01:22:17 2001
• Orig file: v2.4.8/linux/fs/ntfs/inode.c
• Orig date: Sun Aug 12 13:28:00 2001

diff -u --recursive --new-file v2.4.8/linux/fs/ntfs/inode.c linux/fs/ntfs/inode.c
@@ -105,7 +105,7 @@
 		 * will fall back to the minimal size allocation below. (AIA) */
 		block = vol->mft_record_size;
 		blockbits = vol->mft_record_size_bits;
-		size = max(size >> 10, mdata->size + vol->mft_record_size);
+		size = max(s64, size >> 10, mdata->size + vol->mft_record_size);
 		size = (__s64)((size + block - 1) >> blockbits) << blockbits;
 		/* Require this to be a single chunk. */
 		error = ntfs_extend_attr(vol->mft_ino, mdata, &size,
@@ -394,7 +394,7 @@
 		io.fn_put = ntfs_put;
 		io.fn_get = 0;
 		io.param = buf + delta;
-		io.size = len = min(datasize, 1024 - delta);
+		io.size = len = min(int, datasize, 1024 - delta);
 		ntfs_debug(DEBUG_FILE2, "load_attributes %x: len = %i\n",
 						ino->i_number, len);
 		ntfs_debug(DEBUG_FILE2, "load_attributes %x: delta = %i\n",
@@ -729,7 +729,7 @@
 		cluster = attr->d.r.runlist[rnum].cluster;
 		len = attr->d.r.runlist[rnum].len;
 		s_cluster = cluster + s_vcn - vcn;
-		chunk = min(((__s64)(vcn + len) << clustersizebits) - offset,
+		chunk = min(s64, ((__s64)(vcn + len) << clustersizebits) - offset,
 									l);
 		dest->size = chunk;
 		error = ntfs_getput_clusters(ino->vol, s_cluster, offset -