1 files changed, 5 insertions, 2 deletions

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 6d6d06cb6dfc..9de9b2236419 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -51,7 +51,7 @@
 #include "export.h"
 #include "compression.h"
 
-static struct super_operations btrfs_super_ops;
+static const struct super_operations btrfs_super_ops;
 
 static void btrfs_put_super(struct super_block *sb)
 {
@@ -344,7 +344,9 @@ static int btrfs_fill_super(struct super_block *sb,
         sb->s_export_op = &btrfs_export_ops;
         sb->s_xattr = btrfs_xattr_handlers;
         sb->s_time_gran = 1;
+#ifdef CONFIG_BTRFS_POSIX_ACL
         sb->s_flags |= MS_POSIXACL;
+#endif
 
         tree_root = open_ctree(sb, fs_devices, (char *)data);
 
@@ -675,7 +677,8 @@ static int btrfs_unfreeze(struct super_block *sb)
         return 0;
 }
 
-static struct super_operations btrfs_super_ops = {
+static const struct super_operations btrfs_super_ops = {
+        .drop_inode     = btrfs_drop_inode,
         .delete_inode   = btrfs_delete_inode,
         .put_super      = btrfs_put_super,
         .sync_fs        = btrfs_sync_fs,