Commit a43bb39b authored by Qu Wenruo's avatar Qu Wenruo Committed by Chris Mason

btrfs: Fix compile error when CONFIG_SECURITY is not set.

Fix the following compile error when CONFIG_SECURITY is not set:

error: 'struct security_mnt_opts' has no member named 'num_mnt_opts'
Signed-off-by: default avatarQu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 0d4cf4e6
...@@ -1248,6 +1248,7 @@ static int setup_security_options(struct btrfs_fs_info *fs_info, ...@@ -1248,6 +1248,7 @@ static int setup_security_options(struct btrfs_fs_info *fs_info,
if (ret) if (ret)
return ret; return ret;
#ifdef CONFIG_SECURITY
if (!fs_info->security_opts.num_mnt_opts) { if (!fs_info->security_opts.num_mnt_opts) {
/* first time security setup, copy sec_opts to fs_info */ /* first time security setup, copy sec_opts to fs_info */
memcpy(&fs_info->security_opts, sec_opts, sizeof(*sec_opts)); memcpy(&fs_info->security_opts, sec_opts, sizeof(*sec_opts));
...@@ -1260,6 +1261,7 @@ static int setup_security_options(struct btrfs_fs_info *fs_info, ...@@ -1260,6 +1261,7 @@ static int setup_security_options(struct btrfs_fs_info *fs_info,
*/ */
security_free_mnt_opts(sec_opts); security_free_mnt_opts(sec_opts);
} }
#endif
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment