From 92f92cdb0c3607ecc443b17707f40c348fab274f Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Thu, 22 Jun 2006 11:16:40 -0400
Subject: [PATCH] --- yaml --- r: 38723 b: refs/heads/master c:
 43f5d210a02dcf9d8bafb147044f27add10a459a h: refs/heads/master i:   38721:
 5bf695d544e81fcd8c1b3abc6c38b45f0e3e9ab7   38719:
 6b1cf44aae1722b90857cc83af68278fd044c39b v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/eaops.c | 2 +-
 trunk/fs/gfs2/eaops.h | 2 --
 trunk/fs/gfs2/rgrp.c  | 2 +-
 trunk/fs/gfs2/rgrp.h  | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 39ccbb456a57..632e72b8e74b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faf450ef4a8567e4c75a905aadae01cf401d893a
+refs/heads/master: 43f5d210a02dcf9d8bafb147044f27add10a459a
diff --git a/trunk/fs/gfs2/eaops.c b/trunk/fs/gfs2/eaops.c
index b7e6a37cab6e..3ace242f2b16 100644
--- a/trunk/fs/gfs2/eaops.c
+++ b/trunk/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/trunk/fs/gfs2/eaops.h b/trunk/fs/gfs2/eaops.h
index 965a235c96e8..3dece17e3116 100644
--- a/trunk/fs/gfs2/eaops.h
+++ b/trunk/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/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index 651341918833..14c1f88bfb5d 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/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/trunk/fs/gfs2/rgrp.h b/trunk/fs/gfs2/rgrp.h
index e86a532cc159..9c42d2252ddd 100644
--- a/trunk/fs/gfs2/rgrp.h
+++ b/trunk/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);