* [PATCH] tabled: use new cld api
@ 2010-01-10 15:22 Colin McCabe
2010-01-11 13:26 ` Jeff Garzik
2010-02-05 22:04 ` Jeff Garzik
0 siblings, 2 replies; 4+ messages in thread
From: Colin McCabe @ 2010-01-10 15:22 UTC (permalink / raw)
To: Project Hail List; +Cc: Pete Zaitcev, Jeff Garzik, Colin McCabe
Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
---
server/cldu.c | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/server/cldu.c b/server/cldu.c
index d02eafd..dbad4db 100644
--- a/server/cldu.c
+++ b/server/cldu.c
@@ -545,8 +545,8 @@ static int cldu_put_cb(struct cldc_call_opts *carg, enum cle_err_codes errc)
static int cldu_get_1_cb(struct cldc_call_opts *carg, enum cle_err_codes errc)
{
struct cld_session *sp = carg->private;
- const char *ptr;
- int dir_len;
+ char *ptr;
+ size_t dir_len;
int total_len, rec_len, name_len;
char buf[65];
@@ -558,8 +558,7 @@ static int cldu_get_1_cb(struct cldc_call_opts *carg, enum cle_err_codes errc)
if (debugging)
applog(LOG_DEBUG, "Known tabled nodes");
- ptr = carg->u.get.buf;
- dir_len = carg->u.get.size;
+ cldc_call_opts_get_data(carg, &ptr, &dir_len);
while (dir_len) {
name_len = GUINT16_FROM_LE(*(uint16_t *)ptr);
rec_len = name_len + 2;
@@ -670,8 +669,8 @@ static int cldu_get_x_cb(struct cldc_call_opts *carg, enum cle_err_codes errc)
struct cld_session *sp = carg->private;
struct cldc_call_opts copts;
int rc;
- const char *ptr;
- int dir_len;
+ char *ptr;
+ size_t dir_len;
int total_len, rec_len, name_len;
char buf[65];
@@ -683,8 +682,7 @@ static int cldu_get_x_cb(struct cldc_call_opts *carg, enum cle_err_codes errc)
if (debugging)
applog(LOG_DEBUG, "Known Chunk nodes");
- ptr = carg->u.get.buf;
- dir_len = carg->u.get.size;
+ cldc_call_opts_get_data(carg, &ptr, &dir_len);
while (dir_len) {
name_len = GUINT16_FROM_LE(*(uint16_t *)ptr);
rec_len = name_len + 2;
@@ -807,16 +805,15 @@ static int cldu_get_y_cb(struct cldc_call_opts *carg, enum cle_err_codes errc)
struct cld_session *sp = carg->private;
struct cldc_call_opts copts;
int rc;
- const char *ptr;
- int len;
+ char *ptr;
+ size_t len;
if (errc != CLE_OK) {
applog(LOG_ERR, "CLD get(%s) failed: %d", sp->yfname, errc);
goto close_and_next; /* spaghetti */
}
- ptr = carg->u.get.buf;
- len = carg->u.get.size;
+ cldc_call_opts_get_data(carg, &ptr, &len);
stor_parse(sp->yfname, ptr, len);
close_and_next:
--
1.6.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] tabled: use new cld api
2010-01-10 15:22 [PATCH] tabled: use new cld api Colin McCabe
@ 2010-01-11 13:26 ` Jeff Garzik
2010-01-12 2:53 ` Colin McCabe
2010-02-05 22:04 ` Jeff Garzik
1 sibling, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2010-01-11 13:26 UTC (permalink / raw)
To: Colin McCabe; +Cc: Project Hail List, Pete Zaitcev
On 01/10/2010 10:22 AM, Colin McCabe wrote:
> Signed-off-by: Colin McCabe<cmccabe@alumni.cmu.edu>
A very similar patch is needed for chunkd's server/cldu.c... did my
spam filter eat it?
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tabled: use new cld api
2010-01-11 13:26 ` Jeff Garzik
@ 2010-01-12 2:53 ` Colin McCabe
0 siblings, 0 replies; 4+ messages in thread
From: Colin McCabe @ 2010-01-12 2:53 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Project Hail List, Pete Zaitcev
Hmm...I don't think chunkd needs a patch... at least at change a129ef0d5c.
It doesn't touch carg->u.get.buf or carg->u.get.size, since it never
calls cldc_get.
Colin
On Mon, Jan 11, 2010 at 5:26 AM, Jeff Garzik <jeff@garzik.org> wrote:
> On 01/10/2010 10:22 AM, Colin McCabe wrote:
>>
>> Signed-off-by: Colin McCabe<cmccabe@alumni.cmu.edu>
>
> A very similar patch is needed for chunkd's server/cldu.c... did my spam
> filter eat it?
>
> Jeff
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tabled: use new cld api
2010-01-10 15:22 [PATCH] tabled: use new cld api Colin McCabe
2010-01-11 13:26 ` Jeff Garzik
@ 2010-02-05 22:04 ` Jeff Garzik
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2010-02-05 22:04 UTC (permalink / raw)
To: Colin McCabe; +Cc: Project Hail List, Pete Zaitcev
On 01/10/2010 10:22 AM, Colin McCabe wrote:
> Signed-off-by: Colin McCabe<cmccabe@alumni.cmu.edu>
> ---
> server/cldu.c | 21 +++++++++------------
> 1 files changed, 9 insertions(+), 12 deletions(-)
applied
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-02-05 22:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-10 15:22 [PATCH] tabled: use new cld api Colin McCabe
2010-01-11 13:26 ` Jeff Garzik
2010-01-12 2:53 ` Colin McCabe
2010-02-05 22:04 ` Jeff Garzik
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.