Date: Thu, 6 Jun 2013 03:18:08 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251447 - stable/9/sys/fs/ext2fs Message-ID: <201306060318.r563I8Dt061719@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Thu Jun 6 03:18:07 2013 New Revision: 251447 URL: http://svnweb.freebsd.org/changeset/base/251447 Log: MFC r251336, r251344, r251346: ext2fs: update Block Group Descriptor struct plus cosmetic fixes. Modified: stable/9/sys/fs/ext2fs/ext2_bmap.c stable/9/sys/fs/ext2fs/ext2_dinode.h stable/9/sys/fs/ext2fs/ext2_inode_cnv.c stable/9/sys/fs/ext2fs/ext2fs.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/ext2fs/ext2_bmap.c ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_bmap.c Wed Jun 5 23:53:00 2013 (r251446) +++ stable/9/sys/fs/ext2fs/ext2_bmap.c Thu Jun 6 03:18:07 2013 (r251447) @@ -47,8 +47,8 @@ #include <fs/ext2fs/inode.h> #include <fs/ext2fs/ext2fs.h> -#include <fs/ext2fs/ext2_mount.h> #include <fs/ext2fs/ext2_extern.h> +#include <fs/ext2fs/ext2_mount.h> /* * Bmap converts the logical block number of a file to its physical block Modified: stable/9/sys/fs/ext2fs/ext2_dinode.h ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_dinode.h Wed Jun 5 23:53:00 2013 (r251446) +++ stable/9/sys/fs/ext2fs/ext2_dinode.h Thu Jun 6 03:18:07 2013 (r251447) @@ -77,7 +77,8 @@ #define EXT3_EPOCH_MASK ((1 << EXT3_EPOCH_BITS) - 1) #define EXT3_NSEC_MASK (~0UL << EXT3_EPOCH_BITS) -#define E2DI_HAS_XTIME(ip) (EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs, EXT2F_ROCOMPAT_EXTRA_ISIZE)) +#define E2DI_HAS_XTIME(ip) (EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs, \ + EXT2F_ROCOMPAT_EXTRA_ISIZE)) /* * Structure of an inode on the disk Modified: stable/9/sys/fs/ext2fs/ext2_inode_cnv.c ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_inode_cnv.c Wed Jun 5 23:53:00 2013 (r251446) +++ stable/9/sys/fs/ext2fs/ext2_inode_cnv.c Thu Jun 6 03:18:07 2013 (r251447) @@ -115,7 +115,7 @@ ext2_i2ei(struct inode *ip, struct ext2f int i; ei->e2di_mode = ip->i_mode; - ei->e2di_nlink = ip->i_nlink; + ei->e2di_nlink = ip->i_nlink; /* Godmar thinks: if dtime is nonzero, ext2 says this inode has been deleted, this would correspond to a zero link count Modified: stable/9/sys/fs/ext2fs/ext2fs.h ============================================================================== --- stable/9/sys/fs/ext2fs/ext2fs.h Wed Jun 5 23:53:00 2013 (r251446) +++ stable/9/sys/fs/ext2fs/ext2fs.h Thu Jun 6 03:18:07 2013 (r251447) @@ -281,9 +281,13 @@ struct ext2_gd { uint32_t ext2bgd_i_tables; /* inodes table block */ uint16_t ext2bgd_nbfree; /* number of free blocks */ uint16_t ext2bgd_nifree; /* number of free inodes */ - uint16_t ext2bgd_ndirs; /* number of directories */ - uint16_t reserved; - uint32_t reserved2[3]; + uint16_t ext2bgd_ndirs; /* number of directories */ + uint16_t ext2bgd_flags; /* block group flags */ + uint32_t ext2bgd_x_bitmap; /* snapshot exclusion bitmap loc. */ + uint16_t ext2bgd_b_bmap_csum; /* block bitmap checksum */ + uint16_t ext2bgd_i_bmap_csum; /* inode bitmap checksum */ + uint16_t ext2bgd_i_unused; /* unused inode count */ + uint16_t ext2bgd_csum; /* group descriptor checksum */ }; /* cluster summary information */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306060318.r563I8Dt061719>