Commit c039e313 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

[PATCH] sem2mutex: blockdev #2 



Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: default avatarArjan van de Ven <arjan@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6f87f0de

block/ioctl.c

+11 −11
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user 
					return -EINVAL;

			}

			/* partition number in use? */

			down(&bdev->bd_sem);

			mutex_lock(&bdev->bd_mutex);

			if (disk->part[part - 1]) {

				up(&bdev->bd_sem);

				mutex_unlock(&bdev->bd_mutex);

				return -EBUSY;

			}

			/* overlap? */
@@ -55,13 +55,13 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user 
					continue;

				if (!(start+length <= s->start_sect ||

				      start >= s->start_sect + s->nr_sects)) {

					up(&bdev->bd_sem);

					mutex_unlock(&bdev->bd_mutex);

					return -EBUSY;

				}

			}

			/* all seems OK */

			add_partition(disk, part, start, length);

			up(&bdev->bd_sem);

			mutex_unlock(&bdev->bd_mutex);

			return 0;

		case BLKPG_DEL_PARTITION:

			if (!disk->part[part-1])
@@ -71,9 +71,9 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user 
			bdevp = bdget_disk(disk, part);

			if (!bdevp)

				return -ENOMEM;

			down(&bdevp->bd_sem);

			mutex_lock(&bdevp->bd_mutex);

			if (bdevp->bd_openers) {

				up(&bdevp->bd_sem);

				mutex_unlock(&bdevp->bd_mutex);

				bdput(bdevp);

				return -EBUSY;

			}
@@ -81,10 +81,10 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user 
			fsync_bdev(bdevp);

			invalidate_bdev(bdevp, 0);



			down(&bdev->bd_sem);

			mutex_lock(&bdev->bd_mutex);

			delete_partition(disk, part);

			up(&bdev->bd_sem);

			up(&bdevp->bd_sem);

			mutex_unlock(&bdev->bd_mutex);

			mutex_unlock(&bdevp->bd_mutex);

			bdput(bdevp);



			return 0;
@@ -102,10 +102,10 @@ static int blkdev_reread_part(struct block_device *bdev) 
		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;

	if (down_trylock(&bdev->bd_sem))

	if (!mutex_trylock(&bdev->bd_mutex))

		return -EBUSY;

	res = rescan_partitions(disk, bdev);

	up(&bdev->bd_sem);

	mutex_unlock(&bdev->bd_mutex);

	return res;

}

drivers/block/rd.c

+2 −2
Original line number Diff line number Diff line
@@ -310,12 +310,12 @@ static int rd_ioctl(struct inode *inode, struct file *file, 
	 * cache

	 */

	error = -EBUSY;

	down(&bdev->bd_sem);

	mutex_lock(&bdev->bd_mutex);

	if (bdev->bd_openers <= 2) {

		truncate_inode_pages(bdev->bd_inode->i_mapping, 0);

		error = 0;

	}

	up(&bdev->bd_sem);

	mutex_unlock(&bdev->bd_mutex);

	return error;

}

drivers/s390/block/dasd_ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -151,9 +151,9 @@ dasd_ioctl_enable(struct block_device *bdev, int no, long args) 
		return -ENODEV;

	dasd_enable_device(device);

	/* Formatting the dasd device can change the capacity. */

	down(&bdev->bd_sem);

	mutex_lock(&bdev->bd_mutex);

	i_size_write(bdev->bd_inode, (loff_t)get_capacity(device->gdp) << 9);

	up(&bdev->bd_sem);

	mutex_unlock(&bdev->bd_mutex);

	return 0;

}
@@ -184,9 +184,9 @@ dasd_ioctl_disable(struct block_device *bdev, int no, long args) 
	 * Set i_size to zero, since read, write, etc. check against this

	 * value.

	 */

	down(&bdev->bd_sem);

	mutex_lock(&bdev->bd_mutex);

	i_size_write(bdev->bd_inode, 0);

	up(&bdev->bd_sem);

	mutex_unlock(&bdev->bd_mutex);

	return 0;

}

fs/block_dev.c

+14 −14
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) 
	    SLAB_CTOR_CONSTRUCTOR)

	{

		memset(bdev, 0, sizeof(*bdev));

		sema_init(&bdev->bd_sem, 1);

		sema_init(&bdev->bd_mount_sem, 1);

		mutex_init(&bdev->bd_mutex);

		mutex_init(&bdev->bd_mount_mutex);

		INIT_LIST_HEAD(&bdev->bd_inodes);

		INIT_LIST_HEAD(&bdev->bd_list);

		inode_init_once(&ei->vfs_inode);
@@ -574,7 +574,7 @@ static int do_open(struct block_device *bdev, struct file *file) 
	}

	owner = disk->fops->owner;



	down(&bdev->bd_sem);

	mutex_lock(&bdev->bd_mutex);

	if (!bdev->bd_openers) {

		bdev->bd_disk = disk;

		bdev->bd_contains = bdev;
@@ -605,21 +605,21 @@ static int do_open(struct block_device *bdev, struct file *file) 
			if (ret)

				goto out_first;

			bdev->bd_contains = whole;

			down(&whole->bd_sem);

			mutex_lock(&whole->bd_mutex);

			whole->bd_part_count++;

			p = disk->part[part - 1];

			bdev->bd_inode->i_data.backing_dev_info =

			   whole->bd_inode->i_data.backing_dev_info;

			if (!(disk->flags & GENHD_FL_UP) || !p || !p->nr_sects) {

				whole->bd_part_count--;

				up(&whole->bd_sem);

				mutex_unlock(&whole->bd_mutex);

				ret = -ENXIO;

				goto out_first;

			}

			kobject_get(&p->kobj);

			bdev->bd_part = p;

			bd_set_size(bdev, (loff_t) p->nr_sects << 9);

			up(&whole->bd_sem);

			mutex_unlock(&whole->bd_mutex);

		}

	} else {

		put_disk(disk);
@@ -633,13 +633,13 @@ static int do_open(struct block_device *bdev, struct file *file) 
			if (bdev->bd_invalidated)

				rescan_partitions(bdev->bd_disk, bdev);

		} else {

			down(&bdev->bd_contains->bd_sem);

			mutex_lock(&bdev->bd_contains->bd_mutex);

			bdev->bd_contains->bd_part_count++;

			up(&bdev->bd_contains->bd_sem);

			mutex_unlock(&bdev->bd_contains->bd_mutex);

		}

	}

	bdev->bd_openers++;

	up(&bdev->bd_sem);

	mutex_unlock(&bdev->bd_mutex);

	unlock_kernel();

	return 0;
@@ -652,7 +652,7 @@ static int do_open(struct block_device *bdev, struct file *file) 
	put_disk(disk);

	module_put(owner);

out:

	up(&bdev->bd_sem);

	mutex_unlock(&bdev->bd_mutex);

	unlock_kernel();

	if (ret)

		bdput(bdev);
@@ -714,7 +714,7 @@ int blkdev_put(struct block_device *bdev) 
	struct inode *bd_inode = bdev->bd_inode;

	struct gendisk *disk = bdev->bd_disk;



	down(&bdev->bd_sem);

	mutex_lock(&bdev->bd_mutex);

	lock_kernel();

	if (!--bdev->bd_openers) {

		sync_blockdev(bdev);
@@ -724,9 +724,9 @@ int blkdev_put(struct block_device *bdev) 
		if (disk->fops->release)

			ret = disk->fops->release(bd_inode, NULL);

	} else {

		down(&bdev->bd_contains->bd_sem);

		mutex_lock(&bdev->bd_contains->bd_mutex);

		bdev->bd_contains->bd_part_count--;

		up(&bdev->bd_contains->bd_sem);

		mutex_unlock(&bdev->bd_contains->bd_mutex);

	}

	if (!bdev->bd_openers) {

		struct module *owner = disk->fops->owner;
@@ -746,7 +746,7 @@ int blkdev_put(struct block_device *bdev) 
		bdev->bd_contains = NULL;

	}

	unlock_kernel();

	up(&bdev->bd_sem);

	mutex_unlock(&bdev->bd_mutex);

	bdput(bdev);

	return ret;

}

fs/buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ int fsync_bdev(struct block_device *bdev) 
 * freeze_bdev  --  lock a filesystem and force it into a consistent state

 * @bdev:	blockdevice to lock

 *

 * This takes the block device bd_mount_sem to make sure no new mounts

 * This takes the block device bd_mount_mutex to make sure no new mounts

 * happen on bdev until thaw_bdev() is called.

 * If a superblock is found on this device, we take the s_umount semaphore

 * on it to make sure nobody unmounts until the snapshot creation is done.
@@ -210,7 +210,7 @@ struct super_block *freeze_bdev(struct block_device *bdev) 
{

	struct super_block *sb;



	down(&bdev->bd_mount_sem);

	mutex_lock(&bdev->bd_mount_mutex);

	sb = get_super(bdev);

	if (sb && !(sb->s_flags & MS_RDONLY)) {

		sb->s_frozen = SB_FREEZE_WRITE;
@@ -264,7 +264,7 @@ void thaw_bdev(struct block_device *bdev, struct super_block *sb) 
		drop_super(sb);

	}



	up(&bdev->bd_mount_sem);

	mutex_unlock(&bdev->bd_mount_mutex);

}

EXPORT_SYMBOL(thaw_bdev);