From 9318a6b947b9379c85631d0e85532d9aac6f1115 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 24 Jan 2012 13:01:39 +0100
Subject: 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().
---
 include/fuse_lowlevel.h | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

(limited to 'include/fuse_lowlevel.h')

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						       *
  * ----------------------------------------------------------- */
-- 
cgit v1.2.3