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

Commit 26e43a15 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Move gfs2_icbit_munge into quota.c 



This function is only called twice, and both callers are
quota related, so lets move this function into quota.c and
make it static.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 9e07f2cb

fs/gfs2/quota.c

+20 −0
Original line number Diff line number Diff line
@@ -289,6 +289,26 @@ static void slot_hold(struct gfs2_quota_data *qd) 
	spin_unlock(&qd_lru_lock);

}



static void gfs2_icbit_munge(struct gfs2_sbd *sdp, unsigned char **bitmap,

			     unsigned int bit, int new_value)

{

	unsigned int c, o, b = bit;

	int old_value;



	c = b / (8 * PAGE_SIZE);

	b %= 8 * PAGE_SIZE;

	o = b / 8;

	b %= 8;



	old_value = (bitmap[c][o] & (1 << b));

	gfs2_assert_withdraw(sdp, !old_value != !new_value);



	if (new_value)

		bitmap[c][o] |= 1 << b;

	else

		bitmap[c][o] &= ~(1 << b);

}



static void slot_put(struct gfs2_quota_data *qd)

{

	struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;

fs/gfs2/util.c

+0 −20
Original line number Diff line number Diff line
@@ -268,23 +268,3 @@ int gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh, 
	return rv;

}

void gfs2_icbit_munge(struct gfs2_sbd *sdp, unsigned char **bitmap,

		      unsigned int bit, int new_value)

{

	unsigned int c, o, b = bit;

	int old_value;



	c = b / (8 * PAGE_SIZE);

	b %= 8 * PAGE_SIZE;

	o = b / 8;

	b %= 8;



	old_value = (bitmap[c][o] & (1 << b));

	gfs2_assert_withdraw(sdp, !old_value != !new_value);



	if (new_value)

		bitmap[c][o] |= 1 << b;

	else

		bitmap[c][o] &= ~(1 << b);

}

fs/gfs2/util.h

+0 −2
Original line number Diff line number Diff line
@@ -164,8 +164,6 @@ static inline unsigned int gfs2_tune_get_i(struct gfs2_tune *gt, 
#define gfs2_tune_get(sdp, field) \

gfs2_tune_get_i(&(sdp)->sd_tune, &(sdp)->sd_tune.field)



void gfs2_icbit_munge(struct gfs2_sbd *sdp, unsigned char **bitmap,

		      unsigned int bit, int new_value);

int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...);



#endif /* __UTIL_DOT_H__ */