From: Dan Mick <dan.mick@inktank.com>
Date: Fri, 5 Oct 2012 18:12:07 +0000 (-0700)
Subject: rbd: Make lock list adapt 'number' of msg (1 lock, 2 locks)
X-Git-Tag: v0.54~103
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a484be5f5d4ac151860bb780a4935fd4cb67d4f;p=ceph.git

rbd: Make lock list adapt 'number' of msg (1 lock, 2 locks)

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index 4d26ddd7f3fb..de37955680e2 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -487,9 +487,10 @@ static int do_lock_list(librbd::Image& image)
     return r;
 
   if (lockers.size()) {
-    cout << "There are " << lockers.size()
+    bool one = (lockers.size() == 1);
+    cout << "There " << (one ? "is " : "are ") << lockers.size()
 	 << (exclusive ? " exclusive" : " shared")
-	 << " lock(s) on this image.\n";
+	 << " lock" << (one ? "" : "s") << " on this image.\n";
     if (!exclusive)
       cout << "Lock tag: " << tag << "\n";