update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / libradosstriper / RadosStriperImpl.cc

diff --git a/ceph/src/libradosstriper/RadosStriperImpl.cc b/ceph/src/libradosstriper/RadosStriperImpl.cc
index 8d34ce51ecd5633aad6e1b02bb2a759a7e9f6c95..1a3eb99f860abaaec98444fd9bfae11d18ecd1db 100644 (file)
--- a/ceph/src/libradosstriper/RadosStriperImpl.cc
+++ b/ceph/src/libradosstriper/RadosStriperImpl.cc
@@ -60,7 +60,7 @@
  *
  * Still the writing to a striped object is not atomic. This means in particular that
  * the size of an object may not be in sync with its content at all times.
- * As the size is always garanteed to be updated first and in an atomic way, and as
+ * As the size is always guaranteed to be updated first and in an atomic way, and as
  * sparse striped objects are supported (see below), what will typically happen is
  * that a reader that comes too soon after a write will read 0s instead of the actual
  * data.
@@ -247,10 +247,10 @@ void ReadCompletionData::complete_unlock(int r) {
 struct WriteCompletionData : CompletionData {
   /// safe completion handler
   librados::IoCtxImpl::C_aio_Complete *m_safe;
-  /// return code of write completion, to be remembered until unlocking happened
-  int m_writeRc;
   /// completion object for the unlocking of the striped object at the end of the write
   librados::AioCompletion *m_unlockCompletion;
+  /// return code of write completion, to be remembered until unlocking happened
+  int m_writeRc;
   /// constructor
   WriteCompletionData(libradosstriper::RadosStriperImpl * striper,
                      const std::string& soid,
@@ -1080,7 +1080,7 @@ int libradosstriper::RadosStriperImpl::internal_aio_remove(
     // return
     return rcr;
   } catch (ErrorCode &e) {
-    // errror caught when trying to take the exclusive lock
+    // error caught when trying to take the exclusive lock
     return e.m_code;
   }