aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQu Wenruo <quwenruo@cn.fujitsu.com>2014-10-07 22:19:08 -0400
committerChris Mason <clm@fb.com>2014-10-08 09:59:24 -0400
commita43bb39b5c710e79e921fb76341bacc418cfde78 (patch)
treefec83606de50f38d0cca657d102c00f7ce43b922
parent0d4cf4e6bf29033709ae8aba4645d873ed0167cc (diff)
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: Qu Wenruo <quwenruo@cn.fujitsu.com> Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r--fs/btrfs/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 22502848c27f..a2b97ef10317 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1248,6 +1248,7 @@ static int setup_security_options(struct btrfs_fs_info *fs_info,
1248 if (ret) 1248 if (ret)
1249 return ret; 1249 return ret;
1250 1250
1251#ifdef CONFIG_SECURITY
1251 if (!fs_info->security_opts.num_mnt_opts) { 1252 if (!fs_info->security_opts.num_mnt_opts) {
1252 /* first time security setup, copy sec_opts to fs_info */ 1253 /* first time security setup, copy sec_opts to fs_info */
1253 memcpy(&fs_info->security_opts, sec_opts, sizeof(*sec_opts)); 1254 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 */ 1261 */
1261 security_free_mnt_opts(sec_opts); 1262 security_free_mnt_opts(sec_opts);
1262 } 1263 }
1264#endif
1263 return ret; 1265 return ret;
1264} 1266}
1265 1267