diff options
| author | Bjorn Bringert <bringert@android.com> | 2010-04-15 10:04:01 +0100 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-05-23 15:43:40 -0700 |
| commit | 33d1b3da8317a6bb8772077b17bfed3187c0bead (patch) | |
| tree | ff5a441a5fdfeb47f4a02f7a8422e4c49b29a8b3 /mm | |
| parent | bdc13f99fb18e4b5c89a1d6a63cac2a6204ad442 (diff) | |
Implement read(2) in ashmem driver
Bug: 2595601
Change-Id: I47c0016f594f9354fb8658ccb26e3d395bcb137b
Signed-off-by: Bjorn Bringert <bringert@android.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/ashmem.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/mm/ashmem.c b/mm/ashmem.c index 230810f9387c..04e886e2c909 100644 --- a/mm/ashmem.c +++ b/mm/ashmem.c @@ -211,6 +211,31 @@ static int ashmem_release(struct inode *ignored, struct file *file) return 0; } +static ssize_t ashmem_read(struct file *file, char __user *buf, + size_t len, loff_t *pos) +{ + struct ashmem_area *asma = file->private_data; + int ret = 0; + + mutex_lock(&ashmem_mutex); + + /* If size is not set, or set to 0, always return EOF. */ + if (asma->size == 0) { + goto out; + } + + if (!asma->file) { + ret = -EBADF; + goto out; + } + + ret = asma->file->f_op->read(asma->file, buf, len, pos); + +out: + mutex_unlock(&ashmem_mutex); + return ret; +} + static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) { struct ashmem_area *asma = file->private_data; @@ -604,6 +629,7 @@ static struct file_operations ashmem_fops = { .owner = THIS_MODULE, .open = ashmem_open, .release = ashmem_release, + .read = ashmem_read, .mmap = ashmem_mmap, .unlocked_ioctl = ashmem_ioctl, .compat_ioctl = ashmem_ioctl, |