| Message ID | 20170518062705.25902-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 18, 2017 at 08:26:44AM +0200, Christoph Hellwig wrote: > Use the generic Linux definition to implement our UUID type, this will > allow using more generic infrastructure in the future. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/uuid.h | 4 ---- > fs/xfs/xfs_linux.h | 3 +++ > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/uuid.h b/fs/xfs/uuid.h > index 104db0f3bed6..4f1441ba4fa5 100644 > --- a/fs/xfs/uuid.h > +++ b/fs/xfs/uuid.h > @@ -18,10 +18,6 @@ > #ifndef __XFS_SUPPORT_UUID_H__ > #define __XFS_SUPPORT_UUID_H__ > > -typedef struct { > - unsigned char __u_bits[16]; > -} uuid_t; > - > extern int uuid_is_nil(uuid_t *uuid); > extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2); > extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]); > diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h > index 044fb0e15390..89ee5ec66837 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 > @@ -38,6 +39,8 @@ typedef __s64 xfs_daddr_t; /* <disk address> type */ > typedef __u32 xfs_dev_t; > typedef __u32 xfs_nlink_t; > > +typedef uuid_be uuid_t; > + > #include "xfs_types.h" > > #include "kmem.h" > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, May 18, 2017 at 08:26:44AM +0200, Christoph Hellwig wrote: > Use the generic Linux definition to implement our UUID type, this will > allow using more generic infrastructure in the future. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/uuid.h | 4 ---- > fs/xfs/xfs_linux.h | 3 +++ > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/uuid.h b/fs/xfs/uuid.h > index 104db0f3bed6..4f1441ba4fa5 100644 > --- a/fs/xfs/uuid.h > +++ b/fs/xfs/uuid.h > @@ -18,10 +18,6 @@ > #ifndef __XFS_SUPPORT_UUID_H__ > #define __XFS_SUPPORT_UUID_H__ > > -typedef struct { > - unsigned char __u_bits[16]; > -} uuid_t; > - > extern int uuid_is_nil(uuid_t *uuid); > extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2); > extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]); > diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h > index 044fb0e15390..89ee5ec66837 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 > @@ -38,6 +39,8 @@ typedef __s64 xfs_daddr_t; /* <disk address> type */ > typedef __u32 xfs_dev_t; > typedef __u32 xfs_nlink_t; > > +typedef uuid_be uuid_t; > + > #include "xfs_types.h" > > #include "kmem.h" > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/uuid.h b/fs/xfs/uuid.h index 104db0f3bed6..4f1441ba4fa5 100644 --- a/fs/xfs/uuid.h +++ b/fs/xfs/uuid.h @@ -18,10 +18,6 @@ #ifndef __XFS_SUPPORT_UUID_H__ #define __XFS_SUPPORT_UUID_H__ -typedef struct { - unsigned char __u_bits[16]; -} uuid_t; - extern int uuid_is_nil(uuid_t *uuid); extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2); extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]); diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 044fb0e15390..89ee5ec66837 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 @@ -38,6 +39,8 @@ typedef __s64 xfs_daddr_t; /* <disk address> type */ typedef __u32 xfs_dev_t; typedef __u32 xfs_nlink_t; +typedef uuid_be uuid_t; + #include "xfs_types.h" #include "kmem.h"
Use the generic Linux definition to implement our UUID type, this will allow using more generic infrastructure in the future. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/uuid.h | 4 ---- fs/xfs/xfs_linux.h | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-)