From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 21 Jul 2016 09:39:54 +0000 (+0800)
Subject: mds: mds: avoid unnecessary log flush when setattr
X-Git-Tag: v11.0.1~136^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fdf98c10260546fdca13dbe2edc4445faccc13f5;p=ceph.git

mds: mds: avoid unnecessary log flush when setattr

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index bae791b05163..9e4df1404043 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -3839,7 +3839,8 @@ void Server::handle_client_setattr(MDRequestRef& mdr)
 								   truncating_smaller, changed_ranges));
 
   // flush immediately if there are readers/writers waiting
-  if (cur->get_caps_wanted() & (CEPH_CAP_FILE_RD|CEPH_CAP_FILE_WR))
+  if (xlocks.count(&cur->filelock) &&
+      (cur->get_caps_wanted() & (CEPH_CAP_FILE_RD|CEPH_CAP_FILE_WR)))
     mds->mdlog->flush();
 }