Date: Wed, 23 Aug 2017 15:43:59 +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-11@freebsd.org Subject: svn commit: r322814 - stable/11/sys/fs/ext2fs Message-ID: <201708231543.v7NFhxVY062394@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Wed Aug 23 15:43:59 2017 New Revision: 322814 URL: https://svnweb.freebsd.org/changeset/base/322814 Log: MFC r320146, r320170, 320842: Minor grammar changes and cleanups in order to facilitate future merges. Modified: stable/11/sys/fs/ext2fs/ext2_inode_cnv.c stable/11/sys/fs/ext2fs/ext2fs.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/ext2fs/ext2_inode_cnv.c ============================================================================== --- stable/11/sys/fs/ext2fs/ext2_inode_cnv.c Wed Aug 23 15:08:51 2017 (r322813) +++ stable/11/sys/fs/ext2fs/ext2_inode_cnv.c Wed Aug 23 15:43:59 2017 (r322814) @@ -126,7 +126,7 @@ ext2_ei2i(struct ext2fs_dinode *ei, struct inode *ip) ip->i_gid = ei->e2di_gid; ip->i_uid |= (uint32_t)ei->e2di_uid_high << 16; ip->i_gid |= (uint32_t)ei->e2di_gid_high << 16; - /* XXX use memcpy */ + for (i = 0; i < NDADDR; i++) ip->i_db[i] = ei->e2di_blocks[i]; for (i = 0; i < NIADDR; i++) @@ -176,7 +176,7 @@ ext2_i2ei(struct inode *ip, struct ext2fs_dinode *ei) ei->e2di_uid_high = ip->i_uid >> 16 & 0xffff; ei->e2di_gid = ip->i_gid & 0xffff; ei->e2di_gid_high = ip->i_gid >> 16 & 0xffff; - /* XXX use memcpy */ + for (i = 0; i < NDADDR; i++) ei->e2di_blocks[i] = ip->i_db[i]; for (i = 0; i < NIADDR; i++) Modified: stable/11/sys/fs/ext2fs/ext2fs.h ============================================================================== --- stable/11/sys/fs/ext2fs/ext2fs.h Wed Aug 23 15:08:51 2017 (r322813) +++ stable/11/sys/fs/ext2fs/ext2fs.h Wed Aug 23 15:43:59 2017 (r322814) @@ -374,9 +374,8 @@ struct ext2_gd { uint16_t ext4bgd_csum; /* group descriptor checksum */ }; - -/* EXT2FS metadatas are stored in little-endian byte order. These macros - * helps reading these metadatas +/* EXT2FS metadata is stored in little-endian byte order. These macros + * help reading it. */ #define e2fs_cgload(old, new, size) memcpy((new), (old), (size));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708231543.v7NFhxVY062394>