Merge tag 'for-5.0-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
[sfrench/cifs-2.6.git] / fs / btrfs / ctree.h
index 8b1d06fa222dddb92bab398573856750cf5ea271..7a2a2621f0d9d7402ab2bfc2b10d9421c96dbbb0 100644 (file)
@@ -1148,9 +1148,6 @@ struct btrfs_fs_info {
        struct mutex unused_bg_unpin_mutex;
        struct mutex delete_unused_bgs_mutex;
 
-       /* For btrfs to record security options */
-       struct security_mnt_opts security_opts;
-
        /*
         * Chunks that can't be freed yet (under a trim/discard operation)
         * and will be latter freed. Protected by fs_info->chunk_mutex.
@@ -3028,7 +3025,6 @@ static inline void free_fs_info(struct btrfs_fs_info *fs_info)
        kfree(fs_info->free_space_root);
        kfree(fs_info->super_copy);
        kfree(fs_info->super_for_commit);
-       security_free_mnt_opts(&fs_info->security_opts);
        kvfree(fs_info);
 }