Skip to content

Commit

Permalink
[GFS2] Make the new argument to gfs2_trans_add_bh() actually do somet…
Browse files Browse the repository at this point in the history
…hing

Passes the flag through to ensure that the correct log operations are
invoked when the flag is set.

Signed-off-by: Steven Whitehouse: <swhiteho@redhat.com>
  • Loading branch information
Steven Whitehouse committed Jan 18, 2006
1 parent d4e9c4c commit 586dfda
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
11 changes: 7 additions & 4 deletions fs/gfs2/meta_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -537,13 +537,13 @@ int gfs2_meta_reread(struct gfs2_sbd *sdp, struct buffer_head *bh, int flags)
}

/**
* gfs2_meta_attach_bufdata - attach a struct gfs2_bufdata structure to a buffer
* gfs2_attach_bufdata - attach a struct gfs2_bufdata structure to a buffer
* @gl: the glock the buffer belongs to
* @bh: The buffer to be attached to
*
* @meta: Flag to indicate whether its metadata or not
*/

void gfs2_meta_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh)
void gfs2_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh, int meta)
{
struct gfs2_bufdata *bd;

Expand All @@ -563,7 +563,10 @@ void gfs2_meta_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh)
bd->bd_gl = gl;

INIT_LIST_HEAD(&bd->bd_list_tr);
lops_init_le(&bd->bd_le, &gfs2_buf_lops);
if (meta)
lops_init_le(&bd->bd_le, &gfs2_buf_lops);
else
lops_init_le(&bd->bd_le, &gfs2_databuf_lops);

set_v2bd(bh, bd);

Expand Down
2 changes: 1 addition & 1 deletion fs/gfs2/meta_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, uint64_t blkno,
int flags, struct buffer_head **bhp);
int gfs2_meta_reread(struct gfs2_sbd *sdp, struct buffer_head *bh, int flags);

void gfs2_meta_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh);
void gfs2_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh, int meta);
void gfs2_meta_pin(struct gfs2_sbd *sdp, struct buffer_head *bh);
void gfs2_meta_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh,
struct gfs2_ail *ai);
Expand Down
2 changes: 1 addition & 1 deletion fs/gfs2/trans.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void gfs2_trans_add_bh(struct gfs2_glock *gl, struct buffer_head *bh, int meta)
if (bd)
gfs2_assert(sdp, bd->bd_gl == gl);
else {
gfs2_meta_attach_bufdata(gl, bh);
gfs2_attach_bufdata(gl, bh, meta);
bd = get_v2bd(bh);
}

Expand Down

0 comments on commit 586dfda

Please sign in to comment.