From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 27 Jan 2025 11:29:54 +0000 (+0100)
Subject: osd/OSDCap: fix misleading grammar comments
X-Git-Tag: testing/wip-pdonnell-testing-20250130.221602-debug~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d99367e1e03cbeefd33d7dd9405245e089c2237c;p=ceph-ci.git

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 <idryomov@gmail.com>
---

diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc
index 6c30cd84938..569ff269308 100644
--- a/src/osd/OSDCap.cc
+++ b/src/osd/OSDCap.cc
@@ -445,7 +445,7 @@ struct OSDCapParser : qi::grammar<Iterator, OSDCap()>
 	       >> (lit('=') | spaces)
 	       >> estr >> -char_('*'));
 
-    // match := [pool[=]<poolname> [namespace[=]<namespace>]] [object_prefix <prefix>]
+    // match := [pool[=]<poolname>] [namespace[=]<namespace>] [object_prefix <prefix>]
     object_prefix %= -(spaces >> lit("object_prefix") >> spaces >> str);
     pooltag %= (spaces >> lit("tag")
 		>> spaces >> str // application
@@ -478,7 +478,7 @@ struct OSDCapParser : qi::grammar<Iterator, OSDCap()>
       (rwxa)                      [_val = phoenix::construct<OSDCapSpec>(_1)] |
       (class_name >> method_name) [_val = phoenix::construct<OSDCapSpec>(_1, _2)]);
 
-    // profile := profile <name> [pool[=]<pool> [namespace[=]<namespace>]]
+    // profile := profile <name> [pool[=]<pool>] [namespace[=]<namespace>]
     profile_name %= (lit("profile") >> (lit('=') | spaces) >> str);
     profile = (
       (profile_name >> pool_name >> nspace) [_val = phoenix::construct<OSDCapProfile>(_1, _2, _3)] |