nfs-utils: getexportent interprets -test-client- as default options
Subsystems (2)
PATCH 1/1 nfs-utils: getexportent interprets -test-client- as default options
With commit 1374c3861abdc66f3a1410e26cc85f86760b51dd Neil added a -test-client- export to test the exportability of filesystems when exportfs is run. When using the old cache controls (i.e. /proc/fs/nfsd is not mounted) exportfs will read /proc/fs/nfs/exports and find these test client entries. The dash at the beginning of -test-client- will be cause getexportent to look for default options in the rest of the string, which test-client- will not match:
exportfs: /proc/fs/nfs/exports:1: unknown keyword "test-client-(rw"
This patch resolves the problem by testing for -test-client- string in the check for default arguments.
--- support/nfs/exports.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
support/nfs/exports.c +6 -3
@@ -142,9 +142,12 @@ getexportent(int fromkernel, int fromexports)return NULL ; } first =0 ; - -/* Check for default options */ -if (exp[0 ] =='-' ) { + +/* +* Check for default options. The test client string does not indicate +* default arguments. +*/ +if (exp[0 ] =='-' &&strncmp (exp,"-test-client-" ,13 ) !=0 ) {if (parseopts (exp +1 , &def_ee,0 , &has_default_subtree_opts) <0 )return NULL ;
Quoted 26 lines · Ben Myers
With commit
1374c3861abdc66f3a1410e26cc85f86760b51ddNeil added a -test-client- export to test the exportability of filesystems when exportfs is run. When using the old cache controls (i.e./proc/fs/nfsdis not mounted) exportfs will read/proc/fs/nfs/exportsand find these test client entries. The dash at the beginning of -test-client- will be cause getexportent to look for default options in the rest of the string, which test-client- will not match:exportfs:
/proc/fs/nfs/exports:1: unknown keyword "test-client-(rw"This patch resolves the problem by testing for -test-client- string in the check for default arguments.
Signed-off-by Ben Myers <[email protected]>--- support/nfs/exports.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)support/nfs/exports.c +0
-1@@ -142,9 +142,12 @@ getexportent(int fromkernel, int fromexports)return NULL ; } first =0 ; -
support/nfs/exports.c getexportent(int fromkernel, int fromexports) · line 152
Quoted 10 lines
support/nfs/exports.c +6
-2-/* Check for default options */ -if (exp[0 ] =='-' ) { + +/* +* Check for default options. The test client string does not indicate +* default arguments. +*/ +if (exp[0 ] =='-' &&strncmp (exp,"-test-client-" ,13 ) !=0 ) {if (parseopts (exp +1 , &def_ee,0 , &has_default_subtree_opts) <0 )return NULL ;
If I'm understanding you correctly, when using the old cache controls and when processing exports that are already exported (exports that are in /proc/fs/nfs/exports) will cause this problem.
If this indeed is the case, I think it's a bit cleaner if we use the 'fromkernel' argument to decide if the '-' options should or should not be processed. Something like:
support/nfs/exports.c +1 -1
@@ -144,7 +144,7 @@ getexportent(int fromkernel, int fromexports) first =0 ;/* Check for default options */ -if (exp[0 ] =='-' ) { +if (exp[0 ] =='-' && !fromkernel) {if (parseopts (exp +1 , &def_ee,0 , &has_default_subtree_opts) <0 )return NULL ;
steved.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hey Steve,
Quoted 32 lines · Steve Dickson
Quoted 31 lines · Ben Myers
With commit
1374c3861abdc66f3a1410e26cc85f86760b51ddNeil added a -test-client- export to test the exportability of filesystems when exportfs is run. When using the old cache controls (i.e./proc/fs/nfsdis not mounted) exportfs will read/proc/fs/nfs/exportsand find these test client entries. The dash at the beginning of -test-client- will be cause getexportent to look for default options in the rest of the string, which test-client- will not match:exportfs:
/proc/fs/nfs/exports:1: unknown keyword "test-client-(rw"This patch resolves the problem by testing for -test-client- string in the check for default arguments.
Signed-off-by Ben Myers <[email protected]>--- support/nfs/exports.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)support/nfs/exports.c +3
-3@@ -142,9 +142,12 @@ getexportent(int fromkernel, int fromexports)return NULL ; } first =0 ; - -/* Check for default options */ -if (exp[0 ] =='-' ) { + +/* +* Check for default options. The test client string does not indicate
Quoted 8 lines
support/nfs/exports.c getexportent(int fromkernel, int fromexports) · line 152
Quoted 5 lines
support/nfs/exports.c +3
-0+* default arguments. +*/ +if (exp[0 ] =='-' &&strncmp (exp,"-test-client-" ,13 ) !=0 ) {if (parseopts (exp +1 , &def_ee,0 , &has_default_subtree_opts) <0 )return NULL ;If I'm understanding you correctly, when using the old cache controls and when processing exports that are already exported (exports that are in
/proc/fs/nfs/exports) will cause this problem.
Exactly.
Quoted 9 lines
If this indeed is the case, I think it's a bit cleaner if we use the 'fromkernel' argument to decide if the '-' options should or should not be processed. Something like:
support/nfs/exports.c +0
-0
support/nfs/exports.c getexportent(int fromkernel, int fromexports) · line 150
Quoted 8 lines
support/nfs/exports.c +1
-1@@ -144,7 +144,7 @@ getexportent(int fromkernel, int fromexports) first =0 ;/* Check for default options */ -if (exp[0 ] =='-' ) { +if (exp[0 ] =='-' && !fromkernel) {if (parseopts (exp +1 , &def_ee,0 , &has_default_subtree_opts) <0 )return NULL ;
Ok, I'll try that on.
Thanks,
Ben
PATCH v2 1/1 nfs-utils: getexportent interprets -test-client- as default options
In reply to Steve DicksonWith commit 1374c3861abdc66f3a1410e26cc85f86760b51dd Neil added a -test-client- export to test the exportability of filesystems when exportfs is run. When using the old cache controls (i.e. /proc/fs/nfsd is not mounted) exportfs will read /proc/fs/nfs/exports to process existing exports and find these test client entries. The dash at the beginning of -test-client- will be cause getexportent to look for default options in the rest of the string, which test-client- will not match:
exportfs: /proc/fs/nfs/exports:1: unknown keyword "test-client-(rw"
This patch resolves that problem (as Steve suggested) by not processing any default options if we are reading the list of existing exports from the kernel. Default options are converted to individual exports by exportfs so the kernel won't have any regardless.
--- support/nfs/exports.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
support/nfs/exports.c +8 -3
@@ -142,9 +142,14 @@ getexportent(int fromkernel, int fromexports)return NULL ; } first =0 ; - -/* Check for default options */ -if (exp[0 ] =='-' ) { + +/* +* Check for default options. The kernel will never have default +* options in /proc/fs/nfs/exports, however due to the initial '-' in +* the -test-client- string from the test export we have to check that +* we're not reading from the kernel. +*/ +if (exp[0 ] =='-' && !fromkernel) {if (parseopts (exp +1 , &def_ee,0 , &has_default_subtree_opts) <0 )return NULL ;
Quoted 33 lines · Ben Myers
With commit
1374c3861abdc66f3a1410e26cc85f86760b51ddNeil added a -test-client- export to test the exportability of filesystems when exportfs is run. When using the old cache controls (i.e./proc/fs/nfsdis not mounted) exportfs will read/proc/fs/nfs/exportsto process existing exports and find these test client entries. The dash at the beginning of -test-client- will be cause getexportent to look for default options in the rest of the string, which test-client- will not match:exportfs:
/proc/fs/nfs/exports:1: unknown keyword "test-client-(rw"This patch resolves that problem (as Steve suggested) by not processing any default options if we are reading the list of existing exports from the kernel. Default options are converted to individual exports by exportfs so the kernel won't have any regardless.
Signed-off-by Ben Myers <[email protected]>--- support/nfs/exports.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)support/nfs/exports.c +1
-3@@ -142,9 +142,14 @@ getexportent(int fromkernel, int fromexports)return NULL ; } first =0 ; - -/* Check for default options */ -if (exp[0 ] =='-' ) { +
support/nfs/exports.c getexportent(int fromkernel, int fromexports) · line 155
Quoted 10 lines
support/nfs/exports.c +7
-0+/* +* Check for default options. The kernel will never have default +* options in /proc/fs/nfs/exports, however due to the initial '-' in +* the -test-client- string from the test export we have to check that +* we're not reading from the kernel. +*/ +if (exp[0 ] =='-' && !fromkernel) {if (parseopts (exp +1 , &def_ee,0 , &has_default_subtree_opts) <0 )return NULL ;
Committed...
steved.