Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47a9a527 authored by Fabian Frederick's avatar Fabian Frederick Committed by Bob Peterson
Browse files

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: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 731c7d3a

fs/gfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w 
		ClearPageChecked(page);

		if (!page_has_buffers(page)) {

			create_empty_buffers(page, inode->i_sb->s_blocksize,

					     (1 << BH_Dirty)|(1 << BH_Uptodate));

					     BIT(BH_Dirty)|BIT(BH_Uptodate));

		}

		gfs2_page_add_databufs(ip, page, 0, sdp->sd_vfs->s_blocksize-1);

	}

fs/gfs2/bmap.c

+3 −3
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, 
	}



	if (!page_has_buffers(page))

		create_empty_buffers(page, 1 << inode->i_blkbits,

				     (1 << BH_Uptodate));

		create_empty_buffers(page, BIT(inode->i_blkbits),

				     BIT(BH_Uptodate));



	bh = page_buffers(page);
@@ -690,7 +690,7 @@ int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsi 
	BUG_ON(!dblock);

	BUG_ON(!new);



	bh.b_size = 1 << (inode->i_blkbits + (create ? 0 : 5));

	bh.b_size = BIT(inode->i_blkbits + (create ? 0 : 5));

	ret = gfs2_block_map(inode, lblock, &bh, create);

	*extlen = bh.b_size >> inode->i_blkbits;

	*dblock = bh.b_blocknr;

fs/gfs2/dir.c

+10 −10
Original line number Diff line number Diff line
@@ -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);

fs/gfs2/glock.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static atomic_t lru_count = ATOMIC_INIT(0); 
static DEFINE_SPINLOCK(lru_lock);



#define GFS2_GL_HASH_SHIFT      15

#define GFS2_GL_HASH_SIZE       (1 << GFS2_GL_HASH_SHIFT)

#define GFS2_GL_HASH_SIZE       BIT(GFS2_GL_HASH_SHIFT)



static struct rhashtable_params ht_parms = {

	.nelem_hint = GFS2_GL_HASH_SIZE * 3 / 4,

fs/gfs2/inode.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static inline int gfs2_check_internal_file_size(struct inode *inode, 
	u64 size = i_size_read(inode);

	if (size < minsize || size > maxsize)

		goto err;

	if (size & ((1 << inode->i_blkbits) - 1))

	if (size & (BIT(inode->i_blkbits) - 1))

		goto err;

	return 0;

err: