From: Christoph Hellwig <hch@lst.de> To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Amir Goldstein <amir73il@gmail.com>, linux-fsdevel@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, Shaohua Li <shli@kernel.org>, linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>, Mimi Zohar <zohar@linux.vnet.ibm.com>, Steven Whitehouse <swhiteho@redhat.com> Subject: [PATCH 06/16] afs: switch to use uuid_t and uuid_gen Date: Wed, 10 May 2017 20:02:04 +0200 [thread overview] Message-ID: <20170510180214.16852-7-hch@lst.de> (raw) In-Reply-To: <20170510180214.16852-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/afs/cmservice.c | 46 +++++++++++++++++++++++----------------------- fs/afs/internal.h | 2 +- fs/afs/main.c | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index 3062cceb5c2a..d4e77d12570c 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; + uuid_t *r; unsigned loop; __be32 *b; int ret; @@ -380,20 +380,20 @@ 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(uuid_t), 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->clock_seq_hi_and_reserved = ntohl(b[3]); - r->clock_seq_low = ntohl(b[4]); + r->v1.time_low = b[0]; + r->v1.time_mid = htons(ntohl(b[1])); + r->v1.time_hi_and_version = htons(ntohl(b[2])); + r->v1.clock_seq_hi_and_reserved = ntohl(b[3]); + r->v1.clock_seq_low = ntohl(b[4]); for (loop = 0; loop < 6; loop++) - r->node[loop] = ntohl(b[loop + 5]); + r->v1.node[loop] = ntohl(b[loop + 5]); call->offset = 0; call->unmarshall++; @@ -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; + uuid_t *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; + uuid_t *r; unsigned loop; __be32 *b; int ret; @@ -502,20 +502,20 @@ 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(uuid_t), 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->clock_seq_hi_and_reserved = ntohl(b[3]); - r->clock_seq_low = ntohl(b[4]); + r->v1.time_low = b[0]; + r->v1.time_mid = htons(ntohl(b[1])); + r->v1.time_hi_and_version = htons(ntohl(b[2])); + r->v1.clock_seq_hi_and_reserved = ntohl(b[3]); + r->v1.clock_seq_low = ntohl(b[4]); for (loop = 0; loop < 6; loop++) - r->node[loop] = ntohl(b[loop + 5]); + r->v1.node[loop] = ntohl(b[loop + 5]); call->offset = 0; call->unmarshall++; @@ -568,13 +568,13 @@ static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work) memset(&reply, 0, sizeof(reply)); reply.ia.nifs = htonl(nifs); - reply.ia.uuid[0] = afs_uuid.time_low; - reply.ia.uuid[1] = htonl(ntohs(afs_uuid.time_mid)); - reply.ia.uuid[2] = htonl(ntohs(afs_uuid.time_hi_and_version)); - reply.ia.uuid[3] = htonl((s8) afs_uuid.clock_seq_hi_and_reserved); - reply.ia.uuid[4] = htonl((s8) afs_uuid.clock_seq_low); + reply.ia.uuid[0] = afs_uuid.v1.time_low; + reply.ia.uuid[1] = htonl(ntohs(afs_uuid.v1.time_mid)); + reply.ia.uuid[2] = htonl(ntohs(afs_uuid.v1.time_hi_and_version)); + reply.ia.uuid[3] = htonl((s8) afs_uuid.v1.clock_seq_hi_and_reserved); + reply.ia.uuid[4] = htonl((s8) afs_uuid.v1.clock_seq_low); for (loop = 0; loop < 6; loop++) - reply.ia.uuid[loop + 5] = htonl((s8) afs_uuid.node[loop]); + reply.ia.uuid[loop + 5] = htonl((s8) afs_uuid.v1.node[loop]); if (ifs) { for (loop = 0; loop < nifs; loop++) { diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 393672997cc2..7de45c8686a2 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -544,7 +544,7 @@ extern int afs_drop_inode(struct inode *); * main.c */ extern struct workqueue_struct *afs_wq; -extern struct uuid_v1 afs_uuid; +extern uuid_t afs_uuid; /* * misc.c diff --git a/fs/afs/main.c b/fs/afs/main.c index 51d7d17bca57..75b3d3a8b1ba 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; +uuid_t afs_uuid; struct workqueue_struct *afs_wq; /* @@ -43,7 +43,7 @@ static int __init afs_init(void) printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n"); - generate_random_uuid((unsigned char *)&afs_uuid); + uuid_gen(&afs_uuid); /* create workqueue */ ret = -ENOMEM; -- 2.11.0 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> To: Andy Shevchenko <andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>, Amir Goldstein <amir73il-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-xfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, Shaohua Li <shli-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, Mimi Zohar <zohar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>, Steven Whitehouse <swhiteho-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Subject: [PATCH 06/16] afs: switch to use uuid_t and uuid_gen Date: Wed, 10 May 2017 20:02:04 +0200 [thread overview] Message-ID: <20170510180214.16852-7-hch@lst.de> (raw) In-Reply-To: <20170510180214.16852-1-hch-jcswGhMUV9g@public.gmane.org> Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> --- fs/afs/cmservice.c | 46 +++++++++++++++++++++++----------------------- fs/afs/internal.h | 2 +- fs/afs/main.c | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index 3062cceb5c2a..d4e77d12570c 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; + uuid_t *r; unsigned loop; __be32 *b; int ret; @@ -380,20 +380,20 @@ 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(uuid_t), 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->clock_seq_hi_and_reserved = ntohl(b[3]); - r->clock_seq_low = ntohl(b[4]); + r->v1.time_low = b[0]; + r->v1.time_mid = htons(ntohl(b[1])); + r->v1.time_hi_and_version = htons(ntohl(b[2])); + r->v1.clock_seq_hi_and_reserved = ntohl(b[3]); + r->v1.clock_seq_low = ntohl(b[4]); for (loop = 0; loop < 6; loop++) - r->node[loop] = ntohl(b[loop + 5]); + r->v1.node[loop] = ntohl(b[loop + 5]); call->offset = 0; call->unmarshall++; @@ -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; + uuid_t *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; + uuid_t *r; unsigned loop; __be32 *b; int ret; @@ -502,20 +502,20 @@ 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(uuid_t), 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->clock_seq_hi_and_reserved = ntohl(b[3]); - r->clock_seq_low = ntohl(b[4]); + r->v1.time_low = b[0]; + r->v1.time_mid = htons(ntohl(b[1])); + r->v1.time_hi_and_version = htons(ntohl(b[2])); + r->v1.clock_seq_hi_and_reserved = ntohl(b[3]); + r->v1.clock_seq_low = ntohl(b[4]); for (loop = 0; loop < 6; loop++) - r->node[loop] = ntohl(b[loop + 5]); + r->v1.node[loop] = ntohl(b[loop + 5]); call->offset = 0; call->unmarshall++; @@ -568,13 +568,13 @@ static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work) memset(&reply, 0, sizeof(reply)); reply.ia.nifs = htonl(nifs); - reply.ia.uuid[0] = afs_uuid.time_low; - reply.ia.uuid[1] = htonl(ntohs(afs_uuid.time_mid)); - reply.ia.uuid[2] = htonl(ntohs(afs_uuid.time_hi_and_version)); - reply.ia.uuid[3] = htonl((s8) afs_uuid.clock_seq_hi_and_reserved); - reply.ia.uuid[4] = htonl((s8) afs_uuid.clock_seq_low); + reply.ia.uuid[0] = afs_uuid.v1.time_low; + reply.ia.uuid[1] = htonl(ntohs(afs_uuid.v1.time_mid)); + reply.ia.uuid[2] = htonl(ntohs(afs_uuid.v1.time_hi_and_version)); + reply.ia.uuid[3] = htonl((s8) afs_uuid.v1.clock_seq_hi_and_reserved); + reply.ia.uuid[4] = htonl((s8) afs_uuid.v1.clock_seq_low); for (loop = 0; loop < 6; loop++) - reply.ia.uuid[loop + 5] = htonl((s8) afs_uuid.node[loop]); + reply.ia.uuid[loop + 5] = htonl((s8) afs_uuid.v1.node[loop]); if (ifs) { for (loop = 0; loop < nifs; loop++) { diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 393672997cc2..7de45c8686a2 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -544,7 +544,7 @@ extern int afs_drop_inode(struct inode *); * main.c */ extern struct workqueue_struct *afs_wq; -extern struct uuid_v1 afs_uuid; +extern uuid_t afs_uuid; /* * misc.c diff --git a/fs/afs/main.c b/fs/afs/main.c index 51d7d17bca57..75b3d3a8b1ba 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; +uuid_t afs_uuid; struct workqueue_struct *afs_wq; /* @@ -43,7 +43,7 @@ static int __init afs_init(void) printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n"); - generate_random_uuid((unsigned char *)&afs_uuid); + uuid_gen(&afs_uuid); /* create workqueue */ ret = -ENOMEM; -- 2.11.0
WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de> To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Amir Goldstein <amir73il@gmail.com>, linux-fsdevel@vger.kernel.org Cc: Shaohua Li <shli@kernel.org>, Dan Williams <dan.j.williams@intel.com>, David Howells <dhowells@redhat.com>, Steven Whitehouse <swhiteho@redhat.com>, Mimi Zohar <zohar@linux.vnet.ibm.com>, linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/16] afs: switch to use uuid_t and uuid_gen Date: Wed, 10 May 2017 20:02:04 +0200 [thread overview] Message-ID: <20170510180214.16852-7-hch@lst.de> (raw) In-Reply-To: <20170510180214.16852-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/afs/cmservice.c | 46 +++++++++++++++++++++++----------------------- fs/afs/internal.h | 2 +- fs/afs/main.c | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index 3062cceb5c2a..d4e77d12570c 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; + uuid_t *r; unsigned loop; __be32 *b; int ret; @@ -380,20 +380,20 @@ 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(uuid_t), 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->clock_seq_hi_and_reserved = ntohl(b[3]); - r->clock_seq_low = ntohl(b[4]); + r->v1.time_low = b[0]; + r->v1.time_mid = htons(ntohl(b[1])); + r->v1.time_hi_and_version = htons(ntohl(b[2])); + r->v1.clock_seq_hi_and_reserved = ntohl(b[3]); + r->v1.clock_seq_low = ntohl(b[4]); for (loop = 0; loop < 6; loop++) - r->node[loop] = ntohl(b[loop + 5]); + r->v1.node[loop] = ntohl(b[loop + 5]); call->offset = 0; call->unmarshall++; @@ -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; + uuid_t *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; + uuid_t *r; unsigned loop; __be32 *b; int ret; @@ -502,20 +502,20 @@ 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(uuid_t), 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->clock_seq_hi_and_reserved = ntohl(b[3]); - r->clock_seq_low = ntohl(b[4]); + r->v1.time_low = b[0]; + r->v1.time_mid = htons(ntohl(b[1])); + r->v1.time_hi_and_version = htons(ntohl(b[2])); + r->v1.clock_seq_hi_and_reserved = ntohl(b[3]); + r->v1.clock_seq_low = ntohl(b[4]); for (loop = 0; loop < 6; loop++) - r->node[loop] = ntohl(b[loop + 5]); + r->v1.node[loop] = ntohl(b[loop + 5]); call->offset = 0; call->unmarshall++; @@ -568,13 +568,13 @@ static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work) memset(&reply, 0, sizeof(reply)); reply.ia.nifs = htonl(nifs); - reply.ia.uuid[0] = afs_uuid.time_low; - reply.ia.uuid[1] = htonl(ntohs(afs_uuid.time_mid)); - reply.ia.uuid[2] = htonl(ntohs(afs_uuid.time_hi_and_version)); - reply.ia.uuid[3] = htonl((s8) afs_uuid.clock_seq_hi_and_reserved); - reply.ia.uuid[4] = htonl((s8) afs_uuid.clock_seq_low); + reply.ia.uuid[0] = afs_uuid.v1.time_low; + reply.ia.uuid[1] = htonl(ntohs(afs_uuid.v1.time_mid)); + reply.ia.uuid[2] = htonl(ntohs(afs_uuid.v1.time_hi_and_version)); + reply.ia.uuid[3] = htonl((s8) afs_uuid.v1.clock_seq_hi_and_reserved); + reply.ia.uuid[4] = htonl((s8) afs_uuid.v1.clock_seq_low); for (loop = 0; loop < 6; loop++) - reply.ia.uuid[loop + 5] = htonl((s8) afs_uuid.node[loop]); + reply.ia.uuid[loop + 5] = htonl((s8) afs_uuid.v1.node[loop]); if (ifs) { for (loop = 0; loop < nifs; loop++) { diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 393672997cc2..7de45c8686a2 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -544,7 +544,7 @@ extern int afs_drop_inode(struct inode *); * main.c */ extern struct workqueue_struct *afs_wq; -extern struct uuid_v1 afs_uuid; +extern uuid_t afs_uuid; /* * misc.c diff --git a/fs/afs/main.c b/fs/afs/main.c index 51d7d17bca57..75b3d3a8b1ba 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; +uuid_t afs_uuid; struct workqueue_struct *afs_wq; /* @@ -43,7 +43,7 @@ static int __init afs_init(void) printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n"); - generate_random_uuid((unsigned char *)&afs_uuid); + uuid_gen(&afs_uuid); /* create workqueue */ ret = -ENOMEM; -- 2.11.0
WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de> To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Amir Goldstein <amir73il@gmail.com>, linux-fsdevel@vger.kernel.org Cc: Shaohua Li <shli@kernel.org>, Dan Williams <dan.j.williams@intel.com>, David Howells <dhowells@redhat.com>, Steven Whitehouse <swhiteho@redhat.com>, Mimi Zohar <zohar@linux.vnet.ibm.com>, linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/16] afs: switch to use uuid_t and uuid_gen Date: Wed, 10 May 2017 20:02:04 +0200 [thread overview] Message-ID: <20170510180214.16852-7-hch@lst.de> (raw) In-Reply-To: <20170510180214.16852-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/afs/cmservice.c | 46 +++++++++++++++++++++++----------------------- fs/afs/internal.h | 2 +- fs/afs/main.c | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index 3062cceb5c2a..d4e77d12570c 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; + uuid_t *r; unsigned loop; __be32 *b; int ret; @@ -380,20 +380,20 @@ 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(uuid_t), 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->clock_seq_hi_and_reserved = ntohl(b[3]); - r->clock_seq_low = ntohl(b[4]); + r->v1.time_low = b[0]; + r->v1.time_mid = htons(ntohl(b[1])); + r->v1.time_hi_and_version = htons(ntohl(b[2])); + r->v1.clock_seq_hi_and_reserved = ntohl(b[3]); + r->v1.clock_seq_low = ntohl(b[4]); for (loop = 0; loop < 6; loop++) - r->node[loop] = ntohl(b[loop + 5]); + r->v1.node[loop] = ntohl(b[loop + 5]); call->offset = 0; call->unmarshall++; @@ -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; + uuid_t *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; + uuid_t *r; unsigned loop; __be32 *b; int ret; @@ -502,20 +502,20 @@ 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(uuid_t), 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->clock_seq_hi_and_reserved = ntohl(b[3]); - r->clock_seq_low = ntohl(b[4]); + r->v1.time_low = b[0]; + r->v1.time_mid = htons(ntohl(b[1])); + r->v1.time_hi_and_version = htons(ntohl(b[2])); + r->v1.clock_seq_hi_and_reserved = ntohl(b[3]); + r->v1.clock_seq_low = ntohl(b[4]); for (loop = 0; loop < 6; loop++) - r->node[loop] = ntohl(b[loop + 5]); + r->v1.node[loop] = ntohl(b[loop + 5]); call->offset = 0; call->unmarshall++; @@ -568,13 +568,13 @@ static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work) memset(&reply, 0, sizeof(reply)); reply.ia.nifs = htonl(nifs); - reply.ia.uuid[0] = afs_uuid.time_low; - reply.ia.uuid[1] = htonl(ntohs(afs_uuid.time_mid)); - reply.ia.uuid[2] = htonl(ntohs(afs_uuid.time_hi_and_version)); - reply.ia.uuid[3] = htonl((s8) afs_uuid.clock_seq_hi_and_reserved); - reply.ia.uuid[4] = htonl((s8) afs_uuid.clock_seq_low); + reply.ia.uuid[0] = afs_uuid.v1.time_low; + reply.ia.uuid[1] = htonl(ntohs(afs_uuid.v1.time_mid)); + reply.ia.uuid[2] = htonl(ntohs(afs_uuid.v1.time_hi_and_version)); + reply.ia.uuid[3] = htonl((s8) afs_uuid.v1.clock_seq_hi_and_reserved); + reply.ia.uuid[4] = htonl((s8) afs_uuid.v1.clock_seq_low); for (loop = 0; loop < 6; loop++) - reply.ia.uuid[loop + 5] = htonl((s8) afs_uuid.node[loop]); + reply.ia.uuid[loop + 5] = htonl((s8) afs_uuid.v1.node[loop]); if (ifs) { for (loop = 0; loop < nifs; loop++) { diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 393672997cc2..7de45c8686a2 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -544,7 +544,7 @@ extern int afs_drop_inode(struct inode *); * main.c */ extern struct workqueue_struct *afs_wq; -extern struct uuid_v1 afs_uuid; +extern uuid_t afs_uuid; /* * misc.c diff --git a/fs/afs/main.c b/fs/afs/main.c index 51d7d17bca57..75b3d3a8b1ba 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; +uuid_t afs_uuid; struct workqueue_struct *afs_wq; /* @@ -43,7 +43,7 @@ static int __init afs_init(void) printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n"); - generate_random_uuid((unsigned char *)&afs_uuid); + uuid_gen(&afs_uuid); /* create workqueue */ ret = -ENOMEM; -- 2.11.0
next prev parent reply other threads:[~2017-05-10 18:02 UTC|newest] Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-10 18:01 cleanup UUID types Christoph Hellwig 2017-05-10 18:01 ` Christoph Hellwig 2017-05-10 18:01 ` Christoph Hellwig 2017-05-10 18:01 ` Christoph Hellwig 2017-05-10 18:01 ` [PATCH 01/16] xfs: use uuid_copy() helper to abstract uuid_t Christoph Hellwig 2017-05-10 18:01 ` Christoph Hellwig 2017-05-10 18:01 ` Christoph Hellwig 2017-05-10 18:01 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 02/16] xfs: use uuid_be to implement the uuid_t type Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 03/16] uuid: rename uuid types Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 19:15 ` Amir Goldstein 2017-05-10 19:15 ` Amir Goldstein 2017-05-10 19:15 ` Amir Goldstein 2017-05-10 19:15 ` Amir Goldstein 2017-05-11 7:59 ` Christoph Hellwig 2017-05-11 7:59 ` Christoph Hellwig 2017-05-11 7:59 ` Christoph Hellwig 2017-05-11 7:59 ` Christoph Hellwig 2017-05-11 8:31 ` Amir Goldstein 2017-05-11 8:31 ` Amir Goldstein 2017-05-11 8:31 ` Amir Goldstein 2017-05-11 8:31 ` Amir Goldstein 2017-05-10 18:02 ` [PATCH 04/16] uuid: don't export guid_index and uuid_index Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 05/16] uuid: add the v1 layout to uuid_t Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-11 11:40 ` Andy Shevchenko 2017-05-11 11:40 ` Andy Shevchenko 2017-05-11 11:40 ` Andy Shevchenko 2017-05-11 11:40 ` Andy Shevchenko 2017-05-11 12:07 ` Christoph Hellwig 2017-05-11 12:07 ` Christoph Hellwig 2017-05-11 12:07 ` Christoph Hellwig 2017-05-11 12:07 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig [this message] 2017-05-10 18:02 ` [PATCH 06/16] afs: switch to use uuid_t and uuid_gen Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 07/16] uuid: remove struct uuid_v1 Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 08/16] xfs: remove uuid_getnodeuniq and xfs_uu_t Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 09/16] md: namespace private helper names Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 10/16] uuid: hoist helpers uuid_equal() and uuid_copy() from xfs Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 11/16] uuid: hoist uuid_is_null() helper from libnvdimm Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 12/16] xfs: use the common helper uuid_is_null() Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 13/16] block: remove blk_part_pack_uuid Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 14/16] " Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:09 ` Christoph Hellwig 2017-05-10 18:09 ` Christoph Hellwig 2017-05-10 18:09 ` Christoph Hellwig 2017-05-10 18:09 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 15/16] ima/policy: switch to use uuid_t Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` [PATCH 16/16] fs: switch ->s_uuid to uuid_t Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 18:02 ` Christoph Hellwig 2017-05-10 19:08 ` Amir Goldstein 2017-05-10 19:08 ` Amir Goldstein 2017-05-10 19:08 ` Amir Goldstein 2017-05-10 19:08 ` Amir Goldstein 2017-05-11 7:58 ` Christoph Hellwig 2017-05-11 7:58 ` Christoph Hellwig 2017-05-11 7:58 ` Christoph Hellwig 2017-05-11 7:58 ` Christoph Hellwig 2017-05-10 18:20 ` [PATCH 03/16] uuid: rename uuid types David Howells 2017-05-10 18:20 ` David Howells 2017-05-10 18:20 ` David Howells 2017-05-10 18:20 ` David Howells 2017-05-11 11:38 ` Andy Shevchenko 2017-05-11 11:38 ` Andy Shevchenko 2017-05-11 11:38 ` Andy Shevchenko 2017-05-11 11:38 ` Andy Shevchenko 2017-05-10 18:21 ` [PATCH 05/16] uuid: add the v1 layout to uuid_t David Howells 2017-05-10 18:21 ` David Howells 2017-05-10 18:21 ` David Howells 2017-05-10 18:21 ` David Howells 2017-05-10 18:22 ` [PATCH 06/16] afs: switch to use uuid_t and uuid_gen David Howells 2017-05-10 18:22 ` David Howells 2017-05-10 18:22 ` David Howells 2017-05-10 18:22 ` David Howells
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170510180214.16852-7-hch@lst.de \ --to=hch@lst.de \ --cc=amir73il@gmail.com \ --cc=andriy.shevchenko@linux.intel.com \ --cc=dhowells@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ --cc=linux-raid@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=shli@kernel.org \ --cc=swhiteho@redhat.com \ --cc=zohar@linux.vnet.ibm.com \ --subject='Re: [PATCH 06/16] afs: switch to use uuid_t and uuid_gen' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.