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

Commit a228bf8f authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Jan Kara
Browse files

reiserfs: cleanup, remove unnecessary parens 



The reiserfs code is littered with extra parens in places where the authors
may not have been certain about precedence of & vs ->. This patch cleans them
out.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent cf776a7a

fs/reiserfs/bitmap.c

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value) 
	 * up front so we need to account for it.

	 */

	if (unlikely(test_bit(REISERFS_OLD_FORMAT,

			      &(REISERFS_SB(s)->s_properties)))) {

			      &REISERFS_SB(s)->s_properties))) {

		b_blocknr_t bmap1 = REISERFS_SB(s)->s_sbh->b_blocknr + 1;

		if (block >= bmap1 &&

		    block <= bmap1 + bmap_count) {
@@ -524,7 +524,7 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th, 
	if (dirty)

		reiserfs_update_sd(th, inode);

	ei->i_prealloc_block = save;

	list_del_init(&(ei->i_prealloc_list));

	list_del_init(&ei->i_prealloc_list);

}



/* FIXME: It should be inline function */
@@ -1417,7 +1417,7 @@ struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb, 
	 * I doubt there are any of these left, but just in case...

	 */

	if (unlikely(test_bit(REISERFS_OLD_FORMAT,

	                      &(REISERFS_SB(sb)->s_properties))))

			      &REISERFS_SB(sb)->s_properties)))

		block = REISERFS_SB(sb)->s_sbh->b_blocknr + 1 + bitmap;

	else if (bitmap == 0)

		block = (REISERFS_DISK_OFFSET_IN_BYTES >> sb->s_blocksize_bits) + 1;

fs/reiserfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ research: 
		store_ih(&tmp_ih, ih);



		/* we must have found item, that is item of this directory, */

		RFALSE(COMP_SHORT_KEYS(&(ih->ih_key), &pos_key),

		RFALSE(COMP_SHORT_KEYS(&ih->ih_key, &pos_key),

		       "vs-9000: found item %h does not match to dir we readdir %K",

		       ih, &pos_key);

		RFALSE(item_num > B_NR_ITEMS(bh) - 1,

fs/reiserfs/do_balan.c

+1 −1
Original line number Diff line number Diff line
@@ -1575,7 +1575,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih, 
		return;

	}



	atomic_inc(&(fs_generation(tb->tb_sb)));

	atomic_inc(&fs_generation(tb->tb_sb));

	do_balance_starts(tb);



	/*

fs/reiserfs/file.c

+8 −8
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp) 
        if (atomic_add_unless(&REISERFS_I(inode)->openers, -1, 1))

		return 0;



	mutex_lock(&(REISERFS_I(inode)->tailpack));

	mutex_lock(&REISERFS_I(inode)->tailpack);



        if (!atomic_dec_and_test(&REISERFS_I(inode)->openers)) {

		mutex_unlock(&(REISERFS_I(inode)->tailpack));

		mutex_unlock(&REISERFS_I(inode)->tailpack);

		return 0;

	}
@@ -52,7 +52,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp) 
	if ((!(REISERFS_I(inode)->i_flags & i_pack_on_close_mask) ||

	     !tail_has_to_be_packed(inode)) &&

	    REISERFS_I(inode)->i_prealloc_count <= 0) {

		mutex_unlock(&(REISERFS_I(inode)->tailpack));

		mutex_unlock(&REISERFS_I(inode)->tailpack);

		return 0;

	}
@@ -116,7 +116,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp) 
	}

out:

	reiserfs_write_unlock(inode->i_sb);

	mutex_unlock(&(REISERFS_I(inode)->tailpack));

	mutex_unlock(&REISERFS_I(inode)->tailpack);

	return err;

}
@@ -126,18 +126,18 @@ static int reiserfs_file_open(struct inode *inode, struct file *file) 


	/* somebody might be tailpacking on final close; wait for it */

        if (!atomic_inc_not_zero(&REISERFS_I(inode)->openers)) {

		mutex_lock(&(REISERFS_I(inode)->tailpack));

		mutex_lock(&REISERFS_I(inode)->tailpack);

		atomic_inc(&REISERFS_I(inode)->openers);

		mutex_unlock(&(REISERFS_I(inode)->tailpack));

		mutex_unlock(&REISERFS_I(inode)->tailpack);

	}

	return err;

}



void reiserfs_vfs_truncate_file(struct inode *inode)

{

	mutex_lock(&(REISERFS_I(inode)->tailpack));

	mutex_lock(&REISERFS_I(inode)->tailpack);

	reiserfs_truncate_file(inode, 1);

	mutex_unlock(&(REISERFS_I(inode)->tailpack));

	mutex_unlock(&REISERFS_I(inode)->tailpack);

}



/* Sync a reiserfs file. */

fs/reiserfs/fix_node.c

+4 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void create_virtual_node(struct tree_balance *tb, int h) 
	ih = item_head(Sh, 0);



	/* define the mergeability for 0-th item (if it is not being deleted) */

	if (op_is_left_mergeable(&(ih->ih_key), Sh->b_size)

	if (op_is_left_mergeable(&ih->ih_key, Sh->b_size)

	    && (vn->vn_mode != M_DELETE || vn->vn_affected_item_num))

		vn->vn_vi[0].vi_type |= VI_TYPE_LEFT_MERGEABLE;
@@ -682,7 +682,7 @@ static int is_leaf_removable(struct tree_balance *tb) 
	/* check whether we can divide 1 remaining item between neighbors */



	/* get size of remaining item (in item units) */

	size = op_unit_num(&(vn->vn_vi[to_left]));

	size = op_unit_num(&vn->vn_vi[to_left]);



	if (tb->lbytes + tb->rbytes >= size) {

		set_parameters(tb, 0, to_left + 1, to_right + 1, 0, NULL,
@@ -720,7 +720,7 @@ static int are_leaves_removable(struct tree_balance *tb, int lfree, int rfree) 


		ih = item_head(S0, 0);

		if (tb->CFR[0]

		    && !comp_short_le_keys(&(ih->ih_key),

		    && !comp_short_le_keys(&ih->ih_key,

					   internal_key(tb->CFR[0],

							  tb->rkey[0])))

			/*
@@ -1287,7 +1287,7 @@ static inline int can_node_be_removed(int mode, int lfree, int sfree, int rfree, 
	    /* shifting may merge items which might save space */

	    -

	    ((!h

	      && op_is_left_mergeable(&(ih->ih_key), Sh->b_size)) ? IH_SIZE : 0)

	      && op_is_left_mergeable(&ih->ih_key, Sh->b_size)) ? IH_SIZE : 0)

	    -

	    ((!h && r_key

	      && op_is_left_mergeable(r_key, Sh->b_size)) ? IH_SIZE : 0)