From owner-svn-src-all@FreeBSD.ORG Tue Feb 1 18:30:53 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67C801065670; Tue, 1 Feb 2011 18:30:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3C2E58FC0C; Tue, 1 Feb 2011 18:30:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p11IUrrZ081229; Tue, 1 Feb 2011 18:30:53 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p11IUrqY081225; Tue, 1 Feb 2011 18:30:53 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102011830.p11IUrqY081225@svn.freebsd.org> From: John Baldwin Date: Tue, 1 Feb 2011 18:30:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218176 - head/sys/fs/ext2fs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Feb 2011 18:30:53 -0000 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 #include -#include #include +#include +#include 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 @@ -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_ */