[GFS2] Rename gfs2_meta_pin to gfs2_pin

Since we'll need to pin data if we are going to journal it, then
I'm renaming this function to make it less confusing. It might also
be worth moving it into lops.c since there are no users outside that
file.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index efb1087d0fa881ad99b9d63643c3898100e96dff..a065f7667238c2840fa2b79eb1b2eff4a3cafbca 100644 (file)
--- 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)
        gfs2_trans_add_gl(bd->bd_gl);
 
        gfs2_meta_check(sdp, bd->bd_bh);
-       gfs2_meta_pin(sdp, bd->bd_bh);
+       gfs2_pin(sdp, bd->bd_bh);
 
        gfs2_log_lock(sdp);
        sdp->sd_log_num_buf++;
@@ -169,7 +169,7 @@ static void buf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
                list_del_init(&bd->bd_le.le_list);
                sdp->sd_log_num_buf--;
 
-               gfs2_meta_unpin(sdp, bd->bd_bh, ai);
+               gfs2_unpin(sdp, bd->bd_bh, ai);
        }
        gfs2_assert_warn(sdp, !sdp->sd_log_num_buf);
 }

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 134f31efe515a6448edf56092f430154e3ba00ca..b6bd2ebfc2cc808153df0998f7904076cf541e78 100644 (file)
--- 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
 }
 
 /**
- * gfs2_meta_pin - Pin a metadata buffer in memory
+ * gfs2_pin - Pin a buffer in memory
  * @sdp: the filesystem the buffer belongs to
  * @bh: The buffer to be pinned
  *
  */
 
-void gfs2_meta_pin(struct gfs2_sbd *sdp, struct buffer_head *bh)
+void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh)
 {
        struct gfs2_bufdata *bd = get_v2bd(bh);
 
@@ -609,15 +609,15 @@ void gfs2_meta_pin(struct gfs2_sbd *sdp, struct buffer_head *bh)
 }
 
 /**
- * gfs2_meta_unpin - Unpin a buffer
+ * gfs2_unpin - Unpin a buffer
  * @sdp: the filesystem the buffer belongs to
  * @bh: The buffer to unpin
  * @ai:
  *
  */
 
-void gfs2_meta_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh,
-                    struct gfs2_ail *ai)
+void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh,
+               struct gfs2_ail *ai)
 {
        struct gfs2_bufdata *bd = get_v2bd(bh);
 

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);