GFS2: use BIT() macro

Replace 1 << value shift by more explicit BIT() macro

Also fixes two bare unsigned definitions:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
+		unsigned hsize = BIT(ip->i_depth);

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index fcb59b23f1e3..db8fbeb62483 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -351,7 +351,7 @@ static __be64 *gfs2_dir_get_hash_table(struct gfs2_inode *ip)
         if (hc)
                 return hc;
 
-        hsize = 1 << ip->i_depth;
+        hsize = BIT(ip->i_depth);
         hsize *= sizeof(__be64);
         if (hsize != i_size_read(&ip->i_inode)) {
                 gfs2_consist_inode(ip);
@@ -819,8 +819,8 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode,
 
         if (ip->i_diskflags & GFS2_DIF_EXHASH) {
                 struct gfs2_leaf *leaf;
-                unsigned hsize = 1 << ip->i_depth;
-                unsigned index;
+                unsigned int hsize = BIT(ip->i_depth);
+                unsigned int index;
                 u64 ln;
                 if (hsize * sizeof(u64) != i_size_read(inode)) {
                         gfs2_consist_inode(ip);
@@ -932,7 +932,7 @@ static int dir_make_exhash(struct inode *inode)
                 return -ENOSPC;
         bn = bh->b_blocknr;
 
-        gfs2_assert(sdp, dip->i_entries < (1 << 16));
+        gfs2_assert(sdp, dip->i_entries < BIT(16));
         leaf->lf_entries = cpu_to_be16(dip->i_entries);
 
         /*  Copy dirents  */
@@ -1041,7 +1041,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name)
         bn = nbh->b_blocknr;
 
         /*  Compute the start and len of leaf pointers in the hash table.  */
-        len = 1 << (dip->i_depth - be16_to_cpu(oleaf->lf_depth));
+        len = BIT(dip->i_depth - be16_to_cpu(oleaf->lf_depth));
         half_len = len >> 1;
         if (!half_len) {
                 pr_warn("i_depth %u lf_depth %u index %u\n",
@@ -1163,7 +1163,7 @@ static int dir_double_exhash(struct gfs2_inode *dip)
         int x;
         int error = 0;
 
-        hsize = 1 << dip->i_depth;
+        hsize = BIT(dip->i_depth);
         hsize_bytes = hsize * sizeof(__be64);
 
         hc = gfs2_dir_get_hash_table(dip);
@@ -1539,7 +1539,7 @@ static int dir_e_read(struct inode *inode, struct dir_context *ctx,
         int error = 0;
         unsigned depth = 0;
 
-        hsize = 1 << dip->i_depth;
+        hsize = BIT(dip->i_depth);
         hash = gfs2_dir_offset2hash(ctx->pos);
         index = hash >> (32 - dip->i_depth);
 
@@ -1558,7 +1558,7 @@ static int dir_e_read(struct inode *inode, struct dir_context *ctx,
                 if (error)
                         break;
 
-                len = 1 << (dip->i_depth - depth);
+                len = BIT(dip->i_depth - depth);
                 index = (index & ~(len - 1)) + len;
         }
 
@@ -2113,7 +2113,7 @@ int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip)
         u64 leaf_no;
         int error = 0, last;
 
-        hsize = 1 << dip->i_depth;
+        hsize = BIT(dip->i_depth);
 
         lp = gfs2_dir_get_hash_table(dip);
         if (IS_ERR(lp))
@@ -2126,7 +2126,7 @@ int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip)
                         if (error)
                                 goto out;
                         leaf = (struct gfs2_leaf *)bh->b_data;
-                        len = 1 << (dip->i_depth - be16_to_cpu(leaf->lf_depth));
+                        len = BIT(dip->i_depth - be16_to_cpu(leaf->lf_depth));
 
                         next_index = (index & ~(len - 1)) + len;
                         last = ((next_index >= hsize) ? 1 : 0);