patch-2.2.0-pre8 linux/fs/ufs/super.c

• Lines: 154
• Date: Sun Jan 17 18:32:26 1999
• Orig file: v2.2.0-pre7/linux/fs/ufs/super.c
• Orig date: Wed Jan 13 15:00:43 1999

diff -u --recursive --new-file v2.2.0-pre7/linux/fs/ufs/super.c linux/fs/ufs/super.c
@@ -6,7 +6,7 @@
  * Charles University, Faculty of Mathematics and Physics
  */
 
-/* Derivated from
+/* Derived from
  *
  *  linux/fs/ext2/super.c
  *
@@ -26,7 +26,7 @@
  */
  
 /*
- * Inspirated by
+ * Inspired by
  *
  *  linux/fs/ufs/super.c
  *
@@ -92,7 +92,7 @@
 
 #ifdef UFS_SUPER_DEBUG_MORE
 /*
- * Print contents of ufs_super_block, useful for debuging
+ * Print contents of ufs_super_block, useful for debugging
  */
 void ufs_print_super_stuff(struct ufs_super_block_first * usb1,
 	struct ufs_super_block_second * usb2, 
@@ -137,7 +137,7 @@
 
 
 /*
- * Print contents of ufs_cylinder_group, useful for debuging
+ * Print contents of ufs_cylinder_group, useful for debugging
  */
 void ufs_print_cylinder_stuff(struct ufs_cylinder_group *cg, unsigned swab)
 {
@@ -231,10 +231,6 @@
 	sb->s_flags |= MS_RDONLY;
 	printk (KERN_CRIT "UFS-fs panic (device %s): %s: %s\n",
 		kdevname(sb->s_dev), function, error_buf);
-/*** 
-	panic ("UFS-fs panic (device %s): %s: %s\n", 
-		kdevname(sb->s_dev), function, error_buf);
-***/
 }
 
 void ufs_warning (struct super_block * sb, const char * function,
@@ -309,7 +305,7 @@
 }
 
 /*
- * Read on-disk structures asscoiated with cylinder groups
+ * Read on-disk structures associated with cylinder groups
  */
 int ufs_read_cylinder_structures (struct super_block * sb) {
 	struct ufs_sb_private_info * uspi;
@@ -391,7 +387,7 @@
 }
 
 /*
- * Put on-disk structures associated with cylidner groups and 
+ * Put on-disk structures associated with cylinder groups and 
  * write them back to disk
  */
 void ufs_put_cylinder_structures (struct super_block * sb) {
@@ -466,10 +462,10 @@
 		goto failed;
 	}
 	if (!(sb->u.ufs_sb.s_mount_opt & UFS_MOUNT_UFSTYPE)) {
-		printk("You didn't specify type of your ufs file system\n\n"
+		printk("You didn't specify the type of your ufs filesystem\n\n"
 		"       mount -t ufs -o ufstype=sun|44bsd|old|next|openstep ....\n\n"
-		"!!! WARNING !!! wrong value may corrupt you file system\n"
-		"default value is ufstype=old\n");
+		">>>WARNING<<< Wrong ufstype may corrupt your filesystem, "
+		"default is ufstype=old\n");
 		ufs_set_opt (sb->u.ufs_sb.s_mount_opt, UFSTYPE_OLD);
 	}
 
@@ -480,7 +476,7 @@
 
 	switch (sb->u.ufs_sb.s_mount_opt & UFS_MOUNT_UFSTYPE) {
 	case UFS_MOUNT_UFSTYPE_44BSD:
-		UFSD(("44bsd ufstype\n"))
+		UFSD(("ufstype=44bsd\n"))
 		uspi->s_fsize = block_size = 512;
 		uspi->s_fmask = ~(512 - 1);
 		uspi->s_fshift = 9;
@@ -490,7 +486,7 @@
 		break;
 		
 	case UFS_MOUNT_UFSTYPE_SUN:
-		UFSD(("sun  ufstype\n"))
+		UFSD(("ufstype=sun\n"))
 		uspi->s_fsize = block_size = 1024;
 		uspi->s_fmask = ~(1024 - 1);
 		uspi->s_fshift = 10;
@@ -500,7 +496,7 @@
 		break;
 
 	case UFS_MOUNT_UFSTYPE_OLD:
-		UFSD(("old ufstype\n"))
+		UFSD(("ufstype=old\n"))
 		uspi->s_fsize = block_size = 1024;
 		uspi->s_fmask = ~(1024 - 1);
 		uspi->s_fshift = 10;
@@ -508,13 +504,13 @@
 		uspi->s_sbbase = 0;
 		flags |= UFS_DE_OLD | UFS_UID_OLD | UFS_ST_OLD | UFS_CG_OLD;
 		if (!(sb->s_flags & MS_RDONLY)) {
-			printk("old type of ufs is supported read-only\n"); 
+			printk(KERN_INFO "ufstype=old is supported read-only\n"); 
 			sb->s_flags |= MS_RDONLY;
 		}
 		break;
 	
 	case UFS_MOUNT_UFSTYPE_NEXT:
-		UFSD(("next ufstype\n"))
+		UFSD(("ufstype=next\n"))
 		uspi->s_fsize = block_size = 1024;
 		uspi->s_fmask = ~(1024 - 1);
 		uspi->s_fshift = 10;
@@ -522,13 +518,13 @@
 		uspi->s_sbbase = 0;
 		flags |= UFS_DE_OLD | UFS_UID_OLD | UFS_ST_OLD | UFS_CG_OLD;
 		if (!(sb->s_flags & MS_RDONLY)) {
-			printk("nextstep type of ufs is supported read-only\n");
+			printk(KERN_INFO "ufstype=next is supported read-only\n");
 			sb->s_flags |= MS_RDONLY;
 		}
 		break;
 	
 	case UFS_MOUNT_UFSTYPE_OPENSTEP:
-		UFSD(("openstep ufstype\n"))
+		UFSD(("ufstype=openstep\n"))
 		uspi->s_fsize = block_size = 1024;
 		uspi->s_fmask = ~(1024 - 1);
 		uspi->s_fshift = 10;
@@ -536,13 +532,13 @@
 		uspi->s_sbbase = 0;
 		flags |= UFS_DE_44BSD | UFS_UID_44BSD | UFS_ST_44BSD | UFS_CG_44BSD;
 		if (!(sb->s_flags & MS_RDONLY)) {
-			printk("openstep type of ufs is supported read-only\n");
+			printk(KERN_INFO "ufstype=openstep is supported read-only\n");
 			sb->s_flags |= MS_RDONLY;
 		}
 		break;
 	
 	default:
-		printk("this fs type of ufs is not supported\n");
+		printk("unknown ufstype\n");
 		goto failed;
 	}