From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 12 Mar 2015 11:27:32 +0000 (+0300)
Subject: rbd: drop redefining map option warning
X-Git-Tag: v9.0.0~182^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd761bb6d32038a168ffa0e85919d8891e68930e;p=ceph.git

rbd: drop redefining map option warning

For example:

    # ./rbd map -o share,noshare foo
    rbd: warning: redefining map option share: 'share' -> 'noshare'
    /dev/rbd0

mount(8) doesn't do this and it's a bit silly to begin with.  Drop this
in preparation for adding rbd default map options config option.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index 6f5457d1461f..a53e8f4f2aa0 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -2356,11 +2356,6 @@ static string map_option_int_cb(const char *value_char)
 
 static void put_map_option(const string key, string val)
 {
-  map<string, string>::const_iterator it = map_options.find(key);
-  if (it != map_options.end()) {
-    cerr << "rbd: warning: redefining map option " << key << ": '"
-         << it->second << "' -> '" << val << "'" << std::endl;
-  }
   map_options[key] = val;
 }