From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 11 Sep 2018 11:20:23 +0000 (+0200)
Subject: common: drop zero_copy_to_fd() from ceph::buffer interfaces.
X-Git-Tag: v14.0.1~273^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e81d55803f96520a16205537e3d9ab9949f4f089;p=ceph.git

common: drop zero_copy_to_fd() from ceph::buffer interfaces.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 50574b3ce0d45..083e9592d1e89 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -827,11 +827,6 @@ using namespace ceph;
     return _raw->can_zero_copy();
   }
 
-  int buffer::ptr::zero_copy_to_fd(int fd, int64_t *offset) const
-  {
-    return _raw->zero_copy_to_fd(fd, (loff_t*)offset);
-  }
-
   // -- buffer::list::iterator --
   /*
   buffer::list::iterator operator=(const buffer::list::iterator& other)
diff --git a/src/include/buffer.h b/src/include/buffer.h
index f594551d98460..368dce7e2ee84 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -336,7 +336,6 @@ namespace buffer CEPH_BUFFER_API {
     void copy_out(unsigned o, unsigned l, char *dest) const;
 
     bool can_zero_copy() const;
-    int zero_copy_to_fd(int fd, int64_t *offset) const;
 
     unsigned wasted() const;
 
@@ -699,7 +698,6 @@ namespace buffer CEPH_BUFFER_API {
 
   private:
     mutable iterator last_p;
-    int zero_copy_to_fd(int fd) const;
 
   public:
     // cons/des
diff --git a/src/include/buffer_raw.h b/src/include/buffer_raw.h
index 53f60e74d07ec..549094172e3ee 100644
--- a/src/include/buffer_raw.h
+++ b/src/include/buffer_raw.h
@@ -89,9 +89,6 @@ public:
     virtual bool can_zero_copy() const {
       return false;
     }
-    virtual int zero_copy_to_fd(int fd, loff_t *offset) {
-      return -ENOTSUP;
-    }
     virtual bool is_shareable() {
       // true if safe to reference/share the existing buffer copy
       // false if it is not safe to share the buffer, e.g., due to special