From 27f741f59722168e0ea959305e9fd2cb1ceec73b Mon Sep 17 00:00:00 2001
From: Vignesh Babu BM <vignesh.babu@wipro.com>
Date: Tue, 8 May 2007 00:24:30 -0700
Subject: [PATCH] --- yaml --- r: 54552 b: refs/heads/master c:
 e1b5c1d3da05c91129120d045dfcdfc7761f44f1 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/hfs/btree.c     | 3 ++-
 trunk/fs/hfsplus/btree.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 265cff00fecf..a545ca408c11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7d709c096487078652a1384d7a2d0e4459e18b6
+refs/heads/master: e1b5c1d3da05c91129120d045dfcdfc7761f44f1
diff --git a/trunk/fs/hfs/btree.c b/trunk/fs/hfs/btree.c
index 5fd0ed71f923..8a3a650abc87 100644
--- a/trunk/fs/hfs/btree.c
+++ b/trunk/fs/hfs/btree.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/pagemap.h>
+#include <linux/log2.h>
 
 #include "btree.h"
 
@@ -76,7 +77,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
 	tree->depth = be16_to_cpu(head->depth);
 
 	size = tree->node_size;
-	if (!size || size & (size - 1))
+	if (!is_power_of_2(size))
 		goto fail_page;
 	if (!tree->node_count)
 		goto fail_page;
diff --git a/trunk/fs/hfsplus/btree.c b/trunk/fs/hfsplus/btree.c
index a9b9e872e29a..90ebab753d30 100644
--- a/trunk/fs/hfsplus/btree.c
+++ b/trunk/fs/hfsplus/btree.c
@@ -10,6 +10,7 @@
 
 #include <linux/slab.h>
 #include <linux/pagemap.h>
+#include <linux/log2.h>
 
 #include "hfsplus_fs.h"
 #include "hfsplus_raw.h"
@@ -69,7 +70,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
 	}
 
 	size = tree->node_size;
-	if (!size || size & (size - 1))
+	if (!is_power_of_2(size))
 		goto fail_page;
 	if (!tree->node_count)
 		goto fail_page;