diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2012-01-24 13:01:39 +0100 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2012-01-24 14:32:28 +0100 |
commit | 9318a6b947b9379c85631d0e85532d9aac6f1115 (patch) | |
tree | 2dc570ac482a4dd0230fa0d9067fd1537629c40e /lib | |
parent | 66003c26313ee099ed6ccac35a10b0cbfbc7eb0d (diff) | |
download | android_external_fuse-9318a6b947b9379c85631d0e85532d9aac6f1115.tar.gz android_external_fuse-9318a6b947b9379c85631d0e85532d9aac6f1115.tar.bz2 android_external_fuse-9318a6b947b9379c85631d0e85532d9aac6f1115.zip |
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().
Diffstat (limited to 'lib')
-rw-r--r-- | lib/cuse_lowlevel.c | 26 | ||||
-rw-r--r-- | lib/fuse_lowlevel.c | 45 | ||||
-rw-r--r-- | lib/fuse_versionscript | 1 |
3 files changed, 0 insertions, 72 deletions
diff --git a/lib/cuse_lowlevel.c b/lib/cuse_lowlevel.c index 7bd289a..402cf4b 100644 --- a/lib/cuse_lowlevel.c +++ b/lib/cuse_lowlevel.c @@ -93,28 +93,6 @@ static void cuse_fll_poll(fuse_req_t req, fuse_ino_t ino, req_clop(req)->poll(req, fi, ph); } -static void cuse_fll_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) -{ - (void)ino; - req_clop(req)->mmap(req, addr, length, prot, flags, offset, fi); -} - -static void cuse_fll_munmap(fuse_req_t req, fuse_ino_t ino, uint64_t map_id, - size_t length, struct fuse_file_info *fi) -{ - (void)ino; - req_clop(req)->munmap(req, map_id, length, fi); -} - -static void cuse_fll_retrieve_reply(fuse_req_t req, void *cookie, - fuse_ino_t ino, off_t offset, - struct fuse_bufvec *bufv) -{ - req_clop(req)->retrieve_reply(req, cookie, ino, offset, bufv); -} - static size_t cuse_pack_info(int argc, const char **argv, char *buf) { size_t size = 0; @@ -191,10 +169,6 @@ struct fuse_session *cuse_lowlevel_new(struct fuse_args *args, lop.fsync = clop->fsync ? cuse_fll_fsync : NULL; lop.ioctl = clop->ioctl ? cuse_fll_ioctl : NULL; lop.poll = clop->poll ? cuse_fll_poll : NULL; - lop.mmap = clop->mmap ? cuse_fll_mmap : NULL; - lop.munmap = clop->munmap ? cuse_fll_munmap : NULL; - lop.retrieve_reply = clop->retrieve_reply ? - cuse_fll_retrieve_reply : NULL; se = fuse_lowlevel_new_common(args, &lop, sizeof(lop), userdata); if (!se) { diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index b1c7a24..a0d4887 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -969,17 +969,6 @@ int fuse_reply_poll(fuse_req_t req, unsigned revents) return send_reply_ok(req, &arg, sizeof(arg)); } -int fuse_reply_mmap(fuse_req_t req, uint64_t map_id, size_t length) -{ - struct fuse_mmap_out arg; - - memset(&arg, 0, sizeof(arg)); - arg.mapid = map_id; - arg.size = length; - - return send_reply_ok(req, &arg, sizeof(arg)); -} - static void do_lookup(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) { char *name = (char *) inarg; @@ -1728,38 +1717,6 @@ static void do_poll(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) } } -static void do_mmap(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) -{ - struct fuse_mmap_in *arg = (struct fuse_mmap_in *) inarg; - struct fuse_file_info fi; - - memset(&fi, 0, sizeof(fi)); - fi.fh = arg->fh; - fi.fh_old = fi.fh; - - if (req->f->op.mmap) - req->f->op.mmap(req, nodeid, arg->addr, arg->len, arg->prot, - arg->flags, arg->offset, &fi); - else - fuse_reply_err(req, ENOSYS); - -} - -static void do_munmap(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) -{ - struct fuse_munmap_in *arg = (struct fuse_munmap_in *) inarg; - struct fuse_file_info fi; - - memset(&fi, 0, sizeof(fi)); - fi.fh = arg->fh; - fi.fh_old = fi.fh; - - if (req->f->op.munmap) - req->f->op.munmap(req, nodeid, arg->mapid, arg->size, &fi); - else - fuse_reply_err(req, ENOSYS); -} - static void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) { struct fuse_init_in *arg = (struct fuse_init_in *) inarg; @@ -2304,8 +2261,6 @@ static struct { [FUSE_DESTROY] = { do_destroy, "DESTROY" }, [FUSE_NOTIFY_REPLY] = { (void *) 1, "NOTIFY_REPLY" }, [FUSE_BATCH_FORGET] = { do_batch_forget, "BATCH_FORGET" }, - [FUSE_MMAP] = { do_mmap, "MMAP" }, - [FUSE_MUNMAP] = { do_munmap, "MUNMAP" }, [CUSE_INIT] = { cuse_lowlevel_init, "CUSE_INIT" }, }; diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript index 95bc7d9..8fbaa51 100644 --- a/lib/fuse_versionscript +++ b/lib/fuse_versionscript @@ -194,7 +194,6 @@ FUSE_2.9 { fuse_start_cleanup_thread; fuse_stop_cleanup_thread; fuse_clean_cache; - fuse_reply_mmap; fuse_lowlevel_notify_delete; local: |