---

yaml --- r: 38590 b: refs/heads/master c: a98ab22 h: refs/heads/master v: v3
git-mirror · Jan 18, 2006 · ffc5cb0 · ffc5cb0
1 parent dd449db
commit ffc5cb0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f3df04137d426a0ad1758ab744f5b6d658617bf
+refs/heads/master: a98ab2204f8ed414c5e95fbca28a9f001c53bc7b
diff --git a/trunk/fs/gfs2/lops.c b/trunk/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/trunk/fs/gfs2/meta_io.c b/trunk/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/trunk/fs/gfs2/meta_io.h b/trunk/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);