patch-1.3.99 linux/fs/isofs/inode.c

• Lines: 117
• Date: Mon May 6 07:28:52 1996
• Orig file: v1.3.98/linux/fs/isofs/inode.c
• Orig date: Sat Apr 27 15:19:58 1996

diff -u --recursive --new-file v1.3.98/linux/fs/isofs/inode.c linux/fs/isofs/inode.c
@@ -88,15 +88,15 @@
 	        if (strncmp(this_char,"norock",6) == 0) {
 		  popt->rock = 'n';
 		  continue;
-		};
+		}
 	        if (strncmp(this_char,"unhide",6) == 0) {
 		  popt->unhide = 'y';
 		  continue;
-		};
+		}
 	        if (strncmp(this_char,"cruft",5) == 0) {
 		  popt->cruft = 'y';
 		  continue;
-		};
+		}
 		if ((value = strchr(this_char,'=')) != NULL)
 			*value++ = 0;
 		if (!strcmp(this_char,"map") && value) {
@@ -134,7 +134,7 @@
 		    if(*vpnt <  '0' || *vpnt > '9') break;
 		    ivalue = ivalue * 10 + (*vpnt - '0');
 		    vpnt++;
-		  };
+		  }
 		  if (*vpnt) return 0;
 		  switch(*this_char) {
 		  case 'b':
@@ -241,8 +241,8 @@
 	  while (i != 1){
 	    blocksize_bits++;
 	    i >>=1;
-	  };
-	};
+	  }
+	}
 	set_blocksize(dev, opt.blocksize);
 
 	lock_super(s);
@@ -251,15 +251,15 @@
 
 	vol_desc_start = isofs_get_last_session(dev);
 	
-	for (iso_blknum = vol_desc_start+16; iso_blknum < vol_desc_start+100; iso_blknum++) {
-#if 0
-	        printk("isofs.inode: iso_blknum=%d\n", iso_blknum);
-#endif 0
-		if (!(bh = bread(dev, iso_blknum << (ISOFS_BLOCK_BITS-blocksize_bits), opt.blocksize))) {
+	for (iso_blknum = vol_desc_start+16;
+             iso_blknum < vol_desc_start+100; iso_blknum++) {
+                int b = iso_blknum << (ISOFS_BLOCK_BITS-blocksize_bits);
+
+		if (!(bh = bread(dev,b,opt.blocksize))) {
 			s->s_dev = 0;
 			printk("isofs_read_super: bread failed, dev "
-			       "%s iso_blknum %d\n",
-			       kdevname(dev), iso_blknum);
+			       "%s iso_blknum %d block %d\n",
+			       kdevname(dev), iso_blknum, b);
 			unlock_super(s);
 			MOD_DEC_USE_COUNT;
 			return NULL;
@@ -280,7 +280,7 @@
 		        opt.rock = 'n';
 		        h_pri = (struct hs_primary_descriptor *)vdp;
 			break;
-		};
+		}
 		
 		if (strncmp (vdp->id, ISO_STANDARD_ID, sizeof vdp->id) == 0) {
 		  if (isonum_711 (vdp->type) != ISO_VD_PRIMARY)
@@ -290,7 +290,7 @@
 		
 		        pri = (struct iso_primary_descriptor *)vdp;
 			break;
-	        };
+	        }
 
 		brelse(bh);
 	      }
@@ -301,8 +301,7 @@
 		unlock_super(s);
 		MOD_DEC_USE_COUNT;
 		return NULL;
-	};
-	
+	}
 	
 	if(high_sierra){
 	  rootp = (struct iso_directory_record *) h_pri->root_directory_record;
@@ -311,7 +310,7 @@
 	    printk("Multi-volume disks not (yet) supported.\n");
 	    goto out;
 #endif
-	  };
+	  }
 	  s->u.isofs_sb.s_nzones = isonum_733 (h_pri->volume_space_size);
 	  s->u.isofs_sb.s_log_zone_size = isonum_723 (h_pri->logical_block_size);
 	  s->u.isofs_sb.s_max_size = isonum_733(h_pri->volume_space_size);
@@ -322,7 +321,7 @@
 	    printk("Multi-volume disks not (yet) supported.\n");
 	    goto out;
 #endif
-	  };
+	  }
 	  s->u.isofs_sb.s_nzones = isonum_733 (pri->volume_space_size);
 	  s->u.isofs_sb.s_log_zone_size = isonum_723 (pri->logical_block_size);
 	  s->u.isofs_sb.s_max_size = isonum_733(pri->volume_space_size);
@@ -793,7 +792,7 @@
 			if(!(bh = bread(parent->i_dev,block,bufsize))) {
  			        kfree(cpnt);
 				return -1;
-			};
+			}
  			memcpy((char *)cpnt+frag1, bh->b_data, offset);
 		}