diff options
| author | jhb <jhb@FreeBSD.org> | 2011-02-01 18:30:52 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2011-02-01 18:30:52 +0000 |
| commit | 6121863a62b2549ad05ac2fa330bdfff7f04d3db (patch) | |
| tree | c3ce419ab951938fe3e5ee9c97ed5f99d361d3d7 | |
| parent | 3ce37d1bc3e4097526958b97e4c104e73253237d (diff) | |
| download | FreeBSD-src-6121863a62b2549ad05ac2fa330bdfff7f04d3db.zip FreeBSD-src-6121863a62b2549ad05ac2fa330bdfff7f04d3db.tar.gz | |
Some cosmetic fixes and remove a duplicate constant.
Submitted by: Pedro F. Giffuni giffunip at yahoo
| -rw-r--r-- | sys/fs/ext2fs/ext2_mount.h | 2 | ||||
| -rw-r--r-- | sys/fs/ext2fs/ext2_vfsops.c | 5 | ||||
| -rwxr-xr-x | sys/fs/ext2fs/ext2fs.h | 10 |
3 files changed, 7 insertions, 10 deletions
diff --git a/sys/fs/ext2fs/ext2_mount.h b/sys/fs/ext2fs/ext2_mount.h index 6bc051c..f995267 100644 --- a/sys/fs/ext2fs/ext2_mount.h +++ b/sys/fs/ext2fs/ext2_mount.h @@ -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_ */ diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c index 7329eae..041a3a5 100644 --- a/sys/fs/ext2fs/ext2_vfsops.c +++ b/sys/fs/ext2fs/ext2_vfsops.c @@ -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, struct ext2fs *es, 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; diff --git a/sys/fs/ext2fs/ext2fs.h b/sys/fs/ext2fs/ext2fs.h index 9e69f1d..b546cac 100755 --- a/sys/fs/ext2fs/ext2fs.h +++ b/sys/fs/ext2fs/ext2fs.h @@ -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_ */ |
