--- /dev/null
+From: Mark Fasheh <mfasheh@suse.com>
+Subject: ocfs2: Move trusted and user attribute support into xattr.c
+Patch-mainline: 2.6.28
+
+Per Christoph Hellwig's suggestion - don't split these up. It's not like we
+gained much by having the two tiny files around.
+
+Signed-off-by: Mark Fasheh <mfasheh@suse.com>
+---
+ fs/ocfs2/Makefile | 4 +-
+ fs/ocfs2/xattr.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++
+ fs/ocfs2/xattr_trusted.c | 82 ----------------------------------
+ fs/ocfs2/xattr_user.c | 94 ---------------------------------------
+ 4 files changed, 111 insertions(+), 179 deletions(-)
+ delete mode 100644 fs/ocfs2/xattr_trusted.c
+ delete mode 100644 fs/ocfs2/xattr_user.c
+
+Index: linux-2.6.27/fs/ocfs2/Makefile
+===================================================================
+--- linux-2.6.27.orig/fs/ocfs2/Makefile
++++ linux-2.6.27/fs/ocfs2/Makefile
+@@ -35,9 +35,7 @@ ocfs2-objs := \
+ sysfile.o \
+ uptodate.o \
+ ver.o \
+- xattr.o \
+- xattr_user.o \
+- xattr_trusted.o
++ xattr.o
+
+ ocfs2_stackglue-objs := stackglue.o
+ ocfs2_stack_o2cb-objs := stack_o2cb.o
+Index: linux-2.6.27/fs/ocfs2/xattr.c
+===================================================================
+--- linux-2.6.27.orig/fs/ocfs2/xattr.c
++++ linux-2.6.27/fs/ocfs2/xattr.c
+@@ -37,6 +37,9 @@
+ #include <linux/writeback.h>
+ #include <linux/falloc.h>
+ #include <linux/sort.h>
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/string.h>
+
+ #define MLOG_MASK_PREFIX ML_XATTR
+ #include <cluster/masklog.h>
+@@ -4756,3 +4759,110 @@ static int ocfs2_delete_xattr_index_bloc
+ out:
+ return ret;
+ }
++
++/*
++ * 'trusted' attributes support
++ */
++
++#define XATTR_TRUSTED_PREFIX "trusted."
++
++static size_t ocfs2_xattr_trusted_list(struct inode *inode, char *list,
++ size_t list_size, const char *name,
++ size_t name_len)
++{
++ const size_t prefix_len = sizeof(XATTR_TRUSTED_PREFIX) - 1;
++ const size_t total_len = prefix_len + name_len + 1;
++
++ if (list && total_len <= list_size) {
++ memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len);
++ memcpy(list + prefix_len, name, name_len);
++ list[prefix_len + name_len] = '\0';
++ }
++ return total_len;
++}
++
++static int ocfs2_xattr_trusted_get(struct inode *inode, const char *name,
++ void *buffer, size_t size)
++{
++ if (strcmp(name, "") == 0)
++ return -EINVAL;
++ return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_TRUSTED, name,
++ buffer, size);
++}
++
++static int ocfs2_xattr_trusted_set(struct inode *inode, const char *name,
++ const void *value, size_t size, int flags)
++{
++ if (strcmp(name, "") == 0)
++ return -EINVAL;
++
++ return ocfs2_xattr_set(inode, OCFS2_XATTR_INDEX_TRUSTED, name, value,
++ size, flags);
++}
++
++struct xattr_handler ocfs2_xattr_trusted_handler = {
++ .prefix = XATTR_TRUSTED_PREFIX,
++ .list = ocfs2_xattr_trusted_list,
++ .get = ocfs2_xattr_trusted_get,
++ .set = ocfs2_xattr_trusted_set,
++};
++
++
++/*
++ * 'user' attributes support
++ */
++
++#define XATTR_USER_PREFIX "user."
++
++static size_t ocfs2_xattr_user_list(struct inode *inode, char *list,
++ size_t list_size, const char *name,
++ size_t name_len)
++{
++ const size_t prefix_len = sizeof(XATTR_USER_PREFIX) - 1;
++ const size_t total_len = prefix_len + name_len + 1;
++ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
++
++ if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
++ return 0;
++
++ if (list && total_len <= list_size) {
++ memcpy(list, XATTR_USER_PREFIX, prefix_len);
++ memcpy(list + prefix_len, name, name_len);
++ list[prefix_len + name_len] = '\0';
++ }
++ return total_len;
++}
++
++static int ocfs2_xattr_user_get(struct inode *inode, const char *name,
++ void *buffer, size_t size)
++{
++ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
++
++ if (strcmp(name, "") == 0)
++ return -EINVAL;
++ if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
++ return -EOPNOTSUPP;
++ return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_USER, name,
++ buffer, size);
++}
++
++static int ocfs2_xattr_user_set(struct inode *inode, const char *name,
++ const void *value, size_t size, int flags)
++{
++ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
++
++ if (strcmp(name, "") == 0)
++ return -EINVAL;
++ if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
++ return -EOPNOTSUPP;
++
++ return ocfs2_xattr_set(inode, OCFS2_XATTR_INDEX_USER, name, value,
++ size, flags);
++}
++
++struct xattr_handler ocfs2_xattr_user_handler = {
++ .prefix = XATTR_USER_PREFIX,
++ .list = ocfs2_xattr_user_list,
++ .get = ocfs2_xattr_user_get,
++ .set = ocfs2_xattr_user_set,
++};
+Index: linux-2.6.27/fs/ocfs2/xattr_trusted.c
+===================================================================
+--- linux-2.6.27.orig/fs/ocfs2/xattr_trusted.c
++++ /dev/null
+@@ -1,82 +0,0 @@
+-/* -*- mode: c; c-basic-offset: 8; -*-
+- * vim: noexpandtab sw=8 ts=8 sts=0:
+- *
+- * xattr_trusted.c
+- *
+- * Copyright (C) 2008 Oracle. All rights reserved.
+- *
+- * CREDITS:
+- * Lots of code in this file is taken from ext3.
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public
+- * License along with this program; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 021110-1307, USA.
+- */
+-
+-#include <linux/init.h>
+-#include <linux/module.h>
+-#include <linux/string.h>
+-
+-#define MLOG_MASK_PREFIX ML_INODE
+-#include <cluster/masklog.h>
+-
+-#include "ocfs2.h"
+-#include "alloc.h"
+-#include "dlmglue.h"
+-#include "file.h"
+-#include "ocfs2_fs.h"
+-#include "xattr.h"
+-
+-#define XATTR_TRUSTED_PREFIX "trusted."
+-
+-static size_t ocfs2_xattr_trusted_list(struct inode *inode, char *list,
+- size_t list_size, const char *name,
+- size_t name_len)
+-{
+- const size_t prefix_len = sizeof(XATTR_TRUSTED_PREFIX) - 1;
+- const size_t total_len = prefix_len + name_len + 1;
+-
+- if (list && total_len <= list_size) {
+- memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len);
+- memcpy(list + prefix_len, name, name_len);
+- list[prefix_len + name_len] = '\0';
+- }
+- return total_len;
+-}
+-
+-static int ocfs2_xattr_trusted_get(struct inode *inode, const char *name,
+- void *buffer, size_t size)
+-{
+- if (strcmp(name, "") == 0)
+- return -EINVAL;
+- return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_TRUSTED, name,
+- buffer, size);
+-}
+-
+-static int ocfs2_xattr_trusted_set(struct inode *inode, const char *name,
+- const void *value, size_t size, int flags)
+-{
+- if (strcmp(name, "") == 0)
+- return -EINVAL;
+-
+- return ocfs2_xattr_set(inode, OCFS2_XATTR_INDEX_TRUSTED, name, value,
+- size, flags);
+-}
+-
+-struct xattr_handler ocfs2_xattr_trusted_handler = {
+- .prefix = XATTR_TRUSTED_PREFIX,
+- .list = ocfs2_xattr_trusted_list,
+- .get = ocfs2_xattr_trusted_get,
+- .set = ocfs2_xattr_trusted_set,
+-};
+Index: linux-2.6.27/fs/ocfs2/xattr_user.c
+===================================================================
+--- linux-2.6.27.orig/fs/ocfs2/xattr_user.c
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/* -*- mode: c; c-basic-offset: 8; -*-
+- * vim: noexpandtab sw=8 ts=8 sts=0:
+- *
+- * xattr_user.c
+- *
+- * Copyright (C) 2008 Oracle. All rights reserved.
+- *
+- * CREDITS:
+- * Lots of code in this file is taken from ext3.
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public
+- * License along with this program; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 021110-1307, USA.
+- */
+-
+-#include <linux/init.h>
+-#include <linux/module.h>
+-#include <linux/string.h>
+-
+-#define MLOG_MASK_PREFIX ML_INODE
+-#include <cluster/masklog.h>
+-
+-#include "ocfs2.h"
+-#include "alloc.h"
+-#include "dlmglue.h"
+-#include "file.h"
+-#include "ocfs2_fs.h"
+-#include "xattr.h"
+-
+-#define XATTR_USER_PREFIX "user."
+-
+-static size_t ocfs2_xattr_user_list(struct inode *inode, char *list,
+- size_t list_size, const char *name,
+- size_t name_len)
+-{
+- const size_t prefix_len = sizeof(XATTR_USER_PREFIX) - 1;
+- const size_t total_len = prefix_len + name_len + 1;
+- struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+-
+- if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
+- return 0;
+-
+- if (list && total_len <= list_size) {
+- memcpy(list, XATTR_USER_PREFIX, prefix_len);
+- memcpy(list + prefix_len, name, name_len);
+- list[prefix_len + name_len] = '\0';
+- }
+- return total_len;
+-}
+-
+-static int ocfs2_xattr_user_get(struct inode *inode, const char *name,
+- void *buffer, size_t size)
+-{
+- struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+-
+- if (strcmp(name, "") == 0)
+- return -EINVAL;
+- if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
+- return -EOPNOTSUPP;
+- return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_USER, name,
+- buffer, size);
+-}
+-
+-static int ocfs2_xattr_user_set(struct inode *inode, const char *name,
+- const void *value, size_t size, int flags)
+-{
+- struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+-
+- if (strcmp(name, "") == 0)
+- return -EINVAL;
+- if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
+- return -EOPNOTSUPP;
+-
+- return ocfs2_xattr_set(inode, OCFS2_XATTR_INDEX_USER, name, value,
+- size, flags);
+-}
+-
+-struct xattr_handler ocfs2_xattr_user_handler = {
+- .prefix = XATTR_USER_PREFIX,
+- .list = ocfs2_xattr_user_list,
+- .get = ocfs2_xattr_user_get,
+- .set = ocfs2_xattr_user_set,
+-};
projects / people / pmueller / ipfire-2.x.git / blobdiff