From 76699473c63bc6f19772f7265f1a3e0113e8ce3f Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 9 Mar 2011 19:54:27 +0100 Subject: [PATCH] --- yaml --- r: 242257 b: refs/heads/master c: 6936217cc7e58573026bdba25b1bfb778e8f2267 h: refs/heads/master i: 242255: 9ad85d6e3d144f5735b0bf0e3a7917c1a81f065c v: v3 --- [refs] | 2 +- trunk/fs/block_dev.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bfe530a04ccc..a7e7e8738a80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: facc31ddc3570a3a0d8951c94f16b898e01b464d +refs/heads/master: 6936217cc7e58573026bdba25b1bfb778e8f2267 diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c index fffdf86c1757..7dd2c658d429 100644 --- a/trunk/fs/block_dev.c +++ b/trunk/fs/block_dev.c @@ -1448,13 +1448,11 @@ int blkdev_put(struct block_device *bdev, fmode_t mode) disk_unblock_events(bdev->bd_disk); disk_check_events(bdev->bd_disk); bdev->bd_write_holder = false; - } else - disk_check_events(bdev->bd_disk); + } } mutex_unlock(&bdev->bd_mutex); - } else - disk_check_events(bdev->bd_disk); + } return __blkdev_put(bdev, mode, 0); }