---

yaml --- r: 54553 b: refs/heads/master c: 1368c4f h: refs/heads/master i: 54551: d582bf9 v: v3
git-mirror · May 8, 2007 · e4d01ea · e4d01ea
1 parent 27f741f
commit e4d01ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1b5c1d3da05c91129120d045dfcdfc7761f44f1
+refs/heads/master: 1368c4f2482c9e06bcb297217433818b171cc9e3
diff --git a/trunk/fs/block_dev.c b/trunk/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"
 
@@ -67,7 +68,7 @@ static void kill_bdev(struct block_device *bdev)
 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 */