diff --git a/[refs] b/[refs]
index cb0fd9407558..946c4411d9f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88c8ab1fcb53feadb8ebdcb4cda7e6137c6416bd
+refs/heads/master: 3efd7534a84a3eacb9d43e7f02fadeec4a5b79ff
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index 5a32d6932978..6d918a7c6222 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -58,8 +58,9 @@ static const char valid_change[16] = {
  *
  */
 
-void gfs2_setbit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
-		 unsigned int buflen, uint32_t block, unsigned char new_state)
+static void gfs2_setbit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
+			unsigned int buflen, uint32_t block,
+			unsigned char new_state)
 {
 	unsigned char *byte, *end, cur_state;
 	unsigned int bit;
@@ -87,8 +88,8 @@ void gfs2_setbit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
  *
  */
 
-unsigned char gfs2_testbit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
-			   unsigned int buflen, uint32_t block)
+static unsigned char gfs2_testbit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
+				  unsigned int buflen, uint32_t block)
 {
 	unsigned char *byte, *end, cur_state;
 	unsigned int bit;
@@ -120,9 +121,9 @@ unsigned char gfs2_testbit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
  * Return: the block number (bitmap buffer scope) that was found
  */
 
-uint32_t gfs2_bitfit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
-		     unsigned int buflen, uint32_t goal,
-		     unsigned char old_state)
+static uint32_t gfs2_bitfit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
+			    unsigned int buflen, uint32_t goal,
+			    unsigned char old_state)
 {
 	unsigned char *byte, *end, alloc;
 	uint32_t blk = goal;
@@ -167,8 +168,8 @@ uint32_t gfs2_bitfit(struct gfs2_rgrpd *rgd, unsigned char *buffer,
  * Returns: The number of bits
  */
 
-uint32_t gfs2_bitcount(struct gfs2_rgrpd *rgd, unsigned char *buffer,
-		       unsigned int buflen, unsigned char state)
+static uint32_t gfs2_bitcount(struct gfs2_rgrpd *rgd, unsigned char *buffer,
+			      unsigned int buflen, unsigned char state)
 {
 	unsigned char *byte = buffer;
 	unsigned char *end = buffer + buflen;