lkml.org 
[lkml]   [2010]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/13] drivers/block/floppy.c: Remove misleading, used once FD_IOCTL_ALLOWED macro
    Date
    Just code the test directly

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/block/floppy.c | 4 +---
    1 files changed, 1 insertions(+), 3 deletions(-)

    diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
    index d559964..623fda5 100644
    --- a/drivers/block/floppy.c
    +++ b/drivers/block/floppy.c
    @@ -3420,8 +3420,6 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
    static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
    unsigned long param)
    {
    -#define FD_IOCTL_ALLOWED (mode & (FMODE_WRITE|FMODE_WRITE_IOCTL))
    -
    int drive = (long)bdev->bd_disk->private_data;
    int type = ITYPE(UDRS->fd_device);
    int i;
    @@ -3454,7 +3452,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
    return ret;

    /* permission checks */
    - if (((cmd & 0x40) && !FD_IOCTL_ALLOWED) ||
    + if (((cmd & 0x40) && !(mode & (FMODE_WRITE | FMODE_WRITE_IOCTL))) ||
    ((cmd & 0x80) && !capable(CAP_SYS_ADMIN)))
    return -EPERM;

    --
    1.6.6.rc0.57.gad7a


    \
     
     \ /
      Last update: 2010-01-27 21:51    [W:0.032 / U:0.268 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site