diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-05-28 08:56:46 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-06-05 16:56:34 +0200 |
| commit | 41bb26f8db3ad33b083e57eb9fc5828796110e77 (patch) | |
| tree | 6e3ad26d303f047fa4f7358144da4d30d16b6de3 /fs/afs/internal.h | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
| download | op-kernel-dev-41bb26f8db3ad33b083e57eb9fc5828796110e77.zip op-kernel-dev-41bb26f8db3ad33b083e57eb9fc5828796110e77.tar.gz | |
uuid,afs: move struct uuid_v1 back into afs
This essentially is a partial revert of commit ff548773
("afs: Move UUID struct to linux/uuid.h") and moves struct uuid_v1 back into
fs/afs as struct afs_uuid. It however keeps it as big endian structure
so that we can use the normal uuid generation helpers when casting to/from
struct afs_uuid.
The V1 uuid intrepretation in struct form isn't really useful to the
rest of the kernel, and not really compatible to it either, so move it
back to AFS instead of polluting the global uuid.h.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs/afs/internal.h')
| -rw-r--r-- | fs/afs/internal.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 3936729..4e25566 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -410,6 +410,15 @@ struct afs_interface { unsigned mtu; /* MTU of interface */ }; +struct afs_uuid { + __be32 time_low; /* low part of timestamp */ + __be16 time_mid; /* mid part of timestamp */ + __be16 time_hi_and_version; /* high part of timestamp and version */ + __u8 clock_seq_hi_and_reserved; /* clock seq hi and variant */ + __u8 clock_seq_low; /* clock seq low */ + __u8 node[6]; /* spatially unique node ID (MAC addr) */ +}; + /*****************************************************************************/ /* * cache.c @@ -544,7 +553,7 @@ extern int afs_drop_inode(struct inode *); * main.c */ extern struct workqueue_struct *afs_wq; -extern struct uuid_v1 afs_uuid; +extern struct afs_uuid afs_uuid; /* * misc.c |
