Merge branch 'master'

[linux-2.6-omap-h63xx.git] / fs / gfs2 / meta_io.h

diff --git a/fs/gfs2/meta_io.h b/fs/gfs2/meta_io.h
index 10fbf825c110a4b7a59f705f70ba99c41e856678..887cac302c1b6922fd38dccbc4a24c28666b08f8 100644 (file)
--- 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,
 int gfs2_meta_reread(struct gfs2_sbd *sdp, struct buffer_head *bh, int flags);
 
 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);
+void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh);
+void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh,
+               struct gfs2_ail *ai);
 
 void gfs2_meta_wipe(struct gfs2_inode *ip, uint64_t bstart, uint32_t blen);