From: Arnd Bergmann <arnd@arndb.de>
To: Greg Kroah-Hartman <greg@kroah.com>
Cc: Marek Belisko <marek.belisko@gmail.com>,
linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 1/6] staging: make new character devices nonseekable
Date: Thu, 30 Sep 2010 10:24:07 +0200 [thread overview]
Message-ID: <1285835052-11880-2-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1285835052-11880-1-git-send-email-arnd@arndb.de>
As a preparation for changing the default behaviour of llseek to no_llseek,
every file_operations structure should have a .llseek operation.
There are three new instances in staging now, which can all be changed
into no_llseek explicitly since the devices do not need to seek.
Add nonseekable_open where appropriate, to prevent pread/pwrite as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/staging/bcm/Bcmchar.c | 5 +++++
drivers/staging/bcm/InterfaceInit.c | 1 +
drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 10 ++++++----
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index b239862..afde77a 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1,3 +1,5 @@
+#include <linux/fs.h>
+
#include "headers.h"
/***************************************************************
* Function - bcm_char_open()
@@ -35,6 +37,8 @@ static int bcm_char_open(struct inode *inode, struct file * filp)
/*Start Queuing the control response Packets*/
atomic_inc(&Adapter->ApplicationRunning);
+
+ nonseekable_open(inode, filp);
return 0;
}
static int bcm_char_release(struct inode *inode, struct file *filp)
@@ -2360,6 +2364,7 @@ static struct file_operations bcm_fops = {
.release = bcm_char_release,
.read = bcm_char_read,
.unlocked_ioctl = bcm_char_ioctl,
+ .llseek = no_llseek,
};
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index d22a0e5..67d8572 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -163,6 +163,7 @@ static struct file_operations usbbcm_fops = {
.read = usbbcm_read,
.write = usbbcm_write,
.owner = THIS_MODULE,
+ .llseek = no_llseek,
};
static struct usb_class_driver usbbcm_class = {
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
index 65087ce..89d9a58 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
@@ -81,10 +81,11 @@ int numofmsgbuf = 0;
//
static struct file_operations ft1000fops =
{
- unlocked_ioctl: ft1000_ChIoctl,
- poll: ft1000_ChPoll,
- open: ft1000_ChOpen,
- release: ft1000_ChRelease
+ .unlocked_ioctl = ft1000_ChIoctl,
+ .poll = ft1000_ChPoll,
+ .open = ft1000_ChOpen,
+ .release = ft1000_ChRelease,
+ .llseek = no_llseek,
};
@@ -470,6 +471,7 @@ static int ft1000_ChOpen (struct inode *Inode, struct file *File)
File->private_data = pdevobj[num]->net;
+ nonseekable_open(Inode, File);
return 0;
}
--
1.7.1
next prev parent reply other threads:[~2010-09-30 8:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 8:24 [PATCH 0/6] staging fixes Arnd Bergmann
2010-09-30 8:24 ` Arnd Bergmann [this message]
2010-09-30 8:24 ` [PATCH 2/6] staging/ft1000-usb: fix unlocked_ioctl prototype Arnd Bergmann
2010-09-30 8:24 ` [PATCH 3/6] staging/ft1000-usb: fix build warnings Arnd Bergmann
2010-10-04 12:43 ` Belisko Marek
2010-10-04 13:49 ` Arnd Bergmann
2010-09-30 8:24 ` [PATCH 4/6] staging/ft1000-usb: fix problems found by sparse Arnd Bergmann
2010-10-04 13:16 ` Belisko Marek
2010-10-04 13:56 ` Arnd Bergmann
2010-09-30 8:24 ` [PATCH 5/6] staging/bcm: fix most build warnings Arnd Bergmann
2010-09-30 8:24 ` [PATCH 6/6] staging/bcm: add sparse annotations Arnd Bergmann
2010-09-30 8:36 ` [PATCH 0/6] staging fixes Belisko Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285835052-11880-2-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marek.belisko@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®