From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 19 Feb 2014 15:10:54 +0000 (+0100)
Subject: Client.cc: use !empty() instead of size()
X-Git-Tag: v0.78~138^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7da714afae8c518957131667508b71688dc7df0d;p=ceph.git

Client.cc: use !empty() instead of size()

[src/client/Client.cc:2275]: (performance) Possible inefficient
  checking for 'cap_snaps' emptiness.
[src/client/Client.cc:2458]: (performance) Possible inefficient
  checking for 'cap_snaps' emptiness.
[src/client/Client.cc:2986]: (performance) Possible inefficient
  checking for 'caps' emptiness.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index a68c8443f46..248bb8ff863 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -2272,7 +2272,7 @@ void Client::put_cap_ref(Inode *in, int cap)
   if (last) {
     if (in->snapid == CEPH_NOSNAP) {
       if ((cap & CEPH_CAP_FILE_WR) &&
-	  in->cap_snaps.size() &&
+	  !in->cap_snaps.empty() &&
 	  in->cap_snaps.rbegin()->second->writing) {
 	ldout(cct, 10) << "put_cap_ref finishing pending cap_snap on " << *in << dendl;
 	in->cap_snaps.rbegin()->second->writing = 0;
@@ -2455,7 +2455,7 @@ void Client::check_caps(Inode *in, bool is_delayed)
   if (in->caps.empty())
     return;   // guard if at end of func
 
-  if (in->cap_snaps.size())
+  if (!in->cap_snaps.empty())
     flush_snaps(in);
 
   if (!is_delayed)
@@ -2983,7 +2983,7 @@ void Client::remove_cap(Cap *cap)
 
 void Client::remove_all_caps(Inode *in)
 {
-  while (in->caps.size())
+  while (!in->caps.empty())
     remove_cap(in->caps.begin()->second);
 }