From 245d8ad04fa562cdc9ecc161b4c1c8cfa464134a Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 4 Jan 2016 13:18:45 -0800
Subject: [PATCH] Remove vestigial data structure
---
slurm/slurm.h.in | 2 +-
src/plugins/burst_buffer/common/burst_buffer_common.h | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index 7133c60b146..1512bf9e262 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -4751,7 +4751,7 @@ typedef struct {
uint32_t flags; /* See BB_FLAG_* above */
char *get_sys_state;
uint64_t granularity; /* Granularity of resource allocation */
- uint32_t pool_cnt; /* Count of records in gres_ptr */
+ uint32_t pool_cnt; /* Count of records in pool_ptr */
burst_buffer_pool_t *pool_ptr;
char *name; /* Plugin name */
uint32_t other_timeout; /* Seconds or zero */
diff --git a/src/plugins/burst_buffer/common/burst_buffer_common.h b/src/plugins/burst_buffer/common/burst_buffer_common.h
index 6c850f5a71b..37660b5316c 100644
--- a/src/plugins/burst_buffer/common/burst_buffer_common.h
+++ b/src/plugins/burst_buffer/common/burst_buffer_common.h
@@ -75,7 +75,7 @@ typedef struct bb_config {
char *get_sys_state;
uint64_t granularity; /* space allocation granularity,
* units are GB */
- uint32_t pool_cnt; /* Count of records in gres_ptr */
+ uint32_t pool_cnt; /* Count of records in pool_ptr */
burst_buffer_pool_t *pool_ptr; /* Type is defined in slurm.h */
uint32_t other_timeout;
uint32_t stage_in_timeout;
@@ -139,14 +139,6 @@ typedef struct {
char *type; /* Buffer type */
} bb_buf_t;
-/* Generic burst buffer resources. Information about this is found in the Cray
- * documentation, but the logic in Slurm is untested and the functionality may
- * never be used. */
-typedef struct {
- char * name; /* Generic burst buffer resource, e.g. "nodes" */
- uint64_t count; /* Count of required resources */
-} bb_gres_t;
-
/* Burst buffer resources required for a job, based upon a job record's
* burst_buffer string field */
#define BB_JOB_MAGIC 0xDEAD3412
--
GitLab