Thu Jul 23 19:26:00 2020 UTC ()
Trailing whitespace


(skrll)
diff -r1.9 -r1.10 src/sys/fs/hfs/hfs.h

cvs diff -r1.9 -r1.10 src/sys/fs/hfs/hfs.h (expand / switch to unified diff)

--- src/sys/fs/hfs/hfs.h 2014/08/10 08:53:22 1.9
+++ src/sys/fs/hfs/hfs.h 2020/07/23 19:26:00 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: hfs.h,v 1.9 2014/08/10 08:53:22 hannken Exp $ */ 1/* $NetBSD: hfs.h,v 1.10 2020/07/23 19:26:00 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc. 4 * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Yevgeny Binder and Dieter Baron. 8 * by Yevgeny Binder and Dieter Baron.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -17,28 +17,28 @@ @@ -17,28 +17,28 @@
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */  30 */
31  31
32#ifndef _FS_HFS_HFS_H_ 32#ifndef _FS_HFS_HFS_H_
33#define _FS_HFS_HFS_H_ 33#define _FS_HFS_HFS_H_
34 34
35#include <sys/vnode.h> 35#include <sys/vnode.h>
36#include <sys/mount.h> 36#include <sys/mount.h>
37 37
38#include <miscfs/genfs/genfs_node.h> 38#include <miscfs/genfs/genfs_node.h>
39 39
40/* XXX remove before release */ 40/* XXX remove before release */
41/*#define HFS_DEBUG*/ 41/*#define HFS_DEBUG*/
42 42
43#ifdef HFS_DEBUG 43#ifdef HFS_DEBUG
44 #if defined(_KERNEL) && !defined(_LKM) 44 #if defined(_KERNEL) && !defined(_LKM)
@@ -77,27 +77,27 @@ struct hfsnode { @@ -77,27 +77,27 @@ struct hfsnode {
77 struct vnode *h_devvp; /* vnode for block I/O */ 77 struct vnode *h_devvp; /* vnode for block I/O */
78 dev_t h_dev; /* device associated with this hnode */ 78 dev_t h_dev; /* device associated with this hnode */
79 79
80 union { 80 union {
81 hfs_file_record_t file; 81 hfs_file_record_t file;
82 hfs_folder_record_t folder; 82 hfs_folder_record_t folder;
83 struct { 83 struct {
84 int16_t rec_type; 84 int16_t rec_type;
85 uint16_t flags; 85 uint16_t flags;
86 uint32_t valence; 86 uint32_t valence;
87 hfs_cnid_t cnid; 87 hfs_cnid_t cnid;
88 } u; /* convenience for accessing common record info */ 88 } u; /* convenience for accessing common record info */
89 } h_rec; /* catalog record for this hnode */ 89 } h_rec; /* catalog record for this hnode */
90  90
91 /* 91 /*
92 * We cache this vnode's parent CNID here upon vnode creation (i.e., during 92 * We cache this vnode's parent CNID here upon vnode creation (i.e., during
93 * hfs_vop_vget()) for quick access without needing to search the catalog. 93 * hfs_vop_vget()) for quick access without needing to search the catalog.
94 * Note, however, that this value must also be updated whenever this file 94 * Note, however, that this value must also be updated whenever this file
95 * is moved. 95 * is moved.
96 */ 96 */
97 hfs_cnid_t h_parent; 97 hfs_cnid_t h_parent;
98 98
99 struct hfsnode_key h_key; 99 struct hfsnode_key h_key;
100#define h_fork h_key.hnk_fork 100#define h_fork h_key.hnk_fork
101 101
102 long dummy; /* FOR DEVELOPMENT ONLY */ 102 long dummy; /* FOR DEVELOPMENT ONLY */
103}; 103};