From d03e51668d5d0849d7acd7659a3e8028db85b089 Mon Sep 17 00:00:00 2001 From: Shehjar Tikoo Date: Fri, 2 Oct 2009 03:08:07 +0000 Subject: libglusterfsclient: Port directory reading to readdirp fop Signed-off-by: Anand V. Avati BUG: 292 (Separate readdirp functionality from readdir fop) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=292 --- libglusterfsclient/src/libglusterfsclient.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'libglusterfsclient') diff --git a/libglusterfsclient/src/libglusterfsclient.c b/libglusterfsclient/src/libglusterfsclient.c index 97bcdbc717b..ea7ca7c2830 100755 --- a/libglusterfsclient/src/libglusterfsclient.c +++ b/libglusterfsclient/src/libglusterfsclient.c @@ -4038,12 +4038,9 @@ out: int32_t -libgf_client_readdir_cbk (call_frame_t *frame, - void *cookie, - xlator_t *this, - int32_t op_ret, - int32_t op_errno, - gf_dirent_t *entries) +libgf_client_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int32_t op_ret, int32_t op_errno, + gf_dirent_t *entries) { libgf_client_local_t *local = frame->local; @@ -4052,8 +4049,8 @@ libgf_client_readdir_cbk (call_frame_t *frame, * dcache, thereby avoiding the need to perform more allocations and * copies. */ - local->reply_stub = fop_readdir_cbk_stub (frame, NULL, op_ret, op_errno, - NULL); + local->reply_stub = fop_readdirp_cbk_stub (frame, NULL, op_ret, + op_errno, NULL); if (op_ret > 0) libgf_dcache_update (frame->root->state, local->fd, entries); LIBGF_REPLY_NOTIFY (local); @@ -4073,7 +4070,7 @@ libgf_client_readdir (libglusterfs_client_ctx_t *ctx, fd_t *fd, local = CALLOC (1, sizeof (*local)); ERR_ABORT (local); local->fd = fd; - LIBGF_CLIENT_FOP (ctx, stub, readdir, local, fd, + LIBGF_CLIENT_FOP (ctx, stub, readdirp, local, fd, LIBGF_READDIR_BLOCK, *offset); errno = stub->args.readdir_cbk.op_errno; -- cgit