svn commit: r218176 - head/sys/fs/ext2fs
John Baldwin
jhb at FreeBSD.org
Tue Feb 1 18:30:53 UTC 2011
Author: jhb
Date: Tue Feb 1 18:30:52 2011
New Revision: 218176
URL: http://svn.freebsd.org/changeset/base/218176
Log:
Some cosmetic fixes and remove a duplicate constant.
Submitted by: Pedro F. Giffuni giffunip at yahoo
Modified:
head/sys/fs/ext2fs/ext2_mount.h
head/sys/fs/ext2fs/ext2_vfsops.c
head/sys/fs/ext2fs/ext2fs.h
Modified: head/sys/fs/ext2fs/ext2_mount.h
==============================================================================
--- head/sys/fs/ext2fs/ext2_mount.h Tue Feb 1 18:21:45 2011 (r218175)
+++ head/sys/fs/ext2fs/ext2_mount.h Tue Feb 1 18:30:52 2011 (r218176)
@@ -76,4 +76,4 @@ struct ext2mount {
#define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
#endif /* _KERNEL */
-#endif
+#endif /* !_FS_EXT2FS_EXT2_MOUNT_H_ */
Modified: head/sys/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vfsops.c Tue Feb 1 18:21:45 2011 (r218175)
+++ head/sys/fs/ext2fs/ext2_vfsops.c Tue Feb 1 18:30:52 2011 (r218176)
@@ -59,8 +59,9 @@
#include <fs/ext2fs/inode.h>
#include <fs/ext2fs/fs.h>
-#include <fs/ext2fs/ext2_extern.h>
#include <fs/ext2fs/ext2fs.h>
+#include <fs/ext2fs/ext2_dinode.h>
+#include <fs/ext2fs/ext2_extern.h>
static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td);
static int ext2_mountfs(struct vnode *, struct mount *);
@@ -329,7 +330,7 @@ compute_sb_data(struct vnode *devvp, str
fs->e2fs_fpg = es->e2fs_fpg;
fs->e2fs_ipg = es->e2fs_ipg;
if (es->e2fs_rev == E2FS_REV0) {
- fs->e2fs_first_inode = E2FS_REV0_FIRST_INO;
+ fs->e2fs_first_inode = EXT2_FIRSTINO;
fs->e2fs_isize = E2FS_REV0_INODE_SIZE ;
} else {
fs->e2fs_first_inode = es->e2fs_first_ino;
Modified: head/sys/fs/ext2fs/ext2fs.h
==============================================================================
--- head/sys/fs/ext2fs/ext2fs.h Tue Feb 1 18:21:45 2011 (r218175)
+++ head/sys/fs/ext2fs/ext2fs.h Tue Feb 1 18:30:52 2011 (r218176)
@@ -34,8 +34,8 @@
*
*/
-#ifndef _FS_EXT2FS_EXT2_FS_H
-#define _FS_EXT2FS_EXT2_FS_H
+#ifndef _FS_EXT2FS_EXT2_FS_H_
+#define _FS_EXT2FS_EXT2_FS_H_
#include <sys/types.h>
@@ -118,7 +118,6 @@ struct ext2fs {
u_int32_t reserved2[204];
};
-
/* Assume that user mode programs are passing in an ext2fs superblock, not
* a kernel struct super_block. This will allow us to call the feature-test
* macros from user land. */
@@ -166,9 +165,6 @@ struct m_ext2fs {
#define E2FS_DATE "95/08/09"
#define E2FS_VERSION "0.5b"
-/* First non-reserved inode for old ext2 filesystems */
-#define E2FS_REV0_FIRST_INO 11
-
/*
* The second extended file system magic number
*/
@@ -319,4 +315,4 @@ struct ext2_gd {
#endif
-#endif /* !_FS_EXT2FS_EXT2FS_H */
+#endif /* !_FS_EXT2FS_EXT2FS_H_ */
More information about the svn-src-head
mailing list