From owner-svn-src-projects@FreeBSD.ORG Mon Aug 9 23:29:37 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B530F1065676; Mon, 9 Aug 2010 23:29:37 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8A5518FC0C; Mon, 9 Aug 2010 23:29:37 +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 o79NTbkl039064; Mon, 9 Aug 2010 23:29:37 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o79NTbdf039060; Mon, 9 Aug 2010 23:29:37 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201008092329.o79NTbdf039060@svn.freebsd.org> From: Jeff Roberson Date: Mon, 9 Aug 2010 23:29:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211128 - in projects/suj/6/sys/ufs: ffs ufs X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2010 23:29:37 -0000 Author: jeff Date: Mon Aug 9 23:29:37 2010 New Revision: 211128 URL: http://svn.freebsd.org/changeset/base/211128 Log: - Correct porting errors; p_ru is not always valid in 6, and i_ino was removed incompletely. Modified: projects/suj/6/sys/ufs/ffs/ffs_inode.c projects/suj/6/sys/ufs/ffs/ffs_softdep.c projects/suj/6/sys/ufs/ufs/inode.h Modified: projects/suj/6/sys/ufs/ffs/ffs_inode.c ============================================================================== --- projects/suj/6/sys/ufs/ffs/ffs_inode.c Mon Aug 9 23:28:23 2010 (r211127) +++ projects/suj/6/sys/ufs/ffs/ffs_inode.c Mon Aug 9 23:29:37 2010 (r211128) @@ -599,7 +599,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, lev vp = ITOV(ip); bp = getblk(vp, lbn, (int)fs->fs_bsize, 0, 0, 0); if ((bp->b_flags & B_CACHE) == 0) { - curproc->p_ru->ru_inblock++; /* pay for read */ + curproc->p_stats->p_ru.ru_inblock++; /* pay for read */ bp->b_iocmd = BIO_READ; bp->b_flags &= ~B_INVAL; bp->b_ioflags &= ~BIO_ERROR; Modified: projects/suj/6/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- projects/suj/6/sys/ufs/ffs/ffs_softdep.c Mon Aug 9 23:28:23 2010 (r211127) +++ projects/suj/6/sys/ufs/ffs/ffs_softdep.c Mon Aug 9 23:29:37 2010 (r211128) @@ -873,7 +873,7 @@ static struct jremref *newjremref(struct struct inode *ip, off_t, nlink_t); static struct jaddref *newjaddref(struct inode *, ino_t, off_t, int16_t, uint16_t); -static inline void newinoref(struct inoref *, ino_t, ino_t, off_t, nlink_t, +static void newinoref(struct inoref *, ino_t, ino_t, off_t, nlink_t, uint16_t); static inline struct jsegdep *inoref_jseg(struct inoref *); static struct jmvref *newjmvref(struct inode *, ino_t, off_t, off_t); @@ -3241,7 +3241,7 @@ newjremref(struct dirrem *dirrem, struct return (jremref); } -static inline void +static void newinoref(struct inoref *inoref, ino_t ino, ino_t parent, off_t diroff, nlink_t nlink, uint16_t mode) { Modified: projects/suj/6/sys/ufs/ufs/inode.h ============================================================================== --- projects/suj/6/sys/ufs/ufs/inode.h Mon Aug 9 23:28:23 2010 (r211127) +++ projects/suj/6/sys/ufs/ufs/inode.h Mon Aug 9 23:29:37 2010 (r211128) @@ -83,7 +83,6 @@ struct inode { doff_t i_endoff; /* End of useful stuff in directory. */ doff_t i_diroff; /* Offset in dir, where we found last entry. */ doff_t i_offset; /* Offset of free space in directory. */ - ino_t i_ino; /* Inode number of found directory. */ u_int32_t i_reclen; /* Size of found directory entry. */ union {