From f7b55781bdc95bb6b7deba3436deacd916771537 Mon Sep 17 00:00:00 2001
From: Bjorn Bringert <bringert@android.com>
Date: Tue, 20 Dec 2011 16:49:52 -0800
Subject: [PATCH] --- yaml --- r: 281405 b: refs/heads/master c:
 5154b93b8eceb57bdab4e77030bf21ead15b42e4 h: refs/heads/master i:   281403:
 5adc08d0a70962e29813a373f07022a5acd8f9ce v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/android/ashmem.c | 39 +++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 099e8b3ed8bd..35413567f16d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d3f8f2da1c28709a3c494f3872b89c871906b2d
+refs/heads/master: 5154b93b8eceb57bdab4e77030bf21ead15b42e4
diff --git a/trunk/drivers/staging/android/ashmem.c b/trunk/drivers/staging/android/ashmem.c
index 40c3dc867bf9..777e2b257d4e 100644
--- a/trunk/drivers/staging/android/ashmem.c
+++ b/trunk/drivers/staging/android/ashmem.c
@@ -178,7 +178,7 @@ static int ashmem_open(struct inode *inode, struct file *file)
 	struct ashmem_area *asma;
 	int ret;
 
-	ret = nonseekable_open(inode, file);
+	ret = generic_file_open(inode, file);
 	if (unlikely(ret))
 		return ret;
 
@@ -230,6 +230,42 @@ static ssize_t ashmem_read(struct file *file, char __user *buf,
 	}
 
 	ret = asma->file->f_op->read(asma->file, buf, len, pos);
+	if (ret < 0) {
+		goto out;
+	}
+
+	/** Update backing file pos, since f_ops->read() doesn't */
+	asma->file->f_pos = *pos;
+
+out:
+	mutex_unlock(&ashmem_mutex);
+	return ret;
+}
+
+static loff_t ashmem_llseek(struct file *file, loff_t offset, int origin)
+{
+	struct ashmem_area *asma = file->private_data;
+	int ret;
+
+	mutex_lock(&ashmem_mutex);
+
+	if (asma->size == 0) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	if (!asma->file) {
+		ret = -EBADF;
+		goto out;
+	}
+
+	ret = asma->file->f_op->llseek(asma->file, offset, origin);
+	if (ret < 0) {
+		goto out;
+	}
+
+	/** Copy f_pos from backing file, since f_ops->llseek() sets it */
+	file->f_pos = asma->file->f_pos;
 
 out:
 	mutex_unlock(&ashmem_mutex);
@@ -648,6 +684,7 @@ static struct file_operations ashmem_fops = {
 	.open = ashmem_open,
 	.release = ashmem_release,
         .read = ashmem_read,
+        .llseek = ashmem_llseek,
 	.mmap = ashmem_mmap,
 	.unlocked_ioctl = ashmem_ioctl,
 	.compat_ioctl = ashmem_ioctl,