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>

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index 3062cceb5c2a..782d4d05a53b 100644
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -350,7 +350,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)
 {
         struct sockaddr_rxrpc srx;
         struct afs_server *server;
-        struct uuid_v1 *r;
+        struct afs_uuid *r;
         unsigned loop;
         __be32 *b;
         int ret;
@@ -380,7 +380,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)
                 }
 
                 _debug("unmarshall UUID");
-                call->request = kmalloc(sizeof(struct uuid_v1), GFP_KERNEL);
+                call->request = kmalloc(sizeof(struct afs_uuid), GFP_KERNEL);
                 if (!call->request)
                         return -ENOMEM;
 
@@ -453,7 +453,7 @@ static int afs_deliver_cb_probe(struct afs_call *call)
 static void SRXAFSCB_ProbeUuid(struct work_struct *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 {
                 __be32  match;
@@ -476,7 +476,7 @@ static void SRXAFSCB_ProbeUuid(struct work_struct *work)
  */
 static int afs_deliver_cb_probe_uuid(struct afs_call *call)
 {
-        struct uuid_v1 *r;
+        struct afs_uuid *r;
         unsigned loop;
         __be32 *b;
         int ret;
@@ -502,15 +502,15 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call)
                 }
 
                 _debug("unmarshall UUID");
-                call->request = kmalloc(sizeof(struct uuid_v1), GFP_KERNEL);
+                call->request = kmalloc(sizeof(struct afs_uuid), GFP_KERNEL);
                 if (!call->request)
                         return -ENOMEM;
 
                 b = call->buffer;
                 r = call->request;
-                r->time_low                     = b[0];
-                r->time_mid                     = htons(ntohl(b[1]));
-                r->time_hi_and_version          = htons(ntohl(b[2]));
+                r->time_low                     = ntohl(b[0]);
+                r->time_mid                     = ntohl(b[1]);
+                r->time_hi_and_version          = ntohl(b[2]);
                 r->clock_seq_hi_and_reserved    = ntohl(b[3]);
                 r->clock_seq_low                = ntohl(b[4]);