Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: Fix compile error when CONFIG_SECURITY is not set.

Browse Source 
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: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Qu Wenruo 2014-10-08 10:19:08 +08:00 committed by Chris Mason
parent 0d4cf4e6bf
commit a43bb39b5c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/super.c
View File

@ -1248,6 +1248,7 @@ static int setup_security_options(struct btrfs_fs_info *fs_info,
if (ret)
return ret;
#ifdef CONFIG_SECURITY
if (!fs_info->security_opts.num_mnt_opts) {
/* first time security setup, copy sec_opts to fs_info */
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,
*/
security_free_mnt_opts(sec_opts);
}
#endif
return ret;
}