summaryrefslogtreecommitdiffstats
path: root/fs/afs/main.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-05-28 08:56:46 +0300
committerChristoph Hellwig <hch@lst.de>2017-06-05 16:56:34 +0200
commit41bb26f8db3ad33b083e57eb9fc5828796110e77 (patch)
tree6e3ad26d303f047fa4f7358144da4d30d16b6de3 /fs/afs/main.c
parent3c2993b8c6143d8a5793746a54eba8f86f95240f (diff)
downloadlinux-41bb26f8db3ad33b083e57eb9fc5828796110e77.tar.gz
linux-41bb26f8db3ad33b083e57eb9fc5828796110e77.tar.bz2
linux-41bb26f8db3ad33b083e57eb9fc5828796110e77.zip
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/main.c')
-rw-r--r--fs/afs/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/afs/main.c b/fs/afs/main.c
index 51d7d17bca57..9944770849da 100644
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
@@ -31,7 +31,7 @@ static char *rootcell;
module_param(rootcell, charp, 0);
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;
/*