diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2017-07-04 04:05:05 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2017-07-04 04:05:05 +0200 |
| commit | 7f53b7d047d221b9fe38b9f2203bd4499135be88 (patch) | |
| tree | f4832f5881522e80fba861bafe1e7c0cf136e291 /fs/xfs/xfs_linux.h | |
| parent | ovl: don't set origin on broken lower hardlink (diff) | |
| parent | ACPI: hns_dsaf_acpi_dsm_guid can be static (diff) | |
| download | linux-7f53b7d047d221b9fe38b9f2203bd4499135be88.tar.xz linux-7f53b7d047d221b9fe38b9f2203bd4499135be88.zip | |
Merge tag 'uuid-for-4.13' of git://git.infradead.org/users/hch/uuid into overlayfs-next
UUID/GUID updates:
- introduce the new uuid_t/guid_t types that are going to replace
the somewhat confusing uuid_be/uuid_le types and make the terminology
fit the various specs, as well as the userspace libuuid library.
(me, based on a previous version from Amir)
- consolidated generic uuid/guid helper functions lifted from XFS
and libnvdimm (Amir and me)
- conversions to the new types and helpers (Amir, Andy and me)
Diffstat (limited to 'fs/xfs/xfs_linux.h')
| -rw-r--r-- | fs/xfs/xfs_linux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 044fb0e15390..2d167fe643ec 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -19,6 +19,7 @@ #define __XFS_LINUX__ #include <linux/types.h> +#include <linux/uuid.h> /* * Kernel specific type declarations for XFS @@ -42,7 +43,6 @@ typedef __u32 xfs_nlink_t; #include "kmem.h" #include "mrlock.h" -#include "uuid.h" #include <linux/semaphore.h> #include <linux/mm.h> |