diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 18:14:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 18:14:53 -0400 |
commit | 292088ee032d0df59e7c8a7a00e9b97260146078 (patch) | |
tree | 99e5eee404285d4e2b6d282113cccee58236580f /arch/um | |
parent | bc2d968f0ec698c66750e0ad1c1d35568fe93c05 (diff) | |
parent | 254844d3b9959b52fedf2f22810cc66e82a1ca16 (diff) |
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()
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/drivers/ubd_kern.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 41bf72073ccc..879990cb66c6 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
@@ -87,7 +87,7 @@ static DEFINE_MUTEX(ubd_lock); | |||
87 | static DEFINE_MUTEX(ubd_mutex); /* replaces BKL, might not be needed */ | 87 | static DEFINE_MUTEX(ubd_mutex); /* replaces BKL, might not be needed */ |
88 | 88 | ||
89 | static int ubd_open(struct block_device *bdev, fmode_t mode); | 89 | static int ubd_open(struct block_device *bdev, fmode_t mode); |
90 | static int ubd_release(struct gendisk *disk, fmode_t mode); | 90 | static void ubd_release(struct gendisk *disk, fmode_t mode); |
91 | static int ubd_ioctl(struct block_device *bdev, fmode_t mode, | 91 | static int ubd_ioctl(struct block_device *bdev, fmode_t mode, |
92 | unsigned int cmd, unsigned long arg); | 92 | unsigned int cmd, unsigned long arg); |
93 | static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo); | 93 | static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo); |
@@ -1138,7 +1138,7 @@ out: | |||
1138 | return err; | 1138 | return err; |
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | static int ubd_release(struct gendisk *disk, fmode_t mode) | 1141 | static void ubd_release(struct gendisk *disk, fmode_t mode) |
1142 | { | 1142 | { |
1143 | struct ubd *ubd_dev = disk->private_data; | 1143 | struct ubd *ubd_dev = disk->private_data; |
1144 | 1144 | ||
@@ -1146,7 +1146,6 @@ static int ubd_release(struct gendisk *disk, fmode_t mode) | |||
1146 | if(--ubd_dev->count == 0) | 1146 | if(--ubd_dev->count == 0) |
1147 | ubd_close_dev(ubd_dev); | 1147 | ubd_close_dev(ubd_dev); |
1148 | mutex_unlock(&ubd_mutex); | 1148 | mutex_unlock(&ubd_mutex); |
1149 | return 0; | ||
1150 | } | 1149 | } |
1151 | 1150 | ||
1152 | static void cowify_bitmap(__u64 io_offset, int length, unsigned long *cow_mask, | 1151 | static void cowify_bitmap(__u64 io_offset, int length, unsigned long *cow_mask, |