1 files changed, 14 insertions, 0 deletions

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 9bdb3aeefe89..3b04f5d2e896 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -64,6 +64,7 @@
 #include "sysfile.h"
 #include "uptodate.h"
 #include "ver.h"
+#include "xattr.h"
 
 #include "buffer_head_io.h"
 
@@ -154,6 +155,8 @@ enum {
         Opt_localalloc,
         Opt_localflocks,
         Opt_stack,
+        Opt_user_xattr,
+        Opt_nouser_xattr,
         Opt_err,
 };
 
@@ -173,6 +176,8 @@ static const match_table_t tokens = {
         {Opt_localalloc, "localalloc=%d"},
         {Opt_localflocks, "localflocks"},
         {Opt_stack, "cluster_stack=%s"},
+        {Opt_user_xattr, "user_xattr"},
+        {Opt_nouser_xattr, "nouser_xattr"},
         {Opt_err, NULL}
 };
 
@@ -848,6 +853,12 @@ static int ocfs2_parse_options(struct super_block *sb,
                 case Opt_data_writeback:
                         mopt->mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;
                         break;
+                case Opt_user_xattr:
+                        mopt->mount_opt &= ~OCFS2_MOUNT_NOUSERXATTR;
+                        break;
+                case Opt_nouser_xattr:
+                        mopt->mount_opt |= OCFS2_MOUNT_NOUSERXATTR;
+                        break;
                 case Opt_atime_quantum:
                         if (match_int(&args[0], &option)) {
                                 status = 0;
@@ -1135,6 +1146,7 @@ static void ocfs2_inode_init_once(void *data)
         oi->ip_dir_start_lookup = 0;
 
         init_rwsem(&oi->ip_alloc_sem);
+        init_rwsem(&oi->ip_xattr_sem);
         mutex_init(&oi->ip_io_mutex);
 
         oi->ip_blkno = 0ULL;
@@ -1378,6 +1390,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
         sb->s_fs_info = osb;
         sb->s_op = &ocfs2_sops;
         sb->s_export_op = &ocfs2_export_ops;
+        sb->s_xattr = ocfs2_xattr_handlers;
         sb->s_time_gran = 1;
         sb->s_flags |= MS_NOATIME;
         /* this is needed to support O_LARGEFILE */
@@ -1574,6 +1587,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
         osb->first_cluster_group_blkno =
                 le64_to_cpu(di->id2.i_super.s_first_cluster_group);
         osb->fs_generation = le32_to_cpu(di->i_fs_generation);
+        osb->uuid_hash = le32_to_cpu(di->id2.i_super.s_uuid_hash);
         mlog(0, "vol_label: %s\n", osb->vol_label);
         mlog(0, "uuid: %s\n", osb->uuid_str);
         mlog(0, "root_blkno=%llu, system_dir_blkno=%llu\n",