diff --git a/[refs] b/[refs]
index ed7284147b7d..92dd26c3a1be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48fac1790935ef2f9548d92e7c8ba604d1b80c12
+refs/heads/master: 2c1e52aa905f2223dc600cfeda6c0dc94fac8b81
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index baa93c5d9592..7a5ab817ad9c 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -29,7 +29,7 @@
 #include "ops_file.h"
 #include "util.h"
 
-#define BFITNOENT (u32)~0
+#define BFITNOENT ((u32)~0)
 
 /*
  * These routines are used by the resource group routines (rgrp.c)
@@ -693,17 +693,6 @@ struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip)
 	return al;
 }
 
-/**
- * gfs2_alloc_put - throw away the struct gfs2_alloc for an inode
- * @ip: the inode
- *
- */
-
-void gfs2_alloc_put(struct gfs2_inode *ip)
-{
-	return;
-}
-
 /**
  * try_rgrp_fit - See if a given reservation will fit in a given RG
  * @rgd: the RG data
diff --git a/trunk/fs/gfs2/rgrp.h b/trunk/fs/gfs2/rgrp.h
index 355895767387..9eedfd12bfff 100644
--- a/trunk/fs/gfs2/rgrp.h
+++ b/trunk/fs/gfs2/rgrp.h
@@ -30,7 +30,10 @@ void gfs2_rgrp_bh_put(struct gfs2_rgrpd *rgd);
 void gfs2_rgrp_repolish_clones(struct gfs2_rgrpd *rgd);
 
 struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip);
-void gfs2_alloc_put(struct gfs2_inode *ip);
+static inline void gfs2_alloc_put(struct gfs2_inode *ip)
+{
+	return; /* Se we can see where ip->i_alloc is used */
+}
 
 int gfs2_inplace_reserve_i(struct gfs2_inode *ip,
 			 char *file, unsigned int line);
diff --git a/trunk/fs/gfs2/sys.c b/trunk/fs/gfs2/sys.c
index 7a282a4bde2a..0d7f0a4e3717 100644
--- a/trunk/fs/gfs2/sys.c
+++ b/trunk/fs/gfs2/sys.c
@@ -223,7 +223,7 @@ static struct kobj_type gfs2_ktype = {
 
 static struct kset gfs2_kset = {
 	.subsys = &fs_subsys,
-	.kobj   = {.name = "gfs2",},
+	.kobj   = {.name = "gfs2"},
 	.ktype  = &gfs2_ktype,
 };