diff options
Diffstat (limited to 'lib/geom/journal')
| -rw-r--r-- | lib/geom/journal/Makefile | 5 | ||||
| -rw-r--r-- | lib/geom/journal/Makefile.depend | 3 | ||||
| -rw-r--r-- | lib/geom/journal/geom_journal.c | 5 | ||||
| -rw-r--r-- | lib/geom/journal/geom_journal.h | 4 | ||||
| -rw-r--r-- | lib/geom/journal/geom_journal_ufs.c | 5 | ||||
| -rw-r--r-- | lib/geom/journal/gjournal.8 | 4 |
6 files changed, 5 insertions, 21 deletions
diff --git a/lib/geom/journal/Makefile b/lib/geom/journal/Makefile index 3be15a13a81e..b87e8283225b 100644 --- a/lib/geom/journal/Makefile +++ b/lib/geom/journal/Makefile @@ -1,7 +1,4 @@ -# $FreeBSD$ - -PACKAGE=runtime -.PATH: ${.CURDIR:H:H}/misc +PACKAGE=geom GEOM_CLASS= journal SRCS+= geom_journal_ufs.c diff --git a/lib/geom/journal/Makefile.depend b/lib/geom/journal/Makefile.depend index 7c411851c451..9bf396c48894 100644 --- a/lib/geom/journal/Makefile.depend +++ b/lib/geom/journal/Makefile.depend @@ -1,8 +1,6 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -11,7 +9,6 @@ DIRDEPS = \ lib/libgeom \ lib/libmd \ lib/libufs \ - sbin/geom/core \ .include <dirdeps.mk> diff --git a/lib/geom/journal/geom_journal.c b/lib/geom/journal/geom_journal.c index 2a174c6e5b1c..85eb6f88ae84 100644 --- a/lib/geom/journal/geom_journal.c +++ b/lib/geom/journal/geom_journal.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/types.h> #include <errno.h> #include <paths.h> diff --git a/lib/geom/journal/geom_journal.h b/lib/geom/journal/geom_journal.h index 6725fe04001a..a3c7651cddb5 100644 --- a/lib/geom/journal/geom_journal.h +++ b/lib/geom/journal/geom_journal.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _GEOM_JOURNAL_H_ diff --git a/lib/geom/journal/geom_journal_ufs.c b/lib/geom/journal/geom_journal_ufs.c index 324be1748261..fc81663ec96a 100644 --- a/lib/geom/journal/geom_journal_ufs.c +++ b/lib/geom/journal/geom_journal_ufs.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/disklabel.h> #include <sys/mount.h> diff --git a/lib/geom/journal/gjournal.8 b/lib/geom/journal/gjournal.8 index 6eb8cde821ae..f9959ffa0f3f 100644 --- a/lib/geom/journal/gjournal.8 +++ b/lib/geom/journal/gjournal.8 @@ -22,8 +22,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" .Dd February 17, 2009 .Dt GJOURNAL 8 .Os @@ -63,7 +61,7 @@ The .Nm utility is used for journal configuration on the given GEOM provider. -The Journal and data may be stored on the same provider or on two separate +The journal and data may be stored on the same provider or on two separate providers. This is block level journaling, not file system level journaling, which means everything gets logged, e.g.\& for file systems, it journals both data and |