Commit 41bb26f8 authored by Christoph Hellwig's avatar Christoph Hellwig

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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
parent 3c2993b8
...@@ -350,7 +350,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call) ...@@ -350,7 +350,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)
{ {
struct sockaddr_rxrpc srx; struct sockaddr_rxrpc srx;
struct afs_server *server; struct afs_server *server;
struct uuid_v1 *r; struct afs_uuid *r;
unsigned loop; unsigned loop;
__be32 *b; __be32 *b;
int ret; int ret;
...@@ -380,7 +380,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call) ...@@ -380,7 +380,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)
} }
_debug("unmarshall UUID"); _debug("unmarshall UUID");
call->request = kmalloc(sizeof(struct uuid_v1), GFP_KERNEL); call->request = kmalloc(sizeof(struct afs_uuid), GFP_KERNEL);
if (!call->request) if (!call->request)
return -ENOMEM; return -ENOMEM;
...@@ -453,7 +453,7 @@ static int afs_deliver_cb_probe(struct afs_call *call) ...@@ -453,7 +453,7 @@ static int afs_deliver_cb_probe(struct afs_call *call)
static void SRXAFSCB_ProbeUuid(struct work_struct *work) static void SRXAFSCB_ProbeUuid(struct work_struct *work)
{ {
struct afs_call *call = container_of(work, struct afs_call, work); struct afs_call *call = container_of(work, struct afs_call, work);
struct uuid_v1 *r = call->request; struct afs_uuid *r = call->request;
struct { struct {
__be32 match; __be32 match;
...@@ -476,7 +476,7 @@ static void SRXAFSCB_ProbeUuid(struct work_struct *work) ...@@ -476,7 +476,7 @@ static void SRXAFSCB_ProbeUuid(struct work_struct *work)
*/ */
static int afs_deliver_cb_probe_uuid(struct afs_call *call) static int afs_deliver_cb_probe_uuid(struct afs_call *call)
{ {
struct uuid_v1 *r; struct afs_uuid *r;
unsigned loop; unsigned loop;
__be32 *b; __be32 *b;
int ret; int ret;
...@@ -502,15 +502,15 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call) ...@@ -502,15 +502,15 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call)
} }
_debug("unmarshall UUID"); _debug("unmarshall UUID");
call->request = kmalloc(sizeof(struct uuid_v1), GFP_KERNEL); call->request = kmalloc(sizeof(struct afs_uuid), GFP_KERNEL);
if (!call->request) if (!call->request)
return -ENOMEM; return -ENOMEM;
b = call->buffer; b = call->buffer;
r = call->request; r = call->request;
r->time_low = b[0]; r->time_low = ntohl(b[0]);
r->time_mid = htons(ntohl(b[1])); r->time_mid = ntohl(b[1]);
r->time_hi_and_version = htons(ntohl(b[2])); r->time_hi_and_version = ntohl(b[2]);
r->clock_seq_hi_and_reserved = ntohl(b[3]); r->clock_seq_hi_and_reserved = ntohl(b[3]);
r->clock_seq_low = ntohl(b[4]); r->clock_seq_low = ntohl(b[4]);
......
...@@ -410,6 +410,15 @@ struct afs_interface { ...@@ -410,6 +410,15 @@ struct afs_interface {
unsigned mtu; /* MTU of 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 * cache.c
...@@ -544,7 +553,7 @@ extern int afs_drop_inode(struct inode *); ...@@ -544,7 +553,7 @@ extern int afs_drop_inode(struct inode *);
* main.c * main.c
*/ */
extern struct workqueue_struct *afs_wq; extern struct workqueue_struct *afs_wq;
extern struct uuid_v1 afs_uuid; extern struct afs_uuid afs_uuid;
/* /*
* misc.c * misc.c
......
...@@ -31,7 +31,7 @@ static char *rootcell; ...@@ -31,7 +31,7 @@ static char *rootcell;
module_param(rootcell, charp, 0); module_param(rootcell, charp, 0);
MODULE_PARM_DESC(rootcell, "root AFS cell name and VL server IP addr list"); MODULE_PARM_DESC(rootcell, "root AFS cell name and VL server IP addr list");
struct uuid_v1 afs_uuid; struct afs_uuid afs_uuid;
struct workqueue_struct *afs_wq; struct workqueue_struct *afs_wq;
/* /*
......
...@@ -18,30 +18,6 @@ ...@@ -18,30 +18,6 @@
#include <uapi/linux/uuid.h> #include <uapi/linux/uuid.h>
/*
* V1 (time-based) UUID definition [RFC 4122].
* - the timestamp is a 60-bit value, split 32/16/12, and goes in 100ns
* increments since midnight 15th October 1582
* - add AFS_UUID_TO_UNIX_TIME to convert unix time in 100ns units to UUID
* time
* - the clock sequence is a 14-bit counter to avoid duplicate times
*/
struct uuid_v1 {
__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 */
#define UUID_TO_UNIX_TIME 0x01b21dd213814000ULL
#define UUID_TIMEHI_MASK 0x0fff
#define UUID_VERSION_TIME 0x1000 /* time-based UUID */
#define UUID_VERSION_NAME 0x3000 /* name-based UUID */
#define UUID_VERSION_RANDOM 0x4000 /* (pseudo-)random generated UUID */
u8 clock_seq_hi_and_reserved; /* clock seq hi and variant */
#define UUID_CLOCKHI_MASK 0x3f
#define UUID_VARIANT_STD 0x80
u8 clock_seq_low; /* clock seq low */
u8 node[6]; /* spatially unique node ID (MAC addr) */
};
/* /*
* The length of a UUID string ("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") * The length of a UUID string ("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")
* not including trailing NUL. * not including trailing NUL.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment