From: Jan Blunck <jblunck@suse.de>
To: Linux-Kernel Mailinglist <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Arnd Bergmann <arnd@arndb.de>, Alan Cox <alan@linux.intel.com>,
Jan Blunck <jblunck@suse.de>
Subject: [PATCH 04/12] frv: remove "struct file *" argument from sysctl ->proc_handler
Date: Fri, 9 Apr 2010 16:00:47 +0200 [thread overview]
Message-ID: <1270821655-4368-5-git-send-email-jblunck@suse.de> (raw)
In-Reply-To: <1270821655-4368-1-git-send-email-jblunck@suse.de>
Seems that Alexey Dobriyan missed this usage of the file argument when
removing it from ->proc_handler in commit 8d65af789f3e2cf4cfbdbf71a0f7a61ebcd41d38.
Signed-off-by: Jan Blunck <jblunck@suse.de>
---
arch/frv/kernel/sysctl.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c
index 035516c..05afc05 100644
--- a/arch/frv/kernel/sysctl.c
+++ b/arch/frv/kernel/sysctl.c
@@ -47,8 +47,9 @@ static void frv_change_dcache_mode(unsigned long newmode)
/*
* handle requests to dynamically switch the write caching mode delivered by /proc
*/
-static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,
- void __user *buffer, size_t *lenp, loff_t *ppos)
+static int procctl_frv_cachemode(ctl_table *table, int write,
+ void __user *buffer, size_t *lenp,
+ loff_t *ppos)
{
unsigned long hsr0;
char buff[8];
@@ -85,7 +86,7 @@ static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,
}
/* read the state */
- if (filp->f_pos > 0) {
+ if (*ppos > 0) {
*lenp = 0;
return 0;
}
@@ -111,7 +112,7 @@ static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,
return -EFAULT;
*lenp = len;
- filp->f_pos = len;
+ *ppos = len;
return 0;
} /* end procctl_frv_cachemode() */
@@ -121,8 +122,9 @@ static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,
* permit the mm_struct the nominated process is using have its MMU context ID pinned
*/
#ifdef CONFIG_MMU
-static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
- void __user *buffer, size_t *lenp, loff_t *ppos)
+static int procctl_frv_pin_cxnr(ctl_table *table, int write,
+ void __user *buffer, size_t *lenp,
+ loff_t *ppos)
{
pid_t pid;
char buff[16], *p;
@@ -151,7 +153,7 @@ static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
}
/* read the currently pinned CXN */
- if (filp->f_pos > 0) {
+ if (*ppos > 0) {
*lenp = 0;
return 0;
}
@@ -164,7 +166,7 @@ static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
return -EFAULT;
*lenp = len;
- filp->f_pos = len;
+ *ppos = len;
return 0;
} /* end procctl_frv_pin_cxnr() */
--
1.6.4.2
next prev parent reply other threads:[~2010-04-09 14:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 14:00 [PATCH 00/12] Multiple file->f_pos/nonseekable_open/llseek fixes (reposy) Jan Blunck
2010-04-09 14:00 ` [PATCH 01/12] osst: Update ppos instead of using file->f_pos Jan Blunck
2010-04-09 14:00 ` [PATCH 02/12] flash_read should update ppos instead of file->f_pos Jan Blunck
2010-04-09 14:00 ` [PATCH 03/12] eeprom_read()/eeprom_write() " Jan Blunck
2010-04-09 14:00 ` Jan Blunck [this message]
2010-04-09 16:23 ` [PATCH 04/12] frv: remove "struct file *" argument from sysctl ->proc_handler Alexey Dobriyan
2010-04-12 8:11 ` Jan Blunck
2010-04-09 14:00 ` [PATCH 05/12] mISDN: Remove unnecessary test on f_pos Jan Blunck
2010-04-09 14:00 ` [PATCH 06/12] zcrypt: Use nonseekable_open() Jan Blunck
2010-04-09 14:00 ` [PATCH 07/12] rtc-m41t80: " Jan Blunck
2010-04-09 14:00 ` [PATCH 08/12] Introduce noop_llseek() Jan Blunck
2010-04-09 14:00 ` [PATCH 09/12] osst: Use noop_llseek() instead of default_llseek() Jan Blunck
2010-04-09 14:00 ` [PATCH 10/12] st: " Jan Blunck
2010-04-09 14:00 ` [PATCH 11/12] Do not fallback to default_llseek() when readdir() uses BKL Jan Blunck
2010-04-09 14:00 ` [PATCH 12/12] Documentation/filesystems/Locking: Update documentation on llseek() wrt BKL Jan Blunck
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=1270821655-4368-5-git-send-email-jblunck@suse.de \
--to=jblunck@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@linux.intel.com \
--cc=arnd@arndb.de \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/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®