lkml.org 
[lkml]   [2011]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2] block: ioctl: Fix coding style issues
    Date
    Fixed issues as flagged by checkpatch.pl

    Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
    ---
    block/ioctl.c | 123 +++++++++++++++++++++++++++++----------------------------
    1 files changed, 62 insertions(+), 61 deletions(-)

    diff --git a/block/ioctl.c b/block/ioctl.c
    index 1124cd2..75ac68c 100644
    --- a/block/ioctl.c
    +++ b/block/ioctl.c
    @@ -6,10 +6,10 @@
    #include <linux/backing-dev.h>
    #include <linux/buffer_head.h>
    #include <linux/blktrace_api.h>
    -#include <asm/uaccess.h>
    +#include <linux/uaccess.h>

    -static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user *arg)
    -{
    +static int blkpg_ioctl(struct block_device *bdev,
    + struct blkpg_ioctl_arg __user *arg) {
    struct block_device *bdevp;
    struct gendisk *disk;
    struct hd_struct *part;
    @@ -31,68 +31,69 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
    partno = p.pno;
    if (partno <= 0)
    return -EINVAL;
    +
    switch (a.op) {
    - case BLKPG_ADD_PARTITION:
    - start = p.start >> 9;
    - length = p.length >> 9;
    - /* check for fit in a hd_struct */
    - if (sizeof(sector_t) == sizeof(long) &&
    - sizeof(long long) > sizeof(long)) {
    - long pstart = start, plength = length;
    - if (pstart != start || plength != length
    - || pstart < 0 || plength < 0)
    - return -EINVAL;
    - }
    + case BLKPG_ADD_PARTITION:
    + start = p.start >> 9;
    + length = p.length >> 9;
    + /* check for fit in a hd_struct */
    + if (sizeof(sector_t) == sizeof(long) &&
    + sizeof(long long) > sizeof(long)) {
    + long pstart = start, plength = length;
    + if (pstart != start || plength != length
    + || pstart < 0 || plength < 0)
    + return -EINVAL;
    + }

    - mutex_lock(&bdev->bd_mutex);
    -
    - /* overlap? */
    - disk_part_iter_init(&piter, disk,
    - DISK_PITER_INCL_EMPTY);
    - while ((part = disk_part_iter_next(&piter))) {
    - if (!(start + length <= part->start_sect ||
    - start >= part->start_sect + part->nr_sects)) {
    - disk_part_iter_exit(&piter);
    - mutex_unlock(&bdev->bd_mutex);
    - return -EBUSY;
    - }
    - }
    - disk_part_iter_exit(&piter);
    -
    - /* all seems OK */
    - part = add_partition(disk, partno, start, length,
    - ADDPART_FLAG_NONE, NULL);
    - mutex_unlock(&bdev->bd_mutex);
    - return IS_ERR(part) ? PTR_ERR(part) : 0;
    - case BLKPG_DEL_PARTITION:
    - part = disk_get_part(disk, partno);
    - if (!part)
    - return -ENXIO;
    -
    - bdevp = bdget(part_devt(part));
    - disk_put_part(part);
    - if (!bdevp)
    - return -ENOMEM;
    -
    - mutex_lock(&bdevp->bd_mutex);
    - if (bdevp->bd_openers) {
    - mutex_unlock(&bdevp->bd_mutex);
    - bdput(bdevp);
    + mutex_lock(&bdev->bd_mutex);
    +
    + /* overlap? */
    + disk_part_iter_init(&piter, disk,
    + DISK_PITER_INCL_EMPTY);
    + while ((part = disk_part_iter_next(&piter))) {
    + if (!(start + length <= part->start_sect ||
    + start >= part->start_sect + part->nr_sects)) {
    + disk_part_iter_exit(&piter);
    + mutex_unlock(&bdev->bd_mutex);
    return -EBUSY;
    }
    - /* all seems OK */
    - fsync_bdev(bdevp);
    - invalidate_bdev(bdevp);
    -
    - mutex_lock_nested(&bdev->bd_mutex, 1);
    - delete_partition(disk, partno);
    - mutex_unlock(&bdev->bd_mutex);
    + }
    + disk_part_iter_exit(&piter);
    +
    + /* all seems OK */
    + part = add_partition(disk, partno, start, length,
    + ADDPART_FLAG_NONE, NULL);
    + mutex_unlock(&bdev->bd_mutex);
    + return IS_ERR(part) ? PTR_ERR(part) : 0;
    + case BLKPG_DEL_PARTITION:
    + part = disk_get_part(disk, partno);
    + if (!part)
    + return -ENXIO;
    +
    + bdevp = bdget(part_devt(part));
    + disk_put_part(part);
    + if (!bdevp)
    + return -ENOMEM;
    +
    + mutex_lock(&bdevp->bd_mutex);
    + if (bdevp->bd_openers) {
    mutex_unlock(&bdevp->bd_mutex);
    bdput(bdevp);
    + return -EBUSY;
    + }
    + /* all seems OK */
    + fsync_bdev(bdevp);
    + invalidate_bdev(bdevp);

    - return 0;
    - default:
    - return -EINVAL;
    + mutex_lock_nested(&bdev->bd_mutex, 1);
    + delete_partition(disk, partno);
    + mutex_unlock(&bdev->bd_mutex);
    + mutex_unlock(&bdevp->bd_mutex);
    + bdput(bdevp);
    +
    + return 0;
    + default:
    + return -EINVAL;
    }
    }

    @@ -189,7 +190,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
    loff_t size;
    int ret, n;

    - switch(cmd) {
    + switch (cmd) {
    case BLKFLSBUF:
    if (!capable(CAP_SYS_ADMIN))
    return -EACCES;
    @@ -279,7 +280,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
    return put_ushort(arg, queue_max_sectors(bdev_get_queue(bdev)));
    case BLKRASET:
    case BLKFRASET:
    - if(!capable(CAP_SYS_ADMIN))
    + if (!capable(CAP_SYS_ADMIN))
    return -EACCES;
    bdi = blk_get_backing_dev_info(bdev);
    if (bdi == NULL)
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-07-01 11:47    [W:0.027 / U:32.416 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site