From owner-svn-src-head@FreeBSD.ORG Thu Jun 13 03:23:25 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B52C7E7E; Thu, 13 Jun 2013 03:23:25 +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 8E2B3145B; Thu, 13 Jun 2013 03:23:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D3NPkq072307; Thu, 13 Jun 2013 03:23:25 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D3NPfF072301; Thu, 13 Jun 2013 03:23:25 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201306130323.r5D3NPfF072301@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Thu, 13 Jun 2013 03:23:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251677 - 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: Thu, 13 Jun 2013 03:23:25 -0000 Author: pfg Date: Thu Jun 13 03:23:24 2013 New Revision: 251677 URL: http://svnweb.freebsd.org/changeset/base/251677 Log: Relax some unnecessary unsigned type changes in ext2fs. While the changes in r245820 are in line with the ext2 spec, the code derived from UFS can use negative values so it is better to relax some types to keep them as they were, and somewhat more similar to UFS. While here clean some casts. Some of the original types are still wrong and will require more work. Discussed with: bde MFC after: 3 days Modified: head/sys/fs/ext2fs/ext2_alloc.c head/sys/fs/ext2fs/ext2_balloc.c Modified: head/sys/fs/ext2fs/ext2_alloc.c ============================================================================== --- head/sys/fs/ext2fs/ext2_alloc.c Thu Jun 13 02:20:45 2013 (r251676) +++ head/sys/fs/ext2fs/ext2_alloc.c Thu Jun 13 03:23:24 2013 (r251677) @@ -223,7 +223,7 @@ ext2_reallocblks(struct vop_reallocblks_ brelse(sbp); return (ENOSPC); } - sbap = (int32_t *)sbp->b_data; + sbap = (u_int *)sbp->b_data; soff = idp->in_off; } /* @@ -239,7 +239,7 @@ ext2_reallocblks(struct vop_reallocblks_ ssize = len - (idp->in_off + 1); if (bread(vp, idp->in_lbn, (int)fs->e2fs_bsize, NOCRED, &ebp)) goto fail; - ebap = (int32_t *)ebp->b_data; + ebap = (u_int *)ebp->b_data; } /* * Find the preferred location for the cluster. @@ -442,10 +442,10 @@ ext2_dirpref(struct inode *pip) { struct m_ext2fs *fs; int cg, prefcg, dirsize, cgsize; - int avgifree, avgbfree, avgndir, curdirsize; - int minifree, minbfree, maxndir; - int mincg, minndir; - int maxcontigdirs; + u_int avgifree, avgbfree, avgndir, curdirsize; + u_int minifree, minbfree, maxndir; + u_int mincg, minndir; + u_int maxcontigdirs; mtx_assert(EXT2_MTX(pip->i_ump), MA_OWNED); fs = pip->i_e2fs; Modified: head/sys/fs/ext2fs/ext2_balloc.c ============================================================================== --- head/sys/fs/ext2fs/ext2_balloc.c Thu Jun 13 02:20:45 2013 (r251676) +++ head/sys/fs/ext2fs/ext2_balloc.c Thu Jun 13 03:23:24 2013 (r251677) @@ -60,11 +60,11 @@ ext2_balloc(struct inode *ip, int32_t lb { struct m_ext2fs *fs; struct ext2mount *ump; - int32_t nb; struct buf *bp, *nbp; struct vnode *vp = ITOV(ip); struct indir indirs[NIADDR + 2]; - uint32_t newb, *bap, pref; + uint32_t nb, newb; + int32_t *bap, pref; int osize, nsize, num, i, error; *bpp = NULL; @@ -165,8 +165,8 @@ ext2_balloc(struct inode *ip, int32_t lb EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[0].in_off + EXT2_NDIR_BLOCKS, &ip->i_db[0], 0); - if ((error = ext2_alloc(ip, lbn, pref, - (int)fs->e2fs_bsize, cred, &newb))) + if ((error = ext2_alloc(ip, lbn, pref, fs->e2fs_bsize, cred, + &newb))) return (error); nb = newb; bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, 0, 0);