svn commit: r211128 - in projects/suj/6/sys/ufs: ffs ufs

[Jeff Roberson]

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 {