hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/fs/jfs/jfs_superblock.h
....@@ -1,22 +1,11 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
12 /*
23 * Copyright (C) International Business Machines Corp., 2000-2003
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License as published by
6
- * the Free Software Foundation; either version 2 of the License, or
7
- * (at your option) any later version.
8
- *
9
- * This program is distributed in the hope that it will be useful,
10
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
12
- * the GNU General Public License for more details.
13
- *
14
- * You should have received a copy of the GNU General Public License
15
- * along with this program; if not, write to the Free Software
16
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
174 */
185 #ifndef _H_JFS_SUPERBLOCK
196 #define _H_JFS_SUPERBLOCK
7
+
8
+#include <linux/uuid.h>
209
2110 /*
2211 * make the magic number something a human could read
....@@ -98,11 +87,9 @@
9887 __le64 s_xsize; /* 8: extendfs s_size */
9988 pxd_t s_xfsckpxd; /* 8: extendfs fsckpxd */
10089 pxd_t s_xlogpxd; /* 8: extendfs logpxd */
101
- /* - 128 byte boundary - */
102
-
103
- char s_uuid[16]; /* 16: 128-bit uuid for volume */
90
+ uuid_t s_uuid; /* 16: 128-bit uuid for volume */
10491 char s_label[16]; /* 16: volume label */
105
- char s_loguuid[16]; /* 16: 128-bit uuid for log device */
92
+ uuid_t s_loguuid; /* 16: 128-bit uuid for log device */
10693
10794 };
10895