patch-2.4.6 linux/fs/freevxfs/vxfs_bmap.c

• Lines: 68
• Date: Wed Jun 27 17:10:55 2001
• Orig file: v2.4.5/linux/fs/freevxfs/vxfs_bmap.c
• Orig date: Thu May 24 15:00:59 2001

diff -u --recursive --new-file v2.4.5/linux/fs/freevxfs/vxfs_bmap.c linux/fs/freevxfs/vxfs_bmap.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#ident "$Id: vxfs_bmap.c,v 1.20 2001/04/25 18:11:23 hch Exp hch $"
+#ident "$Id: vxfs_bmap.c,v 1.22 2001/05/26 22:41:23 hch Exp hch $"
 
 /*
  * Veritas filesystem driver - filesystem to disk block mapping.
@@ -70,7 +70,7 @@
 	struct super_block		*sbp = ip->i_sb;
 	kdev_t				dev = ip->i_dev;
 	u_long				bsize = sbp->s_blocksize;
-	u_long				size = 0;
+	long				size = 0;
 	int				i;
 
 	for (i = 0; i < VXFS_NDADDR; i++) {
@@ -135,7 +135,7 @@
 
 	for (i = 0; i < size * VXFS_TYPED_PER_BLOCK(ip->i_sb); i++) {
 		struct vxfs_typed	*typ;
-		u_int64_t		off;
+		int64_t			off;
 
 		bp = bread(ip->i_dev,
 				indir + (i / VXFS_TYPED_PER_BLOCK(ip->i_sb)),
@@ -166,10 +166,12 @@
 			goto out;
 		case VXFS_TYPED_INDIRECT_DEV4:
 		case VXFS_TYPED_DATA_DEV4: {
-			struct vxfs_typed_dev4	*typ4 = (struct vxfs_typed_dev4 *)typ;
+			struct vxfs_typed_dev4	*typ4 =
+				(struct vxfs_typed_dev4 *)typ;
+
 			printk(KERN_INFO "\n\nTYPED_DEV4 detected!\n");
-			printk(KERN_INFO "block: %Ld\tsize: %Ld\tdev: %d\n",
-			       (long long)typ4->vd4_block, (long long)typ4->vd4_size, typ4->vd4_dev);
+			printk(KERN_INFO "block: %Lu\tsize: %Ld\tdev: %d\n",
+				typ4->vd4_block, typ4->vd4_size, typ4->vd4_dev);
 			goto fail;
 		}
 		default:
@@ -205,7 +207,7 @@
 
 	for (i = 0; i < VXFS_NTYPED; i++) {
 		struct vxfs_typed	*typ = vip->vii_org.typed + i;
-		u_int64_t		off = (typ->vt_hdr & VXFS_TYPED_OFFSETMASK);
+		int64_t			off = (typ->vt_hdr & VXFS_TYPED_OFFSETMASK);
 
 #ifdef DIAGNOSTIC
 		vxfs_typdump(typ);
@@ -225,10 +227,12 @@
 			break;
 		case VXFS_TYPED_INDIRECT_DEV4:
 		case VXFS_TYPED_DATA_DEV4: {
-			struct vxfs_typed_dev4	*typ4 = (struct vxfs_typed_dev4 *)typ;
+			struct vxfs_typed_dev4	*typ4 =
+				(struct vxfs_typed_dev4 *)typ;
+
 			printk(KERN_INFO "\n\nTYPED_DEV4 detected!\n");
-			printk(KERN_INFO "block: %Ld\tsize: %Ld\tdev: %d\n",
-			       (long long)typ4->vd4_block, (long long)typ4->vd4_size, typ4->vd4_dev);
+			printk(KERN_INFO "block: %Lu\tsize: %Ld\tdev: %d\n",
+				typ4->vd4_block, typ4->vd4_size, typ4->vd4_dev);
 			return 0;
 		}
 		default: