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

Commit cbbe76c8 authored by Bob Peterson's avatar Bob Peterson Committed by Andreas Gruenbacher
Browse files

gfs2: Remove vestigial bd_ops 



Field bd_ops was set but never used, so I removed it, and all
code supporting it.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Acked-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 2a5f14f2

fs/gfs2/incore.h

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ struct gfs2_bufdata { 
	u64 bd_blkno;



	struct list_head bd_list;

	const struct gfs2_log_operations *bd_ops;



	struct gfs2_trans *bd_tr;

	struct list_head bd_ail_st_list;

fs/gfs2/log.c

+0 −1
Original line number Diff line number Diff line
@@ -605,7 +605,6 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) 
	bd->bd_blkno = bh->b_blocknr;

	gfs2_remove_from_ail(bd); /* drops ref on bh */

	bd->bd_bh = NULL;

	bd->bd_ops = &gfs2_revoke_lops;

	sdp->sd_log_num_revoke++;

	atomic_inc(&gl->gl_revokes);

	set_bit(GLF_LFLUSH, &gl->gl_flags);

fs/gfs2/trans.c

+3 −5
Original line number Diff line number Diff line
@@ -124,15 +124,13 @@ void gfs2_trans_end(struct gfs2_sbd *sdp) 
}



static struct gfs2_bufdata *gfs2_alloc_bufdata(struct gfs2_glock *gl,

					       struct buffer_head *bh,

					       const struct gfs2_log_operations *lops)

					       struct buffer_head *bh)

{

	struct gfs2_bufdata *bd;



	bd = kmem_cache_zalloc(gfs2_bufdata_cachep, GFP_NOFS | __GFP_NOFAIL);

	bd->bd_bh = bh;

	bd->bd_gl = gl;

	bd->bd_ops = lops;

	INIT_LIST_HEAD(&bd->bd_list);

	bh->b_private = bd;

	return bd;
@@ -169,7 +167,7 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh) 
		gfs2_log_unlock(sdp);

		unlock_buffer(bh);

		if (bh->b_private == NULL)

			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_databuf_lops);

			bd = gfs2_alloc_bufdata(gl, bh);

		else

			bd = bh->b_private;

		lock_buffer(bh);
@@ -210,7 +208,7 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh) 
		unlock_buffer(bh);

		lock_page(bh->b_page);

		if (bh->b_private == NULL)

			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_buf_lops);

			bd = gfs2_alloc_bufdata(gl, bh);

		else

			bd = bh->b_private;

		unlock_page(bh->b_page);