Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs

[safe/jmp/linux-2.6] / fs / ubifs / xattr.c

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index cfd31e2..195830f 100644 (file)
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -55,9 +55,9 @@
  * ACL support is not implemented.
  */
 
+#include "ubifs.h"
 #include <linux/xattr.h>
 #include <linux/posix_acl_xattr.h>
-#include "ubifs.h"
 
 /*
  * Limit the number of extended attributes per inode so that the total size
@@ -78,9 +78,9 @@ enum {
        SECURITY_XATTR,
 };
 
-static struct inode_operations none_inode_operations;
-static struct address_space_operations none_address_operations;
-static struct file_operations none_file_operations;
+static const struct inode_operations none_inode_operations;
+static const struct address_space_operations none_address_operations;
+static const struct file_operations none_file_operations;
 
 /**
  * create_xattr - create an extended attribute.