1 files changed, 8 insertions, 7 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 575076c018f4..742899240872 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -22,6 +22,7 @@
 #include <linux/mount.h>
 #include <linux/uio.h>
 #include <linux/namei.h>
+#include <linux/log2.h>
 #include <asm/uaccess.h>
 #include "internal.h"
 
@@ -55,17 +56,19 @@ static sector_t max_block(struct block_device *bdev)
         return retval;
 }
 
-/* Kill _all_ buffers, dirty or not.. */
+/* Kill _all_ buffers and pagecache , dirty or not.. */
 static void kill_bdev(struct block_device *bdev)
 {
-        invalidate_bdev(bdev, 1);
+        if (bdev->bd_inode->i_mapping->nrpages == 0)
+                return;
+        invalidate_bh_lrus();
         truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
 }       
 
 int set_blocksize(struct block_device *bdev, int size)
 {
         /* Size must be a power of two, and between 512 and PAGE_SIZE */
-        if (size > PAGE_SIZE || size < 512 || (size & (size-1)))
+        if (size > PAGE_SIZE || size < 512 || !is_power_of_2(size))
                 return -EINVAL;
 
         /* Size cannot be smaller than the size supported by the device */
@@ -455,9 +458,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
         struct bdev_inode *ei = (struct bdev_inode *) foo;
         struct block_device *bdev = &ei->bdev;
 
-        if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-            SLAB_CTOR_CONSTRUCTOR)
-        {
+        if (flags & SLAB_CTOR_CONSTRUCTOR) {
                 memset(bdev, 0, sizeof(*bdev));
                 mutex_init(&bdev->bd_mutex);
                 sema_init(&bdev->bd_mount_sem, 1);
@@ -1478,7 +1479,7 @@ int __invalidate_device(struct block_device *bdev)
                 res = invalidate_inodes(sb);
                 drop_super(sb);
         }
-        invalidate_bdev(bdev, 0);
+        invalidate_bdev(bdev);
         return res;
 }
 EXPORT_SYMBOL(__invalidate_device);