lkml.org 
[lkml]   [2009]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/15] frv: remove "struct file *" argument from sysctl ->proc_handler
    Date
    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>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    ---
    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 3e9d7e0..bd6cc5c 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


    \
     
     \ /
      Last update: 2009-11-20 17:45    [W:0.024 / U:30.016 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site