From owner-svn-src-head@FreeBSD.ORG Tue Jun 18 15:49:31 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4BE7E94; Tue, 18 Jun 2013 15:49:31 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3E5BA129F; Tue, 18 Jun 2013 15:49:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IFnV7w010650; Tue, 18 Jun 2013 15:49:31 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5IFnU5P010648; Tue, 18 Jun 2013 15:49:30 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201306181549.r5IFnU5P010648@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Tue, 18 Jun 2013 15:49:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251952 - head/sys/fs/ext2fs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 15:49:31 -0000 Author: pfg Date: Tue Jun 18 15:49:30 2013 New Revision: 251952 URL: http://svnweb.freebsd.org/changeset/base/251952 Log: More ext2fs header cleanups: - Set MAXMNTLEN nearer to where it is used. - Move EXT2_LINK_MAX to ext2_dir.h . MFC after: 3 days Modified: head/sys/fs/ext2fs/ext2_dir.h head/sys/fs/ext2fs/ext2fs.h Modified: head/sys/fs/ext2fs/ext2_dir.h ============================================================================== --- head/sys/fs/ext2fs/ext2_dir.h Tue Jun 18 15:31:43 2013 (r251951) +++ head/sys/fs/ext2fs/ext2_dir.h Tue Jun 18 15:49:30 2013 (r251952) @@ -53,6 +53,12 @@ struct ext2fs_direct_2 { uint8_t e2d_type; /* file type */ char e2d_name[EXT2FS_MAXNAMLEN];/* name with length<=EXT2FS_MAXNAMLEN */ }; + +/* + * Maximal count of links to a file + */ +#define EXT2_LINK_MAX 32000 + /* * Ext2 directory file types. Only the low 3 bits are used. The * other bits are reserved for now. Modified: head/sys/fs/ext2fs/ext2fs.h ============================================================================== --- head/sys/fs/ext2fs/ext2fs.h Tue Jun 18 15:31:43 2013 (r251951) +++ head/sys/fs/ext2fs/ext2fs.h Tue Jun 18 15:49:30 2013 (r251952) @@ -40,18 +40,6 @@ #include /* - * Maximal count of links to a file - */ -#define EXT2_LINK_MAX 32000 - -/* - * The path name on which the file system is mounted is maintained - * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in - * the super block for this name. - */ -#define MAXMNTLEN 512 - -/* * Super block for an ext2fs file system. */ struct ext2fs { @@ -121,6 +109,12 @@ struct ext2fs { uint32_t reserved2[162]; /* Padding to the end of the block */ }; +/* + * The path name on which the file system is mounted is maintained + * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in + * the super block for this name. + */ +#define MAXMNTLEN 512 /* * In-Memory Superblock