svn commit: r251731 - stable/9/sys/fs/ext2fs

[Pedro F. Giffuni]

Author: pfg
Date: Fri Jun 14 03:58:52 2013
New Revision: 251731
URL: http://svnweb.freebsd.org/changeset/base/251731

Log:
  MFC	r251562, r251612:
  
  Miscellaneous cleanups for ext2fs:
  
  - e2fs_bpg and e2fs_isize are always unsigned.
  
  - s/file system/filesystem/g (from ffs r96755)

Modified:
  stable/9/sys/fs/ext2fs/ext2_alloc.c
  stable/9/sys/fs/ext2fs/ext2_balloc.c
  stable/9/sys/fs/ext2fs/ext2_vfsops.c
  stable/9/sys/fs/ext2fs/ext2fs.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/ext2fs/ext2_alloc.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_alloc.c	Fri Jun 14 03:42:10 2013	(r251730)
+++ stable/9/sys/fs/ext2fs/ext2_alloc.c	Fri Jun 14 03:58:52 2013	(r251731)
@@ -63,7 +63,7 @@ static daddr_t	ext2_nodealloccg(struct i
 static daddr_t  ext2_mapsearch(struct m_ext2fs *, char *, daddr_t);
 
 /*
- * Allocate a block in the file system.
+ * Allocate a block in the filesystem.
  *
  * A preference may be optionally specified. If a preference is given
  * the following hierarchy is used to allocate a block:
@@ -125,8 +125,8 @@ ext2_alloc(struct inode *ip, int32_t lbn
         }
 nospace:
 	EXT2_UNLOCK(ump);
-	ext2_fserr(fs, cred->cr_uid, "file system full");
-	uprintf("\n%s: write failed, file system is full\n", fs->e2fs_fsmnt);
+	ext2_fserr(fs, cred->cr_uid, "filesystem full");
+	uprintf("\n%s: write failed, filesystem is full\n", fs->e2fs_fsmnt);
 	return (ENOSPC);
 }
 
@@ -338,7 +338,7 @@ fail:
 }
 
 /*
- * Allocate an inode in the file system.
+ * Allocate an inode in the filesystem.
  * 
  */
 int
@@ -1096,7 +1096,7 @@ ext2_mapsearch(struct m_ext2fs *fs, char
 }
 
 /*
- * Fserr prints the name of a file system with an error diagnostic.
+ * Fserr prints the name of a filesystem with an error diagnostic.
  * 
  * The form of the error message is:
  *	fs: error message

Modified: stable/9/sys/fs/ext2fs/ext2_balloc.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_balloc.c	Fri Jun 14 03:42:10 2013	(r251730)
+++ stable/9/sys/fs/ext2fs/ext2_balloc.c	Fri Jun 14 03:58:52 2013	(r251731)
@@ -50,7 +50,7 @@
 #include <fs/ext2fs/ext2_extern.h>
 #include <fs/ext2fs/ext2_mount.h>
 /*
- * Balloc defines the structure of file system storage
+ * Balloc defines the structure of filesystem storage
  * by allocating the physical blocks on a device given
  * the inode and the logical block number in a file.
  */

Modified: stable/9/sys/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_vfsops.c	Fri Jun 14 03:42:10 2013	(r251730)
+++ stable/9/sys/fs/ext2fs/ext2_vfsops.c	Fri Jun 14 03:58:52 2013	(r251731)
@@ -748,7 +748,7 @@ ext2_flushfiles(struct mount *mp, int fl
 	return (error);
 }
 /*
- * Get file system statistics.
+ * Get filesystem statistics.
  */
 int
 ext2_statfs(struct mount *mp, struct statfs *sbp)
@@ -853,7 +853,7 @@ loop:
 	}
 
 	/*
-	 * Force stale file system control information to be flushed.
+	 * Force stale filesystem control information to be flushed.
 	 */
 	if (waitfor != MNT_LAZY) {
 		vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY);

Modified: stable/9/sys/fs/ext2fs/ext2fs.h
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2fs.h	Fri Jun 14 03:42:10 2013	(r251730)
+++ stable/9/sys/fs/ext2fs/ext2fs.h	Fri Jun 14 03:58:52 2013	(r251731)
@@ -153,7 +153,7 @@ struct m_ext2fs {
 	char     e2fs_fmod;       /* super block modified flag */
 	uint32_t e2fs_bsize;      /* Block size */
 	uint32_t e2fs_bshift;     /* calc of logical block no */
-	int32_t  e2fs_bpg;	  /* Number of blocks per group */
+	uint32_t e2fs_bpg;	  /* Number of blocks per group */
 	int64_t  e2fs_qbmask;     /* = s_blocksize -1 */
 	uint32_t e2fs_fsbtodb;    /* Shift to get disk block */
 	uint32_t e2fs_ipg;	  /* Number of inodes per group */
@@ -164,7 +164,7 @@ struct m_ext2fs {
 	uint32_t e2fs_fpg;	  /* Number of fragments per group */
 	uint32_t e2fs_gdbcount;   /* Number of group descriptors */
 	uint32_t e2fs_gcount;     /* Number of groups */
-	int32_t  e2fs_isize;      /* Size of inode */
+	uint32_t e2fs_isize;	  /* Size of inode */
 	uint32_t e2fs_total_dir;  /* Total number of directories */
 	uint8_t	*e2fs_contigdirs; /* (u) # of contig. allocated dirs */
 	char     e2fs_wasvalid;   /* valid at mount time */