Skip to content

Commit d99367e

Browse files
committed
osd/OSDCap: fix misleading grammar comments
The restrictions on pool name and namespace have been independent of each other for ages. Specifying namespace[=]<namespace> doesn't require specifying pool[=]<pool> like is currently suggested -- neither for regular "allow" grants nor for "profile" grants. Signed-off-by: Ilya Dryomov <[email protected]>
1 parent 5f3815e commit d99367e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/osd/OSDCap.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ struct OSDCapParser : qi::grammar<Iterator, OSDCap()>
445445
>> (lit('=') | spaces)
446446
>> estr >> -char_('*'));
447447

448-
// match := [pool[=]<poolname> [namespace[=]<namespace>]] [object_prefix <prefix>]
448+
// match := [pool[=]<poolname>] [namespace[=]<namespace>] [object_prefix <prefix>]
449449
object_prefix %= -(spaces >> lit("object_prefix") >> spaces >> str);
450450
pooltag %= (spaces >> lit("tag")
451451
>> spaces >> str // application
@@ -478,7 +478,7 @@ struct OSDCapParser : qi::grammar<Iterator, OSDCap()>
478478
(rwxa) [_val = phoenix::construct<OSDCapSpec>(_1)] |
479479
(class_name >> method_name) [_val = phoenix::construct<OSDCapSpec>(_1, _2)]);
480480

481-
// profile := profile <name> [pool[=]<pool> [namespace[=]<namespace>]]
481+
// profile := profile <name> [pool[=]<pool>] [namespace[=]<namespace>]
482482
profile_name %= (lit("profile") >> (lit('=') | spaces) >> str);
483483
profile = (
484484
(profile_name >> pool_name >> nspace) [_val = phoenix::construct<OSDCapProfile>(_1, _2, _3)] |

0 commit comments

Comments
 (0)