X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fgfs2%2Feaops.c;h=c1f44009853f26a65930e28536055f406660494f;hb=d0b6e0e380d6a32d479120a8b5d98cdff936ec8c;hp=4b9f6cff7a348722f1ef1c088c71b240d0ed8a8f;hpb=d26046bb0aff707aac38a9bf3dd56fa39b28a399;p=powerpc.git

diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index 4b9f6cff7a..c1f4400985 100644
--- 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/xattr.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.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"
@@ -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)
@@ -55,7 +57,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;
@@ -65,7 +67,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))) {
@@ -80,7 +82,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))) {
@@ -100,7 +102,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;
@@ -117,7 +119,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 +145,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,7 +169,37 @@ 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 = {
+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,
 	.eo_remove = user_eo_remove,
@@ -181,9 +213,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,
 };