[src/netbsd-3-0]: src/sys/ufs/ffs Pull up following revision(s) (requested by...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9fae43c24a43
branches:  netbsd-3-0
changeset: 579355:9fae43c24a43
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Dec 06 13:28:29 2006 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #1598):
        sys/ufs/ffs/ffs_snapshot.c: revision 1.38
On snapshot creation be sure the snapshot vnode has valid quota information.
Fixes PR kern/35121

diffstat:

 sys/ufs/ffs/ffs_snapshot.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r bee3f4035be5 -r 9fae43c24a43 sys/ufs/ffs/ffs_snapshot.c
--- a/sys/ufs/ffs/ffs_snapshot.c        Sat Dec 02 12:51:23 2006 +0000
+++ b/sys/ufs/ffs/ffs_snapshot.c        Wed Dec 06 13:28:29 2006 +0000
@@ -36,10 +36,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.11.2.7 2005/05/28 12:47:14 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.11.2.7.2.1 2006/12/06 13:28:29 tron Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
+#include "opt_quota.h"
 #endif
 
 #include <sys/param.h>
@@ -184,6 +185,10 @@
            VTOI(vp)->i_uid != p->p_ucred->cr_uid)
                return EACCES;
 
+#ifdef QUOTA
+       if ((error = getinoquota(VTOI(vp))) != 0)
+               return error;
+#endif
        if (vp->v_size != 0) {
                error = VOP_TRUNCATE(vp, 0, 0, NOCRED, p);
                if (error)