summaryrefslogtreecommitdiffstats
path: root/api/src/glfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'api/src/glfs.c')
-rw-r--r--api/src/glfs.c59
1 files changed, 1 insertions, 58 deletions
diff --git a/api/src/glfs.c b/api/src/glfs.c
index 7b9f1ed6d01..fc392947e1e 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -253,58 +253,6 @@ get_volfp (struct glfs *fs)
}
-static int
-detect_upcall_features (struct glfs *fs)
-{
- xlator_t *subvol = NULL;
- int ret = -1;
- dict_t *dict = NULL;
- uint32_t features = 0;
-
- DECLARE_OLD_THIS;
- __GLFS_ENTRY_VALIDATE_FS (fs, invalid_fs);
-
- subvol = glfs_active_subvol (fs);
- if (!subvol) {
- ret = -1;
- errno = EIO;
- goto out;
- }
-
- ret = syncop_ipc (subvol, GF_IPC_UPCALL_FEATURES, NULL, &dict);
- DECODE_SYNCOP_ERR (ret);
-
- if (ret)
- /* some real error occured */
- goto out;
-
- if (!dict) {
- /* unavailable upcalls should not be an error */
- ret = 0;
- goto out;
- }
-
- ret = dict_get_uint32 (dict, GF_UPCALL_FEATURES, &features);
- if (ret) {
- /* unavailable upcalls should not be an error */
- ret = 0;
- goto out;
- }
-
- fs->upcall_features = features;
-
-out:
- if (dict)
- dict_unref (dict);
-
- glfs_subvol_done (fs, subvol);
- __GLFS_EXIT_FS;
-
-invalid_fs:
- return ret;
-}
-
-
int
glfs_volumes_init (struct glfs *fs)
{
@@ -319,7 +267,7 @@ glfs_volumes_init (struct glfs *fs)
if (cmd_args->volfile_server) {
ret = glfs_mgmt_init (fs);
- goto finish;
+ goto out;
}
fp = get_volfp (fs);
@@ -336,11 +284,6 @@ glfs_volumes_init (struct glfs *fs)
if (ret)
goto out;
-finish:
- ret = detect_upcall_features (fs);
- if (ret)
- goto out;
-
out:
return ret;
}