os/filestore: exit if we fail to remove any xattr

The problem here is if we fail to remove one of the existing xattr
stored with fd, and we spill out more xattrs to ObjectMap, we'll
go on to cleaning up the remaining xattrs in ObjectMap, and thus
the real failure might be covered.

This commit solves the above problem by making a quick exit if
we fail to remove any xattr bound with file.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 9d0eeac2e3e2d850dcab70df17be3e65e0db5216..c1a9ee8a6992cf41e83e49b4bb4e4717ca76c7a5 100644 (file)
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -4340,8 +4340,10 @@ int FileStore::_rmattrs(const coll_t& cid, const ghobject_t& oid,
       char n[CHAIN_XATTR_MAX_NAME_LEN];
       get_attrname(p->first.c_str(), n, CHAIN_XATTR_MAX_NAME_LEN);
       r = chain_fremovexattr(**fd, n);
-      if (r < 0)
-       break;
+      if (r < 0) {
+        dout(10) << __func__ << " could not remove xattr r = " << r << dendl;
+       goto out_close;
+      }
     }
   }