Commit 9b47c11d authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Use void * instead of typedef for locking module interface 



As requested by Jan Engelhardt, this removes the typedefs in the
locking module interface and replaces them with void *. Also
since we are changing the interface, I've added a few consts
as well.

Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Cc: David Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent a2c45807

fs/gfs2/glock.c

+2 −1
Original line number Diff line number Diff line
@@ -1713,8 +1713,9 @@ static void blocking_cb(struct gfs2_sbd *sdp, struct lm_lockname *name, 
 * a journal from another client needs to be recovered.

 */



void gfs2_glock_cb(struct gfs2_sbd *sdp, unsigned int type, void *data)

void gfs2_glock_cb(void *cb_data, unsigned int type, void *data)

{

	struct gfs2_sbd *sdp = cb_data;



	switch (type) {

	case LM_CB_NEED_E:

fs/gfs2/glock.h

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static inline int gfs2_glock_nq_init(struct gfs2_glock *gl, 
int gfs2_lvb_hold(struct gfs2_glock *gl);

void gfs2_lvb_unhold(struct gfs2_glock *gl);



void gfs2_glock_cb(struct gfs2_sbd *sdp, unsigned int type, void *data);

void gfs2_glock_cb(void *cb_data, unsigned int type, void *data);



void gfs2_iopen_go_callback(struct gfs2_glock *gl, unsigned int state);

fs/gfs2/incore.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ struct gfs2_glock { 
	struct gfs2_holder *gl_req_gh;

	gfs2_glop_bh_t gl_req_bh;



	lm_lock_t *gl_lock;

	void *gl_lock;

	char *gl_lvb;

	atomic_t gl_lvb_count;

fs/gfs2/lm.c

+7 −7
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...) 
}



int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,

		     lm_lock_t **lockp)

		     void **lockp)

{

	int error = -EIO;

	if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
@@ -131,13 +131,13 @@ int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name, 
	return error;

}



void gfs2_lm_put_lock(struct gfs2_sbd *sdp, lm_lock_t *lock)

void gfs2_lm_put_lock(struct gfs2_sbd *sdp, void *lock)

{

	if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

		sdp->sd_lockstruct.ls_ops->lm_put_lock(lock);

}



unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock,

unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, void *lock,

			  unsigned int cur_state, unsigned int req_state,

			  unsigned int flags)

{
@@ -148,7 +148,7 @@ unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock, 
	return ret;

}



unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, lm_lock_t *lock,

unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, void *lock,

			    unsigned int cur_state)

{

	int ret = 0;
@@ -157,13 +157,13 @@ unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, lm_lock_t *lock, 
	return ret;

}



void gfs2_lm_cancel(struct gfs2_sbd *sdp, lm_lock_t *lock)

void gfs2_lm_cancel(struct gfs2_sbd *sdp, void *lock)

{

	if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

		sdp->sd_lockstruct.ls_ops->lm_cancel(lock);

}



int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp)

int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, void *lock, char **lvbp)

{

	int error = -EIO;

	if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
@@ -171,7 +171,7 @@ int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp) 
	return error;

}



void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb)

void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, void *lock, char *lvb)

{

	if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

		sdp->sd_lockstruct.ls_ops->lm_unhold_lvb(lock, lvb);

fs/gfs2/lm.h

+7 −7
Original line number Diff line number Diff line
@@ -20,16 +20,16 @@ void gfs2_lm_unmount(struct gfs2_sbd *sdp); 
int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)

				__attribute__ ((format(printf, 2, 3)));

int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,

		     lm_lock_t **lockp);

void gfs2_lm_put_lock(struct gfs2_sbd *sdp, lm_lock_t *lock);

unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock,

		     void **lockp);

void gfs2_lm_put_lock(struct gfs2_sbd *sdp, void *lock);

unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, void *lock,

			 unsigned int cur_state, unsigned int req_state,

			 unsigned int flags);

unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, lm_lock_t *lock,

unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, void *lock,

			   unsigned int cur_state);

void gfs2_lm_cancel(struct gfs2_sbd *sdp, lm_lock_t *lock);

int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp);

void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb);

void gfs2_lm_cancel(struct gfs2_sbd *sdp, void *lock);

int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, void *lock, char **lvbp);

void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, void *lock, char *lvb);

int gfs2_lm_plock_get(struct gfs2_sbd *sdp, struct lm_lockname *name,

		      struct file *file, struct file_lock *fl);

int gfs2_lm_plock(struct gfs2_sbd *sdp, struct lm_lockname *name,