Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 292088ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull more vfs updates from Al Viro:
 "A couple of fixes + getting rid of __blkdev_put() return value"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  proc: Use PDE attribute setting accessor functions
  make blkdev_put() return void
  block_device_operations->release() should return void
  mtd_blktrans_ops->release() should return void
  hfs: SMP race on directory close()
parents bc2d968f 254844d3

arch/arm/mach-msm/last_radio_log.c

+1 −1
Original line number Diff line number Diff line
@@ -66,6 +66,6 @@ void msm_init_last_radio_log(struct module *owner) 
	pr_err("%s: last radio log is %d bytes long\n", __func__,

		radio_log_size);

	last_radio_log_fops.owner = owner;

	entry->size = radio_log_size;

	proc_set_size(entry, radio_log_size);

}

EXPORT_SYMBOL(msm_init_last_radio_log);

arch/cris/kernel/profile.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int __init init_cris_profile(void) 
	entry = proc_create("system_profile", S_IWUSR | S_IRUGO, NULL,

			    &cris_proc_profile_operations);

	if (entry) {

		entry->size = SAMPLE_BUFFER_SIZE;

		proc_set_size(entry, SAMPLE_BUFFER_SIZE);

	}

	prof_running = 1;

arch/um/drivers/ubd_kern.c

+2 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static DEFINE_MUTEX(ubd_lock); 
static DEFINE_MUTEX(ubd_mutex); /* replaces BKL, might not be needed */



static int ubd_open(struct block_device *bdev, fmode_t mode);

static int ubd_release(struct gendisk *disk, fmode_t mode);

static void ubd_release(struct gendisk *disk, fmode_t mode);

static int ubd_ioctl(struct block_device *bdev, fmode_t mode,

		     unsigned int cmd, unsigned long arg);

static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo);
@@ -1138,7 +1138,7 @@ out: 
	return err;

}



static int ubd_release(struct gendisk *disk, fmode_t mode)

static void ubd_release(struct gendisk *disk, fmode_t mode)

{

	struct ubd *ubd_dev = disk->private_data;
@@ -1146,7 +1146,6 @@ static int ubd_release(struct gendisk *disk, fmode_t mode) 
	if(--ubd_dev->count == 0)

		ubd_close_dev(ubd_dev);

	mutex_unlock(&ubd_mutex);

	return 0;

}



static void cowify_bitmap(__u64 io_offset, int length, unsigned long *cow_mask,

arch/xtensa/platforms/iss/simdisk.c

+1 −2
Original line number Diff line number Diff line
@@ -139,13 +139,12 @@ static int simdisk_open(struct block_device *bdev, fmode_t mode) 
	return 0;

}



static int simdisk_release(struct gendisk *disk, fmode_t mode)

static void simdisk_release(struct gendisk *disk, fmode_t mode)

{

	struct simdisk *dev = disk->private_data;

	spin_lock(&dev->lock);

	--dev->users;

	spin_unlock(&dev->lock);

	return 0;

}



static const struct block_device_operations simdisk_ops = {

drivers/block/amiflop.c

+1 −2
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
	return 0;

}



static int floppy_release(struct gendisk *disk, fmode_t mode)

static void floppy_release(struct gendisk *disk, fmode_t mode)

{

	struct amiga_floppy_struct *p = disk->private_data;

	int drive = p - unit;
@@ -1654,7 +1654,6 @@ static int floppy_release(struct gendisk *disk, fmode_t mode) 
	floppy_off (drive | 0x40000000);

#endif

	mutex_unlock(&amiflop_mutex);

	return 0;

}



/*