ext4: move headers out of include/linux

[pandora-kernel.git] / fs / ext4 / xattr_security.c

diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
index b9c40c1..ca5f89f 100644 (file)
--- a/fs/ext4/xattr_security.c
+++ b/fs/ext4/xattr_security.c
@@ -1,19 +1,18 @@
 /*
- * linux/fs/ext3/xattr_security.c
+ * linux/fs/ext4/xattr_security.c
  * Handler for storing security labels as extended attributes.
  */
 
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
-#include <linux/smp_lock.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/security.h>
+#include "ext4_jbd2.h"
+#include "ext4.h"
 #include "xattr.h"
 
 static size_t
-ext3_xattr_security_list(struct inode *inode, char *list, size_t list_size,
+ext4_xattr_security_list(struct inode *inode, char *list, size_t list_size,
                         const char *name, size_t name_len)
 {
        const size_t prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1;
@@ -29,27 +28,27 @@ ext3_xattr_security_list(struct inode *inode, char *list, size_t list_size,
 }
 
 static int
-ext3_xattr_security_get(struct inode *inode, const char *name,
+ext4_xattr_security_get(struct inode *inode, const char *name,
                       void *buffer, size_t size)
 {
        if (strcmp(name, "") == 0)
                return -EINVAL;
-       return ext3_xattr_get(inode, EXT3_XATTR_INDEX_SECURITY, name,
+       return ext4_xattr_get(inode, EXT4_XATTR_INDEX_SECURITY, name,
                              buffer, size);
 }
 
 static int
-ext3_xattr_security_set(struct inode *inode, const char *name,
+ext4_xattr_security_set(struct inode *inode, const char *name,
                       const void *value, size_t size, int flags)
 {
        if (strcmp(name, "") == 0)
                return -EINVAL;
-       return ext3_xattr_set(inode, EXT3_XATTR_INDEX_SECURITY, name,
+       return ext4_xattr_set(inode, EXT4_XATTR_INDEX_SECURITY, name,
                              value, size, flags);
 }
 
 int
-ext3_init_security(handle_t *handle, struct inode *inode, struct inode *dir)
+ext4_init_security(handle_t *handle, struct inode *inode, struct inode *dir)
 {
        int err;
        size_t len;
@@ -62,16 +61,16 @@ ext3_init_security(handle_t *handle, struct inode *inode, struct inode *dir)
                        return 0;
                return err;
        }
-       err = ext3_xattr_set_handle(handle, inode, EXT3_XATTR_INDEX_SECURITY,
+       err = ext4_xattr_set_handle(handle, inode, EXT4_XATTR_INDEX_SECURITY,
                                    name, value, len, 0);
        kfree(name);
        kfree(value);
        return err;
 }
 
-struct xattr_handler ext3_xattr_security_handler = {
+struct xattr_handler ext4_xattr_security_handler = {
        .prefix = XATTR_SECURITY_PREFIX,
-       .list   = ext3_xattr_security_list,
-       .get    = ext3_xattr_security_get,
-       .set    = ext3_xattr_security_set,
+       .list   = ext4_xattr_security_list,
+       .get    = ext4_xattr_security_get,
+       .set    = ext4_xattr_security_set,
 };