diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index b7e6a37cab6ecd0d4b81ea643bc3bb94995fc4a1..3ace242f2b1684ab059d4a9afb4a2a7239056451 100644
--- a/fs/gfs2/eaops.c
+++ b/fs/gfs2/eaops.c
@@ -214,7 +214,7 @@ struct gfs2_eattr_operations gfs2_system_eaops = {
 	.eo_name = "system",
 };
 
-struct gfs2_eattr_operations gfs2_security_eaops = {
+static struct gfs2_eattr_operations gfs2_security_eaops = {
 	.eo_get = security_eo_get,
 	.eo_set = security_eo_set,
 	.eo_remove = security_eo_remove,
diff --git a/fs/gfs2/eaops.h b/fs/gfs2/eaops.h
index 965a235c96e84d260fbe79a6ee7e045a09557397..3dece17e31166dd77ce870656deca4db76e6d7a0 100644
--- a/fs/gfs2/eaops.h
+++ b/fs/gfs2/eaops.h
@@ -23,8 +23,6 @@ unsigned int gfs2_ea_name2type(const char *name, char **truncated_name);
 
 extern struct gfs2_eattr_operations gfs2_system_eaops;
 
-extern struct gfs2_eattr_operations gfs2_security_eaops;
-
 extern struct gfs2_eattr_operations *gfs2_ea_ops[];
 
 #endif /* __EAOPS_DOT_H__ */
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 651341918833eeda3d8ec5cc144e0db18191e1c9..14c1f88bfb5d3e025e52ae8b27b2906d5c087fdc 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1401,7 +1401,7 @@ void gfs2_unlink_di(struct inode *inode)
 	gfs2_trans_add_rg(rgd);
 }
 
-void gfs2_free_uninit_di(struct gfs2_rgrpd *rgd, uint64_t blkno)
+static void gfs2_free_uninit_di(struct gfs2_rgrpd *rgd, uint64_t blkno)
 {
 	struct gfs2_sbd *sdp = rgd->rd_sbd;
 	struct gfs2_rgrpd *tmp_rgd;
diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h
index e86a532cc1594acc49976576f7f792e9dd5f1d43..9c42d2252ddd2fcb780f3438962b89f5e91745ec 100644
--- a/fs/gfs2/rgrp.h
+++ b/fs/gfs2/rgrp.h
@@ -43,7 +43,6 @@ uint64_t gfs2_alloc_di(struct gfs2_inode *ip);
 
 void gfs2_free_data(struct gfs2_inode *ip, uint64_t bstart, uint32_t blen);
 void gfs2_free_meta(struct gfs2_inode *ip, uint64_t bstart, uint32_t blen);
-void gfs2_free_uninit_di(struct gfs2_rgrpd *rgd, uint64_t blkno);
 void gfs2_free_di(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip);
 void gfs2_unlink_di(struct inode *inode);