lkml.org 
[lkml]   [2015]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv2 05/16] staging: vme_user: refactor llseek to switch(){}
    Date
    This makes vme_user_llseek ignore all minors that don't have llseek
    implementation.

    Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
    Cc: Igor Alekseev <igor.alekseev@itep.ru>
    ---
    drivers/staging/vme/devices/vme_user.c | 18 ++++++++++--------
    1 file changed, 10 insertions(+), 8 deletions(-)

    diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
    index 19ba749..da828f4 100644
    --- a/drivers/staging/vme/devices/vme_user.c
    +++ b/drivers/staging/vme/devices/vme_user.c
    @@ -430,15 +430,17 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence)
    size_t image_size;
    loff_t res;

    - if (minor == CONTROL_MINOR)
    - return -EINVAL;
    -
    - mutex_lock(&image[minor].mutex);
    - image_size = vme_get_size(image[minor].resource);
    - res = fixed_size_llseek(file, off, whence, image_size);
    - mutex_unlock(&image[minor].mutex);
    + switch (type[minor]) {
    + case MASTER_MINOR:
    + case SLAVE_MINOR:
    + mutex_lock(&image[minor].mutex);
    + image_size = vme_get_size(image[minor].resource);
    + res = fixed_size_llseek(file, off, whence, image_size);
    + mutex_unlock(&image[minor].mutex);
    + return res;
    + }

    - return res;
    + return -EINVAL;
    }

    /*
    --
    1.8.3.1


    \
     
     \ /
      Last update: 2015-05-28 12:01    [W:4.260 / U:0.528 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site