From: Greg Farnum <greg@inktank.com>
Date: Tue, 20 May 2014 20:04:02 +0000 (-0700)
Subject: FileStore: do not use user_only in collection_getattrs
X-Git-Tag: v0.83~109^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbe6009f220e6847cb82126d359e03cb59f0b525;p=ceph.git

FileStore: do not use user_only in collection_getattrs

There's no particular reason why any of the callers of collection_getattrs
want to avoid looking at Ceph's internal xattrs.
It looks like this flag (set in 1862ddd88548fd4609f4fa9715dbad42a84d3775) was
set this way by mistake.
And finally, we don't actually set xattrs on collections anymore, anyway.

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index f183b3a3f4c..b8967a8b660 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -4039,7 +4039,7 @@ int FileStore::collection_getattrs(coll_t cid, map<string,bufferptr>& aset)
     r = -errno;
     goto out;
   }
-  r = _fgetattrs(fd, aset, true);
+  r = _fgetattrs(fd, aset, false);
   VOID_TEMP_FAILURE_RETRY(::close(fd));
  out:
   dout(10) << "collection_getattrs " << fn << " = " << r << dendl;