Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index 85c1dba..92c54e9 100644 (file)
--- a/fs/gfs2/eaops.c
+++ b/fs/gfs2/eaops.c
@@ -4,7 +4,7 @@
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #include <linux/sched.h>
@@ -14,10 +14,10 @@
 #include <linux/buffer_head.h>
 #include <linux/xattr.h>
 #include <linux/gfs2_ondisk.h>
+#include <linux/lm_interface.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "acl.h"
 #include "eaops.h"
@@ -31,18 +31,22 @@
  * Returns: GFS2_EATYPE_XXX
  */
 
-unsigned int gfs2_ea_name2type(const char *name, char **truncated_name)
+unsigned int gfs2_ea_name2type(const char *name, const char **truncated_name)
 {
        unsigned int type;
 
        if (strncmp(name, "system.", 7) == 0) {
                type = GFS2_EATYPE_SYS;
                if (truncated_name)
-                       *truncated_name = strchr(name, '.') + 1;
+                       *truncated_name = name + sizeof("system.") - 1;
        } else if (strncmp(name, "user.", 5) == 0) {
                type = GFS2_EATYPE_USR;
                if (truncated_name)
-                       *truncated_name = strchr(name, '.') + 1;
+                       *truncated_name = name + sizeof("user.") - 1;
+       } else if (strncmp(name, "security.", 9) == 0) {
+               type = GFS2_EATYPE_SECURITY;
+               if (truncated_name)
+                       *truncated_name = name + sizeof("security.") - 1;
        } else {
                type = GFS2_EATYPE_UNUSED;
                if (truncated_name)
@@ -54,7 +58,7 @@ unsigned int gfs2_ea_name2type(const char *name, char **truncated_name)
 
 static int user_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-       struct inode *inode = ip->i_vnode;
+       struct inode *inode = &ip->i_inode;
        int error = permission(inode, MAY_READ, NULL);
        if (error)
                return error;
@@ -64,7 +68,7 @@ static int user_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 
 static int user_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-       struct inode *inode = ip->i_vnode;
+       struct inode *inode = &ip->i_inode;
 
        if (S_ISREG(inode->i_mode) ||
            (S_ISDIR(inode->i_mode) && !(inode->i_mode & S_ISVTX))) {
@@ -79,7 +83,7 @@ static int user_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 
 static int user_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-       struct inode *inode = ip->i_vnode;
+       struct inode *inode = &ip->i_inode;
 
        if (S_ISREG(inode->i_mode) ||
            (S_ISDIR(inode->i_mode) && !(inode->i_mode & S_ISVTX))) {
@@ -99,7 +103,7 @@ static int system_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
            !capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       if (ip->i_sbd->sd_args.ar_posix_acl == 0 &&
+       if (GFS2_SB(&ip->i_inode)->sd_args.ar_posix_acl == 0 &&
            (GFS2_ACL_IS_ACCESS(er->er_name, er->er_name_len) ||
             GFS2_ACL_IS_DEFAULT(er->er_name, er->er_name_len)))
                return -EOPNOTSUPP;
@@ -142,7 +146,7 @@ static int system_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
                        if (error == -ENODATA)
                                error = 0;
                }
-               return error;   
+               return error;
        }
 
        return -EPERM;
@@ -166,6 +170,36 @@ 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 struct gfs2_eattr_operations gfs2_user_eaops = {
        .eo_get = user_eo_get,
        .eo_set = user_eo_set,
@@ -180,9 +214,17 @@ struct gfs2_eattr_operations gfs2_system_eaops = {
        .eo_name = "system",
 };
 
+static struct gfs2_eattr_operations gfs2_security_eaops = {
+       .eo_get = security_eo_get,
+       .eo_set = security_eo_set,
+       .eo_remove = security_eo_remove,
+       .eo_name = "security",
+};
+
 struct gfs2_eattr_operations *gfs2_ea_ops[] = {
        NULL,
        &gfs2_user_eaops,
        &gfs2_system_eaops,
+       &gfs2_security_eaops,
 };