Skip to content

Commit afe203b

Browse files
committed
ncm-metaconfig: ganesha: Fix wrapping and indentation in pan
1 parent ec20d0d commit afe203b

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ type ganesha_filesystem = {
8686
} = dict();
8787

8888
type ganesha_GPFS = {
89-
# no GPFS specific options
89+
# no GPFS specific options
9090
} = dict();
9191

9292
type ganesha_cacheinode_hash = {

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ declaration template metaconfig/ganesha/schema_v2;
77
include 'pan/types';
88

99
final variable GANESHA_V2_LOG_COMPONENTS = list(
10-
'ALL', 'LOG', 'LOG_EMERG', 'MEMLEAKS', 'FSAL', 'NFSPROTO',
11-
'NFS_V4', 'EXPORT', 'FILEHANDLE', 'DISPATCH', 'CACHE_INODE',
12-
'CACHE_INODE_LRU', 'HASHTABLE', 'HASHTABLE_CACHE', 'DUPREQ',
13-
'INIT', 'MAIN', 'IDMAPPER', 'NFS_READDIR', 'NFS_V4_LOCK',
14-
'CONFIG', 'CLIENTID', 'SESSIONS', 'PNFS', 'RW_LOCK', 'NLM',
15-
'RPC', 'NFS_CB', 'THREAD', 'NFS_V4_ACL', 'STATE', '9P',
16-
'9P_DISPATCH', 'FSAL_UP', 'DBUS'
10+
'ALL', 'LOG', 'LOG_EMERG', 'MEMLEAKS', 'FSAL', 'NFSPROTO',
11+
'NFS_V4', 'EXPORT', 'FILEHANDLE', 'DISPATCH', 'CACHE_INODE',
12+
'CACHE_INODE_LRU', 'HASHTABLE', 'HASHTABLE_CACHE', 'DUPREQ',
13+
'INIT', 'MAIN', 'IDMAPPER', 'NFS_READDIR', 'NFS_V4_LOCK',
14+
'CONFIG', 'CLIENTID', 'SESSIONS', 'PNFS', 'RW_LOCK', 'NLM',
15+
'RPC', 'NFS_CB', 'THREAD', 'NFS_V4_ACL', 'STATE', '9P',
16+
'9P_DISPATCH', 'FSAL_UP', 'DBUS',
1717
);
1818

1919
@{ Ganesha 9p protocol section @}
@@ -89,7 +89,8 @@ type ganesha_v2_export_permissions = {
8989
"Protocols" ? ganesha_v2_protocol[] = list('3', '4', '9P')
9090
"SecType" ? ganesha_v2_SecType[] = list('none', 'sys')
9191
"Squash" ? string = "root_squash" with match(SELF,
92-
'^((root|all)(_?squash)?|no_root_squash|none|noidsquash)$')
92+
'^((root|all)(_?squash)?|no_root_squash|none|noidsquash)$'
93+
)
9394
"Transports" ? ganesha_v2_Transports[] = list('UDP', 'TCP')
9495
"Trust_Readdir_Negative_Cache" ? boolean = false
9596
};
@@ -130,7 +131,8 @@ type ganesha_v2_exports = {
130131
};
131132

132133
type ganesha_v2_log_level = string with match(SELF,
133-
'^(NULL|FATAL|MAJ|CRIT|WARN|EVENT|INFO|DEBUG|MID_DEBUG|M_DBG|FULL_DEBUG|F_DBG)$');
134+
'^(NULL|FATAL|MAJ|CRIT|WARN|EVENT|INFO|DEBUG|MID_DEBUG|M_DBG|FULL_DEBUG|F_DBG)$'
135+
);
134136

135137
@{ Check for valid Ganesha Log Component names @}
136138
function is_ganesha_v2_log_Components = {
@@ -145,7 +147,8 @@ function is_ganesha_v2_log_Components = {
145147
type ganesha_v2_log_Components = ganesha_v2_log_level{} with is_ganesha_v2_log_Components(SELF);
146148

147149
type ganesha_v2_log_time_format = string with match(SELF,
148-
'^(ganesha|true|local|8601|ISO-8601|ISO 8601|ISO|syslog|syslog_usec|false|none|user_defined)$');
150+
'^(ganesha|true|local|8601|ISO-8601|ISO 8601|ISO|syslog|syslog_usec|false|none|user_defined)$'
151+
);
149152

150153
@{ Ganesha Log Format subsection @}
151154
type ganesha_v2_log_Format = {

0 commit comments

Comments
 (0)