diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-02-11 14:02:43 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-02-11 14:02:43 +0000 |
| commit | 0d92798e88c5444fb2cc23663b4ea9a345887756 (patch) | |
| tree | a71f336115753242e8690547f403405a3373ddf1 /api | |
| parent | 33939dcde38389373e7ed8b12c6e9916b39411d0 (diff) | |
| parent | 408d50a64b7b3a9d6a4899060baa423ff126cc5f (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
xlators/mgmt/glusterd/src/Makefile.am
Change-Id: Ida5ec4aecc358cb2268bdfdb1a8c9bab750f9575
Diffstat (limited to 'api')
| -rw-r--r-- | api/src/glfs-resolve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c index c88330aa4..0ad9ce723 100644 --- a/api/src/glfs-resolve.c +++ b/api/src/glfs-resolve.c @@ -450,7 +450,7 @@ glfs_resolve_at (struct glfs *fs, xlator_t *subvol, inode_t *at, ret = 0; } - glfs_loc_touchup (loc); + ret = glfs_loc_touchup (loc); out: GF_FREE (path); |