Module Name: src
Committed By: matt
Date: Fri Sep 5 06:10:08 UTC 2014
Modified Files:
src/sys/ufs/ffs: ffs_snapshot.c
Log Message:
Don't nest structure definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/ufs/ffs/ffs_snapshot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.136 src/sys/ufs/ffs/ffs_snapshot.c:1.137
--- src/sys/ufs/ffs/ffs_snapshot.c:1.136 Thu Jul 10 06:02:40 2014
+++ src/sys/ufs/ffs/ffs_snapshot.c Fri Sep 5 06:10:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.136 2014/07/10 06:02:40 dholland Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.137 2014/09/05 06:10:07 matt Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.136 2014/07/10 06:02:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.137 2014/09/05 06:10:07 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -77,11 +77,13 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_snapshot
#include <uvm/uvm.h>
+TAILQ_HEAD(inodelst, inode); /* List of active snapshots */
+
struct snap_info {
kmutex_t si_lock; /* Lock this snapinfo */
kmutex_t si_snaplock; /* Snapshot vnode common lock */
lwp_t *si_owner; /* Sanplock owner */
- TAILQ_HEAD(inodelst, inode) si_snapshots; /* List of active snapshots */
+ struct inodelst si_snapshots; /* List of active snapshots */
daddr_t *si_snapblklist; /* Snapshot block hints list */
uint32_t si_gen; /* Incremented on change */
};
