Merge branch 'upstream' into merge

Signed-off-by: Jeff Darcy <jdarcy@redhat.com>

Conflicts:
	api/src/glfs-fops.c
	libglusterfs/src/syncop.c
	libglusterfs/src/syncop.h

Change-Id: I8c3fa7a20fb167d9e6bc2749e177c0c8b366827b

1 files changed, 3 insertions, 1 deletions

diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c
index 0ad9ce723..7cd1e47bc 100644
--- a/api/src/glfs-resolve.c
+++ b/api/src/glfs-resolve.c
@@ -450,7 +450,9 @@ glfs_resolve_at (struct glfs *fs, xlator_t *subvol, inode_t *at,
 		ret = 0;
 	}
 
-	ret = glfs_loc_touchup (loc);
+        if (glfs_loc_touchup (loc) < 0) {
+                ret = -1;
+        }
 out:
 	GF_FREE (path);