reef:mds: fix backporting merge errors

Signed-off-by: Igor Golikov <igolikov@ibm.com>
Fixes: https://tracker.ceph.com/issues/64611

diff --git a/src/client/Client.cc b/src/client/Client.cc
index daa8a4b8c5e90b1ceb2ddfed77920cc2f19deb6e..13f9a65ba415740b22537c2e51a81b9368eb397f 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -10678,7 +10678,7 @@ int Client::read(int fd, char *buf, loff_t size, loff_t offset)
 int Client::preadv(int fd, const struct iovec *iov, int iovcnt, loff_t offset)
 {
   if (iovcnt < 0)
-    return -CEPHFS_EINVAL;
+    return -EINVAL;
   return _preadv_pwritev(fd, iov, iovcnt, offset, false);
 }
 
@@ -10995,7 +10995,7 @@ int Client::write(int fd, const char *buf, loff_t size, loff_t offset)
 int Client::pwritev(int fd, const struct iovec *iov, int iovcnt, int64_t offset)
 {
   if (iovcnt < 0)
-    return -CEPHFS_EINVAL;
+    return -EINVAL;
   return _preadv_pwritev(fd, iov, iovcnt, offset, true);
 }
 
@@ -11009,9 +11009,6 @@ int64_t Client::_preadv_pwritev_locked(Fh *fh, const struct iovec *iov,
     if (fh->flags & O_PATH)
         return -EBADF;
 #endif
-    if(iovcnt < 0) {
-      return -EINVAL;
-    }
     loff_t totallen = 0;
     for (unsigned i = 0; i < iovcnt; i++) {
         totallen += iov[i].iov_len;

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 703df19dfe548e2a8542a7d863345740602b1540..9227caa28457ab9d0424448184a4ec678e55a436 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -3344,7 +3344,7 @@ int MDSRank::command_lock_path(Formatter* f, const cmdmap_t& cmdmap, std::ostrea
     bool got = cmd_getval(cmdmap, "path", path);
     if (!got) {
       ss << "missing path";
-      return -CEPHFS_EINVAL;
+      return -EINVAL;
     }
   }