Skip to content

Commit ca08171

Browse files
committed
ncm-metaconfig/ganesha: Fix lint warnings in pan files
1 parent afe203b commit ca08171

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

ncm-metaconfig/src/main/metaconfig/ganesha/2.2/tests/profiles/attribute.pan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ prefix "/metaconfig/contents/main/test";
113113
"Enable_RQUOTA" = true;
114114
"MNT_Port" = 0;
115115
"MNT_Program" = 100005;
116-
"Manage_Gids_Expiration" = 30*60;
116+
"Manage_Gids_Expiration" = 30 * 60;
117117
"MaxRPCRecvBufferSize" = 1048576;
118118
"MaxRPCSendBufferSize" = 1048576;
119119
"NFS_Port" = 2049;
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
unique template metaconfig/ganesha/config_v1;
22

33
variable GANESHA_FSAL ?= undef;
4-
variable GANESHA_SERVICE ?= format('nfs-ganesha-%s',GANESHA_FSAL);
4+
variable GANESHA_SERVICE ?= format('nfs-ganesha-%s', GANESHA_FSAL);
55
variable GANESHA_MANAGES_GANESHA ?= true;
66

77
include 'metaconfig/ganesha/schema';
88

99
bind "/software/components/metaconfig/services/{/etc/ganesha/ganesha.nfsd.conf}/contents" = ganesha_config;
1010

1111
prefix "/software/components/metaconfig/services/{/etc/ganesha/ganesha.nfsd.conf}";
12-
"daemons" = {if(GANESHA_MANAGES_GANESHA) {dict(GANESHA_SERVICE, "restart")} else {null};};
12+
"daemons" = if(GANESHA_MANAGES_GANESHA) dict(GANESHA_SERVICE, "restart") else null;
1313
"module" = "ganesha/1.5/main";
1414

1515
prefix "/software/components/metaconfig/services/{/etc/ganesha/ganesha.nfsd.conf}/contents/main";
1616
'SNMP_ADM/snmp_adm_log' = '/var/log/ganesha_snmp_adm.log';
17-

ncm-metaconfig/src/main/metaconfig/ganesha/pan/config_v2.pan

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ include 'metaconfig/ganesha/schema_v2';
88
bind "/software/components/metaconfig/services/{/etc/ganesha/ganesha.conf}/contents" = ganesha_v2_config;
99

1010
prefix "/software/components/metaconfig/services/{/etc/ganesha/ganesha.conf}";
11-
"daemons" = {if(GANESHA_MANAGES_GANESHA) {dict(GANESHA_SERVICE, "restart")} else {null};};
11+
"daemons" = if(GANESHA_MANAGES_GANESHA) dict(GANESHA_SERVICE, "restart") else null;
1212
"module" = "ganesha/2.2/main";
13-

ncm-metaconfig/src/main/metaconfig/ganesha/pan/fsal/gpfs.pan

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,19 @@ prefix "/software/components/metaconfig/services/{/etc/ganesha/ganesha.nfsd.conf
1313
"CacheInode/Symlink_Expiration_Time" = 120;
1414
"CacheInode/Directory_Expiration_Time" = 120;
1515

16-
"CacheInode_GC_Policy/Entries_HWMark" = 1500*256*GANESHA_GPFS_MULTIPLIER;
17-
"CacheInode_GC_Policy/Entries_LWMark" = 1000*256*GANESHA_GPFS_MULTIPLIER;
16+
"CacheInode_GC_Policy/Entries_HWMark" = 1500 * 256 * GANESHA_GPFS_MULTIPLIER;
17+
"CacheInode_GC_Policy/Entries_LWMark" = 1000 * 256 * GANESHA_GPFS_MULTIPLIER;
1818
"CacheInode_GC_Policy/LRU_Run_Interval" = 90;
1919
"CacheInode_GC_Policy/FD_HWMark_Percent" = 60;
2020
"CacheInode_GC_Policy/FD_LWMark_Percent" = 20;
2121
"CacheInode_GC_Policy/FD_Limit_Percent" = 90;
2222
"CacheInode_GC_Policy/Reaper_Work" = 15000;
2323

24-
"NFS_Core_Param/Nb_Worker" = 128*GANESHA_GPFS_MULTIPLIER;
24+
"NFS_Core_Param/Nb_Worker" = 128 * GANESHA_GPFS_MULTIPLIER;
2525
"NFS_Core_Param/MNT_Port" = 32767;
2626
"NFS_Core_Param/NLM_Port" = 32769;
2727
"NFS_Core_Param/RQOTA_Port" = null; # no rqouta on gpfs
2828
"NFS_Core_Param/Nb_Max_Fd" = -1;
2929
"NFS_Core_Param/Clustered" = true;
3030

3131
"SNMP_ADM/export_cache_inode_calls_detail" = null; # not for gpfs
32-

ncm-metaconfig/src/main/metaconfig/ganesha/pan/schema.pan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ type ganesha_nfs_core_param = {
197197

198198
"MaxRPCSendBufferSize" ? long(0..) = 32768 # The size of each RPC send buffer in bytes and effectively the maximum send size.
199199
"MaxRPCRecvBufferSize" ? long(0..) = 32768 # The size of each RPC receive buffer in bytes and effectively the maximum receive size.
200-
"NFS_Protocols" ? ganesha_nfs_protocol[] = list(3,4) # List of NFS Protocol Versions that should be supported
200+
"NFS_Protocols" ? ganesha_nfs_protocol[] = list(3, 4) # List of NFS Protocol Versions that should be supported
201201
} = dict();
202202

203203
type ganesha_nfs_dupreq_hash = {

ncm-metaconfig/src/main/metaconfig/ganesha/pan/schema_v2.pan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ function is_ganesha_v2_log_Components = {
139139
components = ARGV[0];
140140
foreach(cmp; logl; components) {
141141
if(index(cmp, GANESHA_V2_LOG_COMPONENTS) == -1) {
142-
error(format("%s is not a valid Ganesha Log Component !", cmp));
142+
error("%s is not a valid Ganesha Log Component !", cmp);
143143
return(false);
144144
};
145145
};

0 commit comments

Comments
 (0)