c++ fixes for remaining fsals
Change-Id: Ie157261e3084c4f95ba7335da1f7004a4a96fe55
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
diff --git a/src/FSAL/FSAL_CEPH/main.c b/src/FSAL/FSAL_CEPH/main.c
index 6f79c33..2c8c63a 100644
--- a/src/FSAL/FSAL_CEPH/main.c
+++ b/src/FSAL/FSAL_CEPH/main.c
@@ -184,7 +184,7 @@
/* The status code to return */
fsal_status_t status = { ERR_FSAL_NO_ERROR, 0 };
/* A fake argument list for Ceph */
- const char *argv[] = { "FSAL_CEPH", op_ctx->export->fullpath };
+ const char *argv[] = { "FSAL_CEPH", op_ctx->ctx_export->fullpath };
/* The internal export object */
struct export *export = gsh_calloc(1, sizeof(struct export));
/* The 'private' root handle */
@@ -211,7 +211,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to create Ceph handle for %s.",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto error;
}
@@ -220,7 +220,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to read Ceph configuration for %s.",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto error;
}
@@ -229,7 +229,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to parse Ceph configuration for %s.",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto error;
}
@@ -238,7 +238,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to mount Ceph cluster for %s.",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto error;
}
@@ -246,7 +246,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to attach export for %s.",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto error;
}
@@ -254,7 +254,7 @@
LogDebug(COMPONENT_FSAL,
"Ceph module export %s.",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
status = find_cephfs_root(export->cmount, &i);
if (FSAL_IS_ERROR(status))
diff --git a/src/FSAL/FSAL_GLUSTER/export.c b/src/FSAL/FSAL_GLUSTER/export.c
index 69a72a9..2d8f48c 100644
--- a/src/FSAL/FSAL_GLUSTER/export.c
+++ b/src/FSAL/FSAL_GLUSTER/export.c
@@ -623,7 +623,7 @@
.glfs_log = NULL};
LogDebug(COMPONENT_FSAL, "In args: export path = %s",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
rc = load_config_from_node(parse_node,
&export_param,
@@ -633,7 +633,7 @@
if (rc != 0) {
LogCrit(COMPONENT_FSAL,
"Incorrect or missing parameters for export %s",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
status.major = ERR_FSAL_INVAL;
goto out;
}
@@ -650,7 +650,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to create new glfs. Export: %s",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto out;
}
@@ -659,7 +659,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to set volume file. Export: %s",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto out;
}
@@ -668,7 +668,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to set logging. Export: %s",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto out;
}
@@ -677,7 +677,7 @@
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL,
"Unable to initialize volume. Export: %s",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto out;
}
@@ -685,11 +685,11 @@
if (rc != 0) {
status.major = ERR_FSAL_SERVERFAULT;
LogCrit(COMPONENT_FSAL, "Unable to attach export. Export: %s",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
goto out;
}
- glfsexport->mount_path = op_ctx->export->fullpath;
+ glfsexport->mount_path = op_ctx->ctx_export->fullpath;
glfsexport->export_path = params.glvolpath;
glfsexport->gl_fs = fs;
glfsexport->saveduid = geteuid();
@@ -713,8 +713,8 @@
goto out;
/* special case: server_id matches export_id */
- pds->id_servers = op_ctx->export->export_id;
- pds->mds_export = op_ctx->export;
+ pds->id_servers = op_ctx->ctx_export->export_id;
+ pds->mds_export = op_ctx->ctx_export;
if (!pnfs_ds_insert(pds)) {
LogCrit(COMPONENT_CONFIG,
@@ -726,7 +726,7 @@
LogDebug(COMPONENT_PNFS,
"glusterfs_fsal_create: pnfs ds was enabled for [%s]",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
}
glfsexport->pnfs_mds_enabled =
@@ -735,7 +735,7 @@
if (glfsexport->pnfs_mds_enabled) {
LogDebug(COMPONENT_PNFS,
"glusterfs_fsal_create: pnfs mds was enabled for [%s]",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
export_ops_pnfs(&glfsexport->export.exp_ops);
fsal_ops_pnfs(&glfsexport->export.fsal->m_ops);
}
@@ -750,7 +750,7 @@
if (rc != 0) {
LogCrit(COMPONENT_FSAL,
"Unable to create GLUSTERFSAL_UP_Thread. Export: %s",
- op_ctx->export->fullpath);
+ op_ctx->ctx_export->fullpath);
status.major = ERR_FSAL_FAULT;
goto out;
}
diff --git a/src/FSAL/FSAL_GLUSTER/fsal_up.c b/src/FSAL/FSAL_GLUSTER/fsal_up.c
index 96ef7f6..070a8f5 100644
--- a/src/FSAL/FSAL_GLUSTER/fsal_up.c
+++ b/src/FSAL/FSAL_GLUSTER/fsal_up.c
@@ -84,7 +84,7 @@
event_func = glfsexport->export.up_ops;
fsal_status = event_func->invalidate_close(
- event_func->export,
+ event_func->up_export,
&key,
FSAL_UP_INVALIDATE_CACHE);
diff --git a/src/FSAL/FSAL_GLUSTER/mds.c b/src/FSAL/FSAL_GLUSTER/mds.c
index 4b96d25..2dc2a1a 100644
--- a/src/FSAL/FSAL_GLUSTER/mds.c
+++ b/src/FSAL/FSAL_GLUSTER/mds.c
@@ -225,7 +225,7 @@
ds_desc.addr = &ds_wire;
ds_desc.len = sizeof(struct glfs_ds_wire);
nfs_status = FSAL_encode_file_layout(loc_body, &deviceid, util, 0, 0,
- &req_ctx->export->export_id, 1,
+ &req_ctx->ctx_export->export_id, 1,
&ds_desc);
if (nfs_status) {
LogMajor(COMPONENT_PNFS,
