From: Sage Weil <sage@newdream.net>
Date: Tue, 24 Aug 2010 20:06:13 +0000 (-0700)
Subject: client: only includee xattrs in caps msg if we are flushing that bit
X-Git-Tag: v0.22~226
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f07fdeee6a7a5765a313342842dc4e26bd6b3593;p=ceph.git

client: only includee xattrs in caps msg if we are flushing that bit
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 4ee5c8b437dd..d290236a2f73 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1751,8 +1751,10 @@ void Client::send_cap(Inode *in, int mds, InodeCap *cap, int used, int want, int
   
   m->head.nlink = in->nlink;
   
-  ::encode(in->xattrs, m->xattrbl);
-  m->head.xattr_version = in->xattr_version;
+  if (flush & CEPH_CAP_XATTR_EXCL) {
+    ::encode(in->xattrs, m->xattrbl);
+    m->head.xattr_version = in->xattr_version;
+  }
   
   m->head.layout = in->layout;
   m->head.size = in->size;