From 6cd656152901ba19ef52f762d000e329e3f7dbc6 Mon Sep 17 00:00:00 2001 From: Shehjar Tikoo Date: Mon, 20 Apr 2009 12:29:40 -0700 Subject: libglusterfsclient: Add VMP-based get Signed-off-by: Anand V. Avati --- libglusterfsclient/src/libglusterfsclient.c | 31 ++++++++++++++++++++++++----- libglusterfsclient/src/libglusterfsclient.h | 5 ++++- 2 files changed, 30 insertions(+), 6 deletions(-) (limited to 'libglusterfsclient') diff --git a/libglusterfsclient/src/libglusterfsclient.c b/libglusterfsclient/src/libglusterfsclient.c index 4fcc9b6ce71..809c76da1c8 100755 --- a/libglusterfsclient/src/libglusterfsclient.c +++ b/libglusterfsclient/src/libglusterfsclient.c @@ -1187,11 +1187,8 @@ out: } int -glusterfs_get (glusterfs_handle_t handle, - const char *path, - void *buf, - size_t size, - struct stat *stbuf) +glusterfs_glh_get (glusterfs_handle_t handle, const char *path, void *buf, + size_t size, struct stat *stbuf) { int32_t op_ret = -1; loc_t loc = {0, }; @@ -1268,6 +1265,30 @@ out: return op_ret; } +int +glusterfs_get (const char *path, void *buf, size_t size, struct stat *stbuf) +{ + struct vmp_entry *entry = NULL; + int op_ret = -1; + char *vpath = NULL; + + GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out); + GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, buf, out); + GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, stbuf, out); + + entry = libgf_vmp_search_entry ((char *)path); + if (!entry) { + errno = ENODEV; + goto out; + } + + vpath = libgf_vmp_virtual_path (entry, path); + op_ret = glusterfs_glh_get (entry->handle, vpath, buf, size, stbuf); + +out: + return op_ret; +} + int libgf_client_lookup_async_cbk (call_frame_t *frame, void *cookie, diff --git a/libglusterfsclient/src/libglusterfsclient.h b/libglusterfsclient/src/libglusterfsclient.h index b37813dd6aa..71f70e730c1 100755 --- a/libglusterfsclient/src/libglusterfsclient.h +++ b/libglusterfsclient/src/libglusterfsclient.h @@ -91,9 +91,12 @@ glusterfs_fini (glusterfs_handle_t handle); */ int -glusterfs_get (glusterfs_handle_t handle, const char *path, void *buf, +glusterfs_glh_get (glusterfs_handle_t handle, const char *path, void *buf, size_t size, struct stat *stbuf); +int +glusterfs_get (const char *path, void *buf, size_t size, struct stat *stbuf); + int glusterfs_get_async (glusterfs_handle_t handle, const char *path, size_t size, glusterfs_get_cbk_t cbk, void *cbk_data); -- cgit