GFS2: Fix incorrent statfs consistency check

[safe/jmp/linux-2.6] / fs / gfs2 / eaops.c

diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index 4b9f6cf..dee9b03 100644 (file)
--- a/fs/gfs2/eaops.c
+++ b/fs/gfs2/eaops.c
@@ -1,24 +1,22 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * 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>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
+#include <linux/capability.h>
 #include <linux/xattr.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "acl.h"
 #include "eaops.h"
@@ -32,18 +30,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)
@@ -53,46 +55,6 @@ unsigned int gfs2_ea_name2type(const char *name, char **truncated_name)
        return type;
 }
 
-static int user_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
-{
-       struct inode *inode = ip->i_vnode;
-       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_vnode;
-
-       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_vnode;
-
-       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) &&
@@ -100,13 +62,11 @@ 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;
 
-
-
        return gfs2_ea_get_i(ip, er);
 }
 
@@ -117,7 +77,7 @@ static int system_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 
        if (GFS2_ACL_IS_ACCESS(er->er_name, er->er_name_len)) {
                if (!(er->er_flags & GFS2_ERF_MODE)) {
-                       er->er_mode = ip->i_di.di_mode;
+                       er->er_mode = ip->i_inode.i_mode;
                        er->er_flags |= GFS2_ERF_MODE;
                }
                error = gfs2_acl_validate_set(ip, 1, er,
@@ -143,7 +103,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;
@@ -167,23 +127,31 @@ static int system_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
        return gfs2_ea_remove_i(ip, er);
 }
 
-struct gfs2_eattr_operations gfs2_user_eaops = {
-       .eo_get = user_eo_get,
-       .eo_set = user_eo_set,
-       .eo_remove = user_eo_remove,
+static const struct gfs2_eattr_operations gfs2_user_eaops = {
+       .eo_get = gfs2_ea_get_i,
+       .eo_set = gfs2_ea_set_i,
+       .eo_remove = gfs2_ea_remove_i,
        .eo_name = "user",
 };
 
-struct gfs2_eattr_operations gfs2_system_eaops = {
+const struct gfs2_eattr_operations gfs2_system_eaops = {
        .eo_get = system_eo_get,
        .eo_set = system_eo_set,
        .eo_remove = system_eo_remove,
        .eo_name = "system",
 };
 
-struct gfs2_eattr_operations *gfs2_ea_ops[] = {
+static const struct gfs2_eattr_operations gfs2_security_eaops = {
+       .eo_get = gfs2_ea_get_i,
+       .eo_set = gfs2_ea_set_i,
+       .eo_remove = gfs2_ea_remove_i,
+       .eo_name = "security",
+};
+
+const struct gfs2_eattr_operations *gfs2_ea_ops[] = {
        NULL,
        &gfs2_user_eaops,
        &gfs2_system_eaops,
+       &gfs2_security_eaops,
 };