From 875efcdf4349b390a151be4baa9b5bdadf001a56 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sat, 18 Sep 2010 21:01:13 +0200
Subject: [PATCH] --- yaml --- r: 219895 b: refs/heads/master c:
 2d77bb592f6cabc5ee5322c03ee92b9f96c45f60 h: refs/heads/master i:   219893:
 23f27a22d9742aa831547b5c0618bf597ae49911   219891:
 f27c9371dddbaa6efadbd728cfb85417d6f99e3e   219887:
 020be63c409d5821edb96bcfd4bde3b5ce149ad5 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/batman-adv/bat_debugfs.c | 2 ++
 trunk/drivers/staging/batman-adv/icmp_socket.c | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ce98f9e7dcb6..8e3cfa612e80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b3d9d57828af928651742086f912af913b6b31
+refs/heads/master: 2d77bb592f6cabc5ee5322c03ee92b9f96c45f60
diff --git a/trunk/drivers/staging/batman-adv/bat_debugfs.c b/trunk/drivers/staging/batman-adv/bat_debugfs.c
index 507da68054c7..57f84a9f8234 100644
--- a/trunk/drivers/staging/batman-adv/bat_debugfs.c
+++ b/trunk/drivers/staging/batman-adv/bat_debugfs.c
@@ -90,6 +90,7 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...)
 
 static int log_open(struct inode *inode, struct file *file)
 {
+	nonseekable_open(inode, file);
 	file->private_data = inode->i_private;
 	inc_module_count();
 	return 0;
@@ -174,6 +175,7 @@ static const struct file_operations log_fops = {
 	.release        = log_release,
 	.read           = log_read,
 	.poll           = log_poll,
+	.llseek         = no_llseek,
 };
 
 static int debug_log_setup(struct bat_priv *bat_priv)
diff --git a/trunk/drivers/staging/batman-adv/icmp_socket.c b/trunk/drivers/staging/batman-adv/icmp_socket.c
index 24627bed812d..48856ca73b6a 100644
--- a/trunk/drivers/staging/batman-adv/icmp_socket.c
+++ b/trunk/drivers/staging/batman-adv/icmp_socket.c
@@ -45,6 +45,8 @@ static int bat_socket_open(struct inode *inode, struct file *file)
 	unsigned int i;
 	struct socket_client *socket_client;
 
+	nonseekable_open(inode, file);
+
 	socket_client = kmalloc(sizeof(struct socket_client), GFP_KERNEL);
 
 	if (!socket_client)
@@ -283,6 +285,7 @@ static const struct file_operations fops = {
 	.read = bat_socket_read,
 	.write = bat_socket_write,
 	.poll = bat_socket_poll,
+	.llseek = no_llseek,
 };
 
 int bat_socket_setup(struct bat_priv *bat_priv)