From owner-cvs-sys  Wed Nov  6 02:14:23 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA08556
          for cvs-sys-outgoing; Wed, 6 Nov 1996 02:14:23 -0800 (PST)
Received: (from phk@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA08524;
          Wed, 6 Nov 1996 02:14:06 -0800 (PST)
Date: Wed, 6 Nov 1996 02:14:06 -0800 (PST)
From: Poul-Henning Kamp <phk>
Message-Id: <199611061014.CAA08524@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/ufs/mfs mfsnode.h src/sys/ufs/ufs ufs_vnops.c src/sys/ufs/ffs ffs_inode.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

phk         96/11/06 02:14:05

  Branch:      sys/ufs/ffs  RELENG_2_2
               sys/ufs/mfs  RELENG_2_2
               sys/ufs/ufs  RELENG_2_2
  Modified:    sys/ufs/ffs  ffs_inode.c
               sys/ufs/mfs  mfsnode.h
               sys/ufs/ufs  ufs_vnops.c
  Log:
  Merge from -current
  
  Revision  Changes    Path
  1.21.2.1  +12 -7     src/sys/ufs/ffs/ffs_inode.c
  1.4.2.1   +2 -2      src/sys/ufs/mfs/mfsnode.h
  1.41.2.1  +30 -6     src/sys/ufs/ufs/ufs_vnops.c