重命名 AX88772C_eeprom/asix.c 为 asix_mac.c

hc

2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353

 kernel/fs/jfs/jfs_logmgr.h
..
..
@@ -1,23 +1,12 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  *   Copyright (C) International Business Machines Corp., 2000-2004
3
4
  *   Portions Copyright (C) Christoph Hellwig, 2001-2002
4
- *
5
- *   This program is free software;  you can redistribute it and/or modify
6
- *   it under the terms of the GNU General Public License as published by
7
- *   the Free Software Foundation; either version 2 of the License, or
8
- *   (at your option) any later version.
9
- *
10
- *   This program is distributed in the hope that it will be useful,
11
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
12
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
13
- *   the GNU General Public License for more details.
14
- *
15
- *   You should have received a copy of the GNU General Public License
16
- *   along with this program;  if not, write to the Free Software
17
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
5
  */
19
6
 #ifndef	_H_JFS_LOGMGR
20
7
 #define _H_JFS_LOGMGR
8
+
9
+#include <linux/uuid.h>
21
10
 
22
11
 #include "jfs_filsys.h"
23
12
 #include "jfs_lock.h"
..
..
@@ -73,14 +62,12 @@
73
62
 	__le32 state;		/* 4: state - see below */
74
63
 
75
64
 	__le32 end;		/* 4: addr of last log record set by logredo */
76
-	char uuid[16];		/* 16: 128-bit journal uuid */
65
+	uuid_t uuid;		/* 16: 128-bit journal uuid */
77
66
 	char label[16];		/* 16: journal label */
78
67
 	struct {
79
-		char uuid[16];
68
+		uuid_t uuid;
80
69
 	} active[MAX_ACTIVE];	/* 2048: active file systems list */
81
70
 };
82
-
83
-#define NULL_UUID "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
84
71
 
85
72
 /* log flag: commit option (see jfs_filsys.h) */
86
73
 
..
..
@@ -410,7 +397,7 @@
410
397
 	spinlock_t synclock;	/* 4: synclist lock */
411
398
 	struct lbuf *wqueue;	/* 4: log pageout queue */
412
399
 	int count;		/* 4: count */
413
-	char uuid[16];		/* 16: 128-bit uuid of log device */
400
+	uuid_t uuid;		/* 16: 128-bit uuid of log device */
414
401
 
415
402
 	int no_integrity;	/* 3: flag to disable journaling to disk */
416
403
 };