diff options
-rw-r--r-- | fs/gfs2/lops.c | 4 | ||||
-rw-r--r-- | fs/gfs2/meta_io.c | 10 | ||||
-rw-r--r-- | fs/gfs2/meta_io.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index efb1087d0fa8..a065f7667238 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c | |||
@@ -79,7 +79,7 @@ static void buf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le) | |||
79 | gfs2_trans_add_gl(bd->bd_gl); | 79 | gfs2_trans_add_gl(bd->bd_gl); |
80 | 80 | ||
81 | gfs2_meta_check(sdp, bd->bd_bh); | 81 | gfs2_meta_check(sdp, bd->bd_bh); |
82 | gfs2_meta_pin(sdp, bd->bd_bh); | 82 | gfs2_pin(sdp, bd->bd_bh); |
83 | 83 | ||
84 | gfs2_log_lock(sdp); | 84 | gfs2_log_lock(sdp); |
85 | sdp->sd_log_num_buf++; | 85 | sdp->sd_log_num_buf++; |
@@ -169,7 +169,7 @@ static void buf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai) | |||
169 | list_del_init(&bd->bd_le.le_list); | 169 | list_del_init(&bd->bd_le.le_list); |
170 | sdp->sd_log_num_buf--; | 170 | sdp->sd_log_num_buf--; |
171 | 171 | ||
172 | gfs2_meta_unpin(sdp, bd->bd_bh, ai); | 172 | gfs2_unpin(sdp, bd->bd_bh, ai); |
173 | } | 173 | } |
174 | gfs2_assert_warn(sdp, !sdp->sd_log_num_buf); | 174 | gfs2_assert_warn(sdp, !sdp->sd_log_num_buf); |
175 | } | 175 | } |
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c index 134f31efe515..b6bd2ebfc2cc 100644 --- a/fs/gfs2/meta_io.c +++ b/fs/gfs2/meta_io.c | |||
@@ -574,13 +574,13 @@ void gfs2_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh, int meta | |||
574 | } | 574 | } |
575 | 575 | ||
576 | /** | 576 | /** |
577 | * gfs2_meta_pin - Pin a metadata buffer in memory | 577 | * gfs2_pin - Pin a buffer in memory |
578 | * @sdp: the filesystem the buffer belongs to | 578 | * @sdp: the filesystem the buffer belongs to |
579 | * @bh: The buffer to be pinned | 579 | * @bh: The buffer to be pinned |
580 | * | 580 | * |
581 | */ | 581 | */ |
582 | 582 | ||
583 | void gfs2_meta_pin(struct gfs2_sbd *sdp, struct buffer_head *bh) | 583 | void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh) |
584 | { | 584 | { |
585 | struct gfs2_bufdata *bd = get_v2bd(bh); | 585 | struct gfs2_bufdata *bd = get_v2bd(bh); |
586 | 586 | ||
@@ -609,15 +609,15 @@ void gfs2_meta_pin(struct gfs2_sbd *sdp, struct buffer_head *bh) | |||
609 | } | 609 | } |
610 | 610 | ||
611 | /** | 611 | /** |
612 | * gfs2_meta_unpin - Unpin a buffer | 612 | * gfs2_unpin - Unpin a buffer |
613 | * @sdp: the filesystem the buffer belongs to | 613 | * @sdp: the filesystem the buffer belongs to |
614 | * @bh: The buffer to unpin | 614 | * @bh: The buffer to unpin |
615 | * @ai: | 615 | * @ai: |
616 | * | 616 | * |
617 | */ | 617 | */ |
618 | 618 | ||
619 | void gfs2_meta_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh, | 619 | void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh, |
620 | struct gfs2_ail *ai) | 620 | struct gfs2_ail *ai) |
621 | { | 621 | { |
622 | struct gfs2_bufdata *bd = get_v2bd(bh); | 622 | struct gfs2_bufdata *bd = get_v2bd(bh); |
623 | 623 | ||
diff --git a/fs/gfs2/meta_io.h b/fs/gfs2/meta_io.h index 10fbf825c110..887cac302c1b 100644 --- a/fs/gfs2/meta_io.h +++ b/fs/gfs2/meta_io.h | |||
@@ -65,9 +65,9 @@ int gfs2_meta_read(struct gfs2_glock *gl, uint64_t blkno, | |||
65 | int gfs2_meta_reread(struct gfs2_sbd *sdp, struct buffer_head *bh, int flags); | 65 | int gfs2_meta_reread(struct gfs2_sbd *sdp, struct buffer_head *bh, int flags); |
66 | 66 | ||
67 | void gfs2_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh, int meta); | 67 | void gfs2_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh, int meta); |
68 | void gfs2_meta_pin(struct gfs2_sbd *sdp, struct buffer_head *bh); | 68 | void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh); |
69 | void gfs2_meta_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh, | 69 | void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh, |
70 | struct gfs2_ail *ai); | 70 | struct gfs2_ail *ai); |
71 | 71 | ||
72 | void gfs2_meta_wipe(struct gfs2_inode *ip, uint64_t bstart, uint32_t blen); | 72 | void gfs2_meta_wipe(struct gfs2_inode *ip, uint64_t bstart, uint32_t blen); |
73 | 73 | ||