Merge branch 'parisc-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[mirror_ubuntu-jammy-kernel.git] / fs / jfs / jfs_incore.h

diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index 912a3af2393ee8eb107573537c1c8ec8fa2f881d..340eb8e4f7160a943c46316172441175b9061cb1 100644 (file)
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -23,6 +23,8 @@
 #include <linux/rwsem.h>
 #include <linux/slab.h>
 #include <linux/bitops.h>
+#include <linux/uuid.h>
+
 #include "jfs_types.h"
 #include "jfs_xtree.h"
 #include "jfs_dtree.h"
@@ -178,8 +180,8 @@ struct jfs_sb_info {
        pxd_t           logpxd;         /* pxd describing log   */
        pxd_t           fsckpxd;        /* pxd describing fsck wkspc */
        pxd_t           ait2;           /* pxd describing AIT copy      */
-       char            uuid[16];       /* 128-bit uuid for volume      */
-       char            loguuid[16];    /* 128-bit uuid for log */
+       uuid_t          uuid;           /* 128-bit uuid for volume      */
+       uuid_t          loguuid;        /* 128-bit uuid for log */
        /*
         * commit_state is used for synchronization of the jfs_commit
         * threads.  It is protected by LAZY_LOCK().