FileStore::_setattrs: use _fsetattrs

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index a8f23ba97e8700f17db5956a88f340416c2e0311..908f48abe6cad754dcfecb619d7ff24ee9332eb9 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -3846,6 +3846,7 @@ int FileStore::_setattrs(coll_t cid, const hobject_t& oid, map<string,bufferptr>
   map<string, bufferlist> omap_set;
   set<string> omap_remove;
   map<string, bufferptr> inline_set;
+  map<string, bufferptr> inline_to_set;
   int r = 0;
   int fd = lfn_open(cid, oid, 0);
   if (fd < 0) {
@@ -3890,19 +3891,14 @@ int FileStore::_setattrs(coll_t cid, const hobject_t& oid, map<string,bufferptr>
       inline_set.insert(*p);
     }
 
-    const char *val;
-    if (p->second.length())
-      val = p->second.c_str();
-    else
-      val = "";
-    // ??? Why do we skip setting all the other attrs if one fails?
-    r = chain_fsetxattr(fd, n, val, p->second.length());
-    if (r < 0) {
-      derr << "FileStore::_setattrs: chain_setxattr returned " << r << dendl;
-      break;
-    }
+    inline_to_set.insert(*p);
+
   }
 
+  r = _fsetattrs(fd, inline_to_set);
+  if (r < 0)
+    return r;
+
   if (omap_remove.size()) {
     assert(g_conf->filestore_xattr_use_omap);
     r = object_map->remove_xattrs(oid, omap_remove, &spos);