From 573fac8c03ed9f22e6486298bf581d1e505be23d Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@ubuntu.com>
Date: Wed, 28 Nov 2007 16:22:09 +0100
Subject: [PATCH] --- yaml --- r: 76039 b: refs/heads/master c:
 bcd405599faa16cf32a3d3f1ce6a1e12cb37fede h: refs/heads/master i:   76037:
 02c11dc3b77f0ebea132d3e4e0d5739d4c34bb3b   76035:
 9a545ea0aa528857f1b9e8656946831be9ccce62   76031:
 8e743068df89ff7b7f34775455f505ede31300d5 v: v3

---
 [refs]                |  2 +-
 trunk/fs/gfs2/eaops.c | 42 ++++++------------------------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/[refs] b/[refs]
index ae83483ba01b..0da6d92973dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a69a23f7df18f39e4a084e10b62ff4a144b05a5
+refs/heads/master: bcd405599faa16cf32a3d3f1ce6a1e12cb37fede
diff --git a/trunk/fs/gfs2/eaops.c b/trunk/fs/gfs2/eaops.c
index 14fbd95fd664..f114ba2b3557 100644
--- a/trunk/fs/gfs2/eaops.c
+++ b/trunk/fs/gfs2/eaops.c
@@ -56,21 +56,6 @@ unsigned int gfs2_ea_name2type(const char *name, const char **truncated_name)
 	return type;
 }
 
-static int user_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-	return gfs2_ea_get_i(ip, er);
-}
-
-static int user_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-	return gfs2_ea_set_i(ip, er);
-}
-
-static int user_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-	return gfs2_ea_remove_i(ip, er);
-}
-
 static int system_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
 	if (!GFS2_ACL_IS_ACCESS(er->er_name, er->er_name_len) &&
@@ -143,25 +128,10 @@ static int system_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 	return gfs2_ea_remove_i(ip, er);
 }
 
-static int security_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-	return gfs2_ea_get_i(ip, er);
-}
-
-static int security_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-	return gfs2_ea_set_i(ip, er);
-}
-
-static int security_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-	return gfs2_ea_remove_i(ip, er);
-}
-
 static const struct gfs2_eattr_operations gfs2_user_eaops = {
-	.eo_get = user_eo_get,
-	.eo_set = user_eo_set,
-	.eo_remove = user_eo_remove,
+	.eo_get = gfs2_ea_get_i,
+	.eo_set = gfs2_ea_set_i,
+	.eo_remove = gfs2_ea_remove_i,
 	.eo_name = "user",
 };
 
@@ -173,9 +143,9 @@ const struct gfs2_eattr_operations gfs2_system_eaops = {
 };
 
 static const struct gfs2_eattr_operations gfs2_security_eaops = {
-	.eo_get = security_eo_get,
-	.eo_set = security_eo_set,
-	.eo_remove = security_eo_remove,
+	.eo_get = gfs2_ea_get_i,
+	.eo_set = gfs2_ea_set_i,
+	.eo_remove = gfs2_ea_remove_i,
 	.eo_name = "security",
 };