commit ef9abe5f2529b3a42b46bf64c5f4232f86e7b390
author Theodore Ts'o <tytso@mit.edu> Mon Jan 01 15:31:53 2001 +0000
committer Theodore Ts'o <tytso@mit.edu> Mon Jan 01 15:31:53 2001 +0000
tree 03f7ee8b17fdf946d0a2987dd09fbb4bd4cf2cdc
parent b21e38a0df0111f527f7b286ff9119534de04c09

ChangeLog, e2image.c, mke2fs.c:
  mke2fs.c, e2image.c: Removed references to struct ext2fs_sb to struct
  	ext2_super_block.

misc/ChangeLog

diff --git a/misc/ChangeLog b/misc/ChangeLog
index bc2764d..3a02bd3 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,11 +1,14 @@
 2001-01-01    <tytso@snap.thunk.org>
 
+	* mke2fs.c, e2image.c: Removed references to struct ext2fs_sb to
+		struct ext2_super_block.
+
 	* tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be
 		cleared, but only if the filesystem is unmounted or
 		mounted read-only.  Changed struct ext2fs_sb to struct
-		ext2_super, and cleaned up old code which was needed for
-		old versions of ext2_fs.h (not needed since we're using
-		our own version now).
+		ext2_super_block, and cleaned up old code which was needed
+		for old versions of ext2_fs.h (not needed since we're
+		using our own version now).
 
 2000-12-31    <tytso@snap.thunk.org>
 

misc/e2image.c

diff --git a/misc/e2image.c b/misc/e2image.c
index 0dcc019..24dcdd7 100644
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -84,7 +84,6 @@
 	char * tmp;
 	errcode_t retval;
 	ext2_filsys fs;
-	struct ext2fs_sb *sb;
 	int open_flag = 0;
 	int raw_flag = 0;
 	int fd = 0;
@@ -121,7 +120,6 @@
 		printf(_("Couldn't find valid filesystem superblock.\n"));
 		exit(1);
 	}
-	sb = (struct ext2fs_sb *) fs->super;
 
 	fd = open(argv[optind+1], O_CREAT|O_TRUNC|O_RDWR, 0600);
 	if (fd < 0) {

misc/mke2fs.c

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index fe81afa..a6161d6 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -229,7 +229,7 @@
 	{ 0, 0, 0, 0},
 };
 
-static void set_fs_defaults(char *fs_type, struct ext2fs_sb *super,
+static void set_fs_defaults(char *fs_type, struct ext2_super_block *super,
 			    int blocksize, int *inode_ratio)
 {
 	int	megs;
@@ -571,7 +571,7 @@
 
 static void show_stats(ext2_filsys fs)
 {
-	struct ext2fs_sb 	*s = (struct ext2fs_sb *) fs->super;
+	struct ext2_super_block *s = fs->super;
 	char 			buf[80];
 	blk_t			group_block;
 	int			i, need, col_left;
@@ -816,7 +816,7 @@
 	errcode_t	retval;
 	int		sparse_option = 1;
 	char *		oldpath = getenv("PATH");
-	struct ext2fs_sb *param_ext2 = (struct ext2fs_sb *) &param;
+	struct ext2_super_block *param_ext2 = &param;
 	char *		raid_opts = 0;
 	char *		journal_opts = 0;
 	char *		fs_type = 0;
@@ -1105,7 +1105,6 @@
 	ext2_filsys	fs;
 	badblocks_list	bb_list = 0;
 	int		journal_blocks;
-	struct ext2fs_sb *s;
 
 #ifdef ENABLE_NLS
 	setlocale(LC_MESSAGES, "");
@@ -1132,8 +1131,7 @@
 	/*
 	 * Generate a UUID for it...
 	 */
-	s = (struct ext2fs_sb *) fs->super;
-	uuid_generate(s->s_uuid);
+	uuid_generate(fs->super->s_uuid);
 
 	/*
 	 * Override the creator OS, if applicable
@@ -1155,18 +1153,20 @@
 	 * Set the volume label...
 	 */
 	if (volume_label) {
-		memset(s->s_volume_name, 0, sizeof(s->s_volume_name));
-		strncpy(s->s_volume_name, volume_label,
-			sizeof(s->s_volume_name));
+		memset(fs->super->s_volume_name, 0,
+		       sizeof(fs->super->s_volume_name));
+		strncpy(fs->super->s_volume_name, volume_label,
+			sizeof(fs->super->s_volume_name));
 	}
 
 	/*
 	 * Set the last mount directory
 	 */
 	if (mount_dir) {
-		memset(s->s_last_mounted, 0, sizeof(s->s_last_mounted));
-		strncpy(s->s_last_mounted, mount_dir,
-			sizeof(s->s_last_mounted));
+		memset(fs->super->s_last_mounted, 0,
+		       sizeof(fs->super->s_last_mounted));
+		strncpy(fs->super->s_last_mounted, mount_dir,
+			sizeof(fs->super->s_last_mounted));
 	}
 	
 	if (!quiet || noaction)