Messages in this thread | | | Date | Fri, 1 Jul 2011 21:16:20 +1200 | Subject | Re: [PATCH] block: ioctl: Fix coding style issues | From | Chris Forbes <> |
| |
Sorry, please disregard -- indentation is still bogus.
-- Chris
On Fri, Jul 1, 2011 at 9:09 PM, Chris Forbes <chrisf@ijw.co.nz> wrote: > Fixed issues as flagged by checkpatch.pl > > Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> > --- > block/ioctl.c | 105 +++++++++++++++++++++++++++++---------------------------- > 1 files changed, 53 insertions(+), 52 deletions(-) > > diff --git a/block/ioctl.c b/block/ioctl.c > index 1124cd2..fa284e5 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,28 +31,29 @@ 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); > + 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); > + /* 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; > } > @@ -64,35 +65,35 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user > 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); > - > - mutex_lock_nested(&bdev->bd_mutex, 1); > - delete_partition(disk, partno); > - mutex_unlock(&bdev->bd_mutex); > + 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 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |