From: Sage Weil <sage@newdream.net>
Date: Thu, 9 Oct 2008 23:22:23 +0000 (-0700)
Subject: client: fix && || parens
X-Git-Tag: v0.5~340
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4024afe6592891fd7a39900469dda21ee5474dc;p=ceph.git

client: fix && || parens
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 03d91e053039..4dce066c5036 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4244,7 +4244,7 @@ int Client::ll_lookup(vinodeno_t parent, const char *name, struct stat *attr, in
 	diri->dir->dentries.count(dname)) {
       Dentry *dn = diri->dir->dentries[dname];
       if ((dn->lease_mds >= 0 && dn->lease_ttl > now) ||
-	  diri->lease_mds >= 0 && diri->lease_ttl > now && (diri->lease_mask & CEPH_LOCK_ICONTENT)) {
+	  (diri->lease_mds >= 0 && diri->lease_ttl > now && (diri->lease_mask & CEPH_LOCK_ICONTENT))) {
 	touch_dn(dn);
 	in = dn->inode;
 	dout(1) << "ll_lookup " << parent << " " << name << " -> have valid lease on dentry|ICONTENT" << dendl;