diff options
| author | Santosh Kumar Pradhan <spradhan@redhat.com> | 2013-05-22 15:26:04 +0530 | 
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-05-22 10:32:45 -0700 | 
| commit | 4df7a3c4888fbf1e1f84246aeac92af396879ce5 (patch) | |
| tree | c1f03c531df604e0ec67246dd18fac1404e12819 | |
| parent | 16b5ec67120e198fb320e13ade9e31d3761b0932 (diff) | |
xlator: NULL terminate volume_options struct
Problem:
volume_options struct for open-behind and quick-read xlators
were not NULL terminated.
Fix:
Make them NULL terminated.
Change-Id: I2615a1f15c6e5674030a219a99ddf91596bf346b
BUG: 965995
Signed-off-by: Santosh Kumar Pradhan <spradhan@redhat.com>
Reviewed-on: http://review.gluster.org/5064
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | xlators/performance/open-behind/src/open-behind.c | 11 | ||||
| -rw-r--r-- | xlators/performance/quick-read/src/quick-read.c | 1 | 
2 files changed, 7 insertions, 5 deletions
diff --git a/xlators/performance/open-behind/src/open-behind.c b/xlators/performance/open-behind/src/open-behind.c index e23a23325..b405b94cd 100644 --- a/xlators/performance/open-behind/src/open-behind.c +++ b/xlators/performance/open-behind/src/open-behind.c @@ -922,15 +922,16 @@ struct volume_options options[] = {          { .key  = {"use-anonymous-fd"},            .type = GF_OPTION_TYPE_BOOL,            .default_value = "yes", -	  .description = "For read operations, use anonymous FD when " -	  "original FD is open-behind and not yet opened in the backend.", +          .description = "For read operations, use anonymous FD when " +          "original FD is open-behind and not yet opened in the backend.",          },          { .key  = {"lazy-open"},            .type = GF_OPTION_TYPE_BOOL,            .default_value = "yes", -	  .description = "Perform open in the backend only when a necessary " -	  "FOP arrives (e.g writev on the FD, unlink of the file). When option " -	  "is disabled, perform backend open right after unwinding open().", +          .description = "Perform open in the backend only when a necessary " +          "FOP arrives (e.g writev on the FD, unlink of the file). When option " +          "is disabled, perform backend open right after unwinding open().",          }, +        { .key  = {NULL} }  }; diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c index c2ddd0df0..445ea8658 100644 --- a/xlators/performance/quick-read/src/quick-read.c +++ b/xlators/performance/quick-read/src/quick-read.c @@ -1143,4 +1143,5 @@ struct volume_options options[] = {            .max  = 1 * GF_UNIT_KB * 1000,            .default_value = "64KB",          }, +        { .key  = {NULL} }  };  | 
