diff options
| author | Vijaikumar M <vmallika@redhat.com> | 2014-03-25 15:44:56 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2014-03-25 03:32:21 -0700 |
| commit | e078092e827807aec0eef185198771f49f809b34 (patch) | |
| tree | 5eea84d1266cf2261cd8a9acb39e2262742013bc /xlators/mgmt/glusterd/src/glusterd.h | |
| parent | cb9bb522972b6cff45c0b6646100151e30e6424c (diff) | |
snapshot: cleanup unwanted CG-code
Change-Id: Id3da2a7aac84027aeff050f6dd9a3484719362bc
BUG: 1073780
Signed-off-by: Vijaikumar M <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/7204
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.h')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index e81369ee4..cb4196a9a 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -163,7 +163,6 @@ typedef struct { gf_boolean_t restart_done; rpcsvc_t *uds_rpc; /* RPCSVC for the unix domain socket */ uint32_t base_port; - struct list_head snap_cg; uint64_t snap_max_hard_limit; uint64_t snap_max_soft_limit; char *snap_bricks_directory; @@ -367,29 +366,13 @@ struct glusterd_snap_ { struct list_head snap_list; char snapname[GLUSTERD_MAX_SNAP_NAME]; uuid_t snap_id; - char cg_name[256]; - uuid_t cg_id; char *description; time_t time_stamp; - gf_boolean_t snap_restored; + gf_boolean_t snap_restored; gd_snap_status_t snap_status; gf_store_handle_t *shandle; }; -struct glusterd_snap_cg_ { - gf_lock_t lock; - uuid_t cg_id; - char cg_name[256]; - char *description; - gd_snap_status_t cg_status; - int64_t volume_count; - struct list_head cg_list; - gf_store_handle_t *shandle; - glusterd_volinfo_t *volumes[0]; -}; - -typedef struct glusterd_snap_cg_ glusterd_snap_cg_t; - typedef enum gd_node_type_ { GD_NODE_NONE, GD_NODE_BRICK, @@ -437,7 +420,6 @@ enum glusterd_vol_comp_status_ { #define GLUSTERD_NODE_STATE_FILE "node_state.info" #define GLUSTERD_VOL_SNAP_FILE "snap_list.info" #define GLUSTERD_VOL_SNAP_DIR_PREFIX "snaps" -#define GLUSTERD_VOL_SNAP_CG_DIR_PREFIX "cgs" #define GLUSTERD_DEFAULT_SNAPS_BRICK_DIR "/gluster/snaps" #define GLUSTERD_VAR_RUN_DIR "/var/run" @@ -467,10 +449,6 @@ typedef ssize_t (*gd_serialize_t) (struct iovec outmsg, void *args); snprintf (path, PATH_MAX, "%s/snaps/%s", priv->workdir, \ snap->snapname); -#define GLUSTERD_GET_SNAP_CG_DIR(path, priv) \ - snprintf (path, PATH_MAX, "%s/%s", priv->workdir,\ - GLUSTERD_VOL_SNAP_CG_DIR_PREFIX); - #define GLUSTERD_GET_BRICK_DIR(path, volinfo, priv) \ if (volinfo->is_snap_volume) { \ snprintf (path, PATH_MAX, "%s/snaps/%s/%s/%s", priv->workdir, \ @@ -907,9 +885,6 @@ glusterd_txn_opinfo_init (); glusterd_snap_t* glusterd_new_snap_object(); -glusterd_snap_cg_t* -glusterd_new_snap_cg_object(int64_t volume_count); - int32_t glusterd_list_add_snapvol (glusterd_volinfo_t *origin_vol, glusterd_volinfo_t *snap_vol); @@ -926,20 +901,6 @@ glusterd_find_snap_by_name (char *snap_name); glusterd_snap_t* glusterd_find_snap_by_id (uuid_t snap_id); -int32_t -glusterd_add_snap_cg (glusterd_conf_t *conf, glusterd_snap_cg_t *cg); - -glusterd_snap_cg_t* -glusterd_remove_snap_cg_by_name (glusterd_conf_t *conf, char *cg_name); - -glusterd_snap_cg_t* -glusterd_remove_snap_cg_by_id (glusterd_conf_t *conf, uuid_t cg_id); - -glusterd_snap_cg_t* -glusterd_find_snap_cg_by_id (glusterd_conf_t *conf, uuid_t cg_id); - -glusterd_snap_cg_t* -glusterd_find_snap_cg_by_name (glusterd_conf_t *conf, char *cg_name); int glusterd_snapshot_prevalidate (dict_t *dict, char **op_errstr, dict_t *rsp_dict); |