[XFS] Fix merge failures

[pandora-kernel.git] / fs / gfs2 / eaops.c

diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index aa8dbf3..f114ba2 100644 (file)
--- a/fs/gfs2/eaops.c
+++ b/fs/gfs2/eaops.c
@@ -56,46 +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)
-{
-       struct inode *inode = &ip->i_inode;
-       int error = permission(inode, MAY_READ, NULL);
-       if (error)
-               return error;
-
-       return gfs2_ea_get_i(ip, er);
-}
-
-static int user_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-       struct inode *inode = &ip->i_inode;
-
-       if (S_ISREG(inode->i_mode) ||
-           (S_ISDIR(inode->i_mode) && !(inode->i_mode & S_ISVTX))) {
-               int error = permission(inode, MAY_WRITE, NULL);
-               if (error)
-                       return error;
-       } else
-               return -EPERM;
-
-       return gfs2_ea_set_i(ip, er);
-}
-
-static int user_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-       struct inode *inode = &ip->i_inode;
-
-       if (S_ISREG(inode->i_mode) ||
-           (S_ISDIR(inode->i_mode) && !(inode->i_mode & S_ISVTX))) {
-               int error = permission(inode, MAY_WRITE, NULL);
-               if (error)
-                       return error;
-       } else
-               return -EPERM;
-
-       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) &&
@@ -108,8 +68,6 @@ static int system_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
             GFS2_ACL_IS_DEFAULT(er->er_name, er->er_name_len)))
                return -EOPNOTSUPP;
 
-
-
        return gfs2_ea_get_i(ip, er);
 }
 
@@ -170,40 +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)
-{
-       struct inode *inode = &ip->i_inode;
-       int error = permission(inode, MAY_READ, NULL);
-       if (error)
-               return error;
-
-       return gfs2_ea_get_i(ip, er);
-}
-
-static int security_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-       struct inode *inode = &ip->i_inode;
-       int error = permission(inode, MAY_WRITE, NULL);
-       if (error)
-               return error;
-
-       return gfs2_ea_set_i(ip, er);
-}
-
-static int security_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-       struct inode *inode = &ip->i_inode;
-       int error = permission(inode, MAY_WRITE, NULL);
-       if (error)
-               return error;
-
-       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",
 };
 
@@ -215,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",
 };