summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Osmialowski <p.osmialowsk@samsung.com>2015-04-27 12:18:02 (GMT)
committerPaul Osmialowski <p.osmialowsk@samsung.com>2015-04-27 12:20:32 (GMT)
commit0cbf5a622945064f203fb217969e46a1ab80543c (patch)
tree030536846f8d8b9d42fb64390c05f6b71fdd582a
parentf3d43ac9cb489af319d7017c77eeb660c6fdd9d9 (diff)
downloadlinux-3.10-sandbox/pawelo/kdbus-next-wip-next.zip
linux-3.10-sandbox/pawelo/kdbus-next-wip-next.tar.gz
linux-3.10-sandbox/pawelo/kdbus-next-wip-next.tar.bz2
kdbus: after previous commit: these files are not needed anymoresandbox/pawelo/kdbus-v4-backportsandbox/pawelo/kdbus-next-wip-next
Change-Id: I290b5ba230f2c5a3b249c5da20a7b8d947d4aa4b Signed-off-by: Paul Osmialowski <p.osmialowsk@samsung.com>
-rw-r--r--compat/Makefile2
-rw-r--r--compat/fs/Makefile1
-rw-r--r--compat/fs/read_write.c56
-rw-r--r--compat/include/linux/fs.h9
-rw-r--r--compat/include/linux/uio.h13
-rw-r--r--compat/lib/Makefile1
-rw-r--r--compat/lib/iov_iter.c38
7 files changed, 0 insertions, 120 deletions
diff --git a/compat/Makefile b/compat/Makefile
index eb9bdc8..ffa5385 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -1,6 +1,4 @@
ifdef CONFIG_KDBUS
override LINUXINCLUDE := $(patsubst -Iinclude, -Icompat/include -Iinclude , $(LINUXINCLUDE))
-obj-y += fs/
-obj-y += lib/
obj-y += mm/
endif
diff --git a/compat/fs/Makefile b/compat/fs/Makefile
deleted file mode 100644
index 689a5f0..0000000
--- a/compat/fs/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += read_write.o
diff --git a/compat/fs/read_write.c b/compat/fs/read_write.c
deleted file mode 100644
index f3c31c6..0000000
--- a/compat/fs/read_write.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <linux/aio.h>
-#include <linux/slab.h>
-#include <linux/stat.h>
-#include <linux/fcntl.h>
-#include <linux/file.h>
-#include <linux/uio.h>
-#include <linux/fsnotify.h>
-#include <linux/security.h>
-#include <linux/export.h>
-#include <linux/syscalls.h>
-#include <linux/pagemap.h>
-#include <linux/splice.h>
-#include <linux/compat.h>
-
-#include <asm/uaccess.h>
-#include <asm/unistd.h>
-
-ssize_t vfs_iter_read(struct file *file, struct iov_iter *iter, loff_t *ppos)
-{
- struct kiocb kiocb;
- ssize_t ret;
-
- if (!file->f_op->read_iter)
- return -EINVAL;
-
- init_sync_kiocb(&kiocb, file);
- kiocb.ki_pos = *ppos;
-
- iter->type |= READ;
- ret = file->f_op->read_iter(&kiocb, iter);
- BUG_ON(ret == -EIOCBQUEUED);
- if (ret > 0)
- *ppos = kiocb.ki_pos;
- return ret;
-}
-EXPORT_SYMBOL(vfs_iter_read);
-
-ssize_t vfs_iter_write(struct file *file, struct iov_iter *iter, loff_t *ppos)
-{
- struct kiocb kiocb;
- ssize_t ret;
-
- if (!file->f_op->write_iter)
- return -EINVAL;
-
- init_sync_kiocb(&kiocb, file);
- kiocb.ki_pos = *ppos;
-
- iter->type |= WRITE;
- ret = file->f_op->write_iter(&kiocb, iter);
- BUG_ON(ret == -EIOCBQUEUED);
- if (ret > 0)
- *ppos = kiocb.ki_pos;
- return ret;
-}
-EXPORT_SYMBOL(vfs_iter_write);
diff --git a/compat/include/linux/fs.h b/compat/include/linux/fs.h
deleted file mode 100644
index cdb4dbc..0000000
--- a/compat/include/linux/fs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _COMPAT_LINUX_FS_H
-#define _COMPAT_LINUX_FS_H
-
-#include_next <linux/fs.h>
-
-ssize_t vfs_iter_read(struct file *file, struct iov_iter *iter, loff_t *ppos);
-ssize_t vfs_iter_write(struct file *file, struct iov_iter *iter, loff_t *ppos);
-
-#endif /* _COMPAT_LINUX_FS_H */
diff --git a/compat/include/linux/uio.h b/compat/include/linux/uio.h
index 84fcb4e..6903220 100644
--- a/compat/include/linux/uio.h
+++ b/compat/include/linux/uio.h
@@ -5,18 +5,5 @@
/* other compatibility headers */
#include <linux/time64.h>
-#include <linux/fs.h>
-
-enum {
- ITER_IOVEC = 0,
- ITER_KVEC = 2,
- ITER_BVEC = 4,
-};
-
-void iov_iter_init(struct iov_iter *i, int direction, const struct iovec *iov,
- unsigned long nr_segs, size_t count);
-
-void iov_iter_kvec(struct iov_iter *i, int direction, const struct kvec *kvec,
- unsigned long nr_segs, size_t count);
#endif /* _COMPAT_LINUX_UIO_H */
diff --git a/compat/lib/Makefile b/compat/lib/Makefile
deleted file mode 100644
index b7f32e7..0000000
--- a/compat/lib/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += iov_iter.o
diff --git a/compat/lib/iov_iter.c b/compat/lib/iov_iter.c
deleted file mode 100644
index c826359..0000000
--- a/compat/lib/iov_iter.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <linux/export.h>
-#include <linux/uio.h>
-#include <linux/pagemap.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <net/checksum.h>
-
-void iov_iter_init(struct iov_iter *i, int direction,
- const struct iovec *iov, unsigned long nr_segs,
- size_t count)
-{
- /* It will get better. Eventually... */
- if (segment_eq(get_fs(), KERNEL_DS)) {
- direction |= ITER_KVEC;
- i->type = direction;
- i->kvec = (struct kvec *)iov;
- } else {
- i->type = direction;
- i->iov = iov;
- }
- i->nr_segs = nr_segs;
- i->iov_offset = 0;
- i->count = count;
-}
-EXPORT_SYMBOL(iov_iter_init);
-
-void iov_iter_kvec(struct iov_iter *i, int direction,
- const struct kvec *kvec, unsigned long nr_segs,
- size_t count)
-{
- BUG_ON(!(direction & ITER_KVEC));
- i->type = direction;
- i->kvec = kvec;
- i->nr_segs = nr_segs;
- i->iov_offset = 0;
- i->count = count;
-}
-EXPORT_SYMBOL(iov_iter_kvec);