Revert "Add mmap() and munmap() methods to low level API"

This partially reverts commit 4b2157c44e6ad7e692fcffb7450143e83151d36b.

Remove mmap/munmap suppor as this missed the interface changes for Linux-3.3
(API version 7.18).

Only revert the mmap/munmap bits and leave the retrieve_reply API fix in place
as well as the optimization in fuse_send_data_iov_fallback().

3 files changed, 0 insertions, 75 deletions

diff --git a/include/cuse_lowlevel.h b/include/cuse_lowlevel.h
index b8824fb..e147fa2 100644
--- a/include/cuse_lowlevel.h
+++ b/include/cuse_lowlevel.h
@@ -63,13 +63,6 @@ struct cuse_lowlevel_ops {
 		       const void *in_buf, size_t in_bufsz, size_t out_bufsz);
 	void (*poll) (fuse_req_t req, struct fuse_file_info *fi,
 		      struct fuse_pollhandle *ph);
-	void (*mmap) (fuse_req_t req, uint64_t addr, size_t length,
-		      int prot, int flags, off_t offset,
-		      struct fuse_file_info *fi);
-	void (*munmap) (fuse_req_t req, uint64_t map_id, size_t length,
-			struct fuse_file_info *fi);
-	void (*retrieve_reply) (fuse_req_t req, void *cookie, uint64_t map_id,
-				off_t offset, struct fuse_bufvec *bufv);
 };
 
 struct fuse_session *cuse_lowlevel_new(struct fuse_args *args,
diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
index 89e941a..7b43cb0 100644
--- a/include/fuse_kernel.h
+++ b/include/fuse_kernel.h
@@ -80,7 +80,6 @@
  * 7.18
  *  - add FUSE_IOCTL_DIR flag
  *  - add FUSE_NOTIFY_DELETE
- *  - add FUSE_MMAP and FUSE_MUNMAP
  */
 
 #ifndef _LINUX_FUSE_H
@@ -310,8 +309,6 @@ enum fuse_opcode {
 	FUSE_POLL          = 40,
 	FUSE_NOTIFY_REPLY  = 41,
 	FUSE_BATCH_FORGET  = 42,
-	FUSE_MMAP          = 43,
-	FUSE_MUNMAP        = 44,
 
 	/* CUSE specific operations */
 	CUSE_INIT          = 4096,
@@ -605,28 +602,6 @@ struct fuse_notify_poll_wakeup_out {
 	__u64	kh;
 };
 
-struct fuse_mmap_in {
-	__u64	fh;
-	__u64	addr;
-	__u64	len;
-	__u32	prot;
-	__u32	flags;
-	__u64	offset;
-};
-
-struct fuse_mmap_out {
-	__u64	mapid;		/* Mmap ID, same namespace as Inode ID */
-	__u64	size;		/* Size of memory region */
-	__u64	reserved;
-};
-
-struct fuse_munmap_in {
-	__u64	fh;
-	__u64	mapid;
-	__u64	size;		/* Size of memory region */
-	__u64	reserved;
-};
-
 struct fuse_in_header {
 	__u32	len;
 	__u32	opcode;
diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index d4fb229..3ecc46e 100644
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -996,37 +996,6 @@ struct fuse_lowlevel_ops {
 	 */
 	void (*flock) (fuse_req_t req, fuse_ino_t ino,
 		       struct fuse_file_info *fi, int op);
-
-	/**
-	 * Direct mmap (CUSE only for now)
-	 *
-	 * @param req request handle
-	 * @param ino the inode number
-	 * @param addr starting address (in clients address space)
-	 * @param length length of the mapping
-	 * @param prot desired memory protection of the mapping
-	 * @param flags mmap flags
-	 * @param fi file information
-	 *
-	 * Introduced in version 2.9
-	 */
-	void (*mmap) (fuse_req_t req, fuse_ino_t ino, uint64_t addr,
-		      size_t length, int prot, int flags, off_t offset,
-		      struct fuse_file_info *fi);
-
-	/**
-	 * Direct munmap (CUSE only for now)
-	 *
-	 * @param req request handle
-	 * @param ino the inode number
-	 * @param map_id identifies the mapping
-	 * @param length length of the mapping
-	 * @param fi file information
-	 *
-	 * Introduced in version 2.9
-	 */
-	void (*munmap) (fuse_req_t req, fuse_ino_t ino, uint64_t map_id,
-			size_t length, struct fuse_file_info *fi);
 };
 
 /**
@@ -1316,18 +1285,6 @@ int fuse_reply_ioctl_iov(fuse_req_t req, int result, const struct iovec *iov,
  */
 int fuse_reply_poll(fuse_req_t req, unsigned revents);
 
-/**
- * Reply to an mmap request
- *
- * Possible requests:
- *   mmap
- *
- * @param req request handle
- * @param map_id identifies the mapping
- * @param length length of the mapping (from zero offset)
- */
-int fuse_reply_mmap(fuse_req_t req, uint64_t map_id, size_t length);
-
 /* ----------------------------------------------------------- *
  * Notification						       *
  * ----------------------------------------------------------- */