summaryrefslogtreecommitdiffstats
path: root/libglusterfsclient/src/libglusterfsclient.c
diff options
context:
space:
mode:
authorShehjar Tikoo <shehjart@gluster.com>2009-12-03 03:43:12 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-12-03 02:21:24 -0800
commit2615d1a9558868b0b247375fc7560ea399390516 (patch)
treeafa0e3c214229c4d433f7b396c372c268aefacec /libglusterfsclient/src/libglusterfsclient.c
parent0f73d6c94ce00eae317463fe32de40bb4225c820 (diff)
libglusterfsclient: Separate order of path compaction and VMP search for abs and rel paths
The previous set of changes for relative paths in libglusterfsclient break the absolute path operation. The fix involves differentiating between absolute and relative paths in terms of the order in which the 2 operations are performed: - path compaction - VMP search For absolute paths, since we assume that VMP is already perfixed to the path, we need the following order of operation: 1. VMP search 2. path compaction on the path components beyond the VMP. For relative paths, the operations are reversed because there we do not have a VMP pre-fixed in order to perform a VMP search. This means that a path compaction combined with prepending of the CWD is needed to get an absolute path before the VMP is searched for. Signed-off-by: Shehjar Tikoo <shehjart@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 369 (Samba does not work with booster.) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=369
Diffstat (limited to 'libglusterfsclient/src/libglusterfsclient.c')
-rwxr-xr-xlibglusterfsclient/src/libglusterfsclient.c64
1 files changed, 55 insertions, 9 deletions
diff --git a/libglusterfsclient/src/libglusterfsclient.c b/libglusterfsclient/src/libglusterfsclient.c
index 456323778fa..9f8a8a15e8e 100755
--- a/libglusterfsclient/src/libglusterfsclient.c
+++ b/libglusterfsclient/src/libglusterfsclient.c
@@ -1792,21 +1792,49 @@ libgf_resolved_path_handle (const char *path, char *vpath)
char *respath = NULL;
struct vmp_entry *entry = NULL;
glusterfs_handle_t handle = NULL;
+ char *tmp = NULL;
if ((!path) || (!vpath))
return NULL;
- respath = libgf_resolve_path_light ((char *)path);
- if (respath == NULL) {
- return NULL;
+ /* We only want compaction before VMP entry search because the
+ * VMP cannot be search unless we have an absolute path.
+ * For absolute paths, we search for VMP first, then perform the
+ * path compaction on the given virtual path.
+ */
+ if (!libgf_path_absolute (path)) {
+ respath = libgf_resolve_path_light ((char *)path);
+ if (respath == NULL)
+ return NULL;
}
- entry = libgf_vmp_search_entry (respath);
- if (!entry)
- goto free_respath;
-
- if (!libgf_vmp_virtual_path (entry, respath, vpath))
- goto free_respath;
+ /* This condition is needed because in case of absolute paths, the path
+ * would already include the VMP and we want to ensure that any path
+ * compaction that happens does not exclude the VMP. In the absence of
+ * this condition an absolute path might get compacted to "/", i.e.
+ * exclude the VMP, and the search will fail.
+ *
+ * For relative paths, respath will aleady include a potential VMP
+ * as a consequence of us prepending the CWD in resolve_light above.
+ */
+ if (libgf_path_absolute (path)) {
+ entry = libgf_vmp_search_entry ((char *)path);
+ if (!entry)
+ goto free_respath;
+ tmp = libgf_vmp_virtual_path (entry, path, vpath);
+ if (!tmp)
+ goto free_respath;
+
+ respath = libgf_resolve_path_light (vpath);
+ strcpy (vpath, respath);
+ } else {
+ entry = libgf_vmp_search_entry (respath);
+ if (!entry)
+ goto free_respath;
+ tmp = libgf_vmp_virtual_path (entry, respath, vpath);
+ if (!tmp)
+ goto free_respath;
+ }
handle = entry->handle;
free_respath:
@@ -7348,6 +7376,7 @@ glusterfs_realpath (const char *path, char *resolved_path)
char *res = NULL;
char vpath[PATH_MAX];
glusterfs_handle_t h = NULL;
+ char *realp = NULL;
GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
@@ -7359,13 +7388,30 @@ glusterfs_realpath (const char *path, char *resolved_path)
goto out;
}
+ realp = CALLOC (PATH_MAX, sizeof (char));
+ if (!realp)
+ goto out;
+
+ libgf_vmp_search_vmp (h, realp, PATH_MAX);
res = glusterfs_glh_realpath (h, vpath, resolved_path);
if (!res)
goto out;
+ /* This copy is needed to ensure that when we return the real resolved
+ * path, we return a path that accounts for the app's view of the
+ * path, i.e. it starts with the VMP, in case this is an absolute path.
+ */
+ if (libgf_path_absolute (path)) {
+ strcat (realp, resolved_path);
+ strcpy (resolved_path, realp);
+ }
+
gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, resolved %s", path,
resolved_path);
out:
+ if (realp)
+ FREE (realp);
+
return res;
}