diff options
| author |   Qu Wenruo <quwenruo@cn.fujitsu.com> | 2014-10-08 10:19:08 +0800 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2014-10-08 06:59:24 -0700 |
| commit | a43bb39b5c710e79e921fb76341bacc418cfde78 (patch) | |
| tree | fec83606de50f38d0cca657d102c00f7ce43b922 /fs/btrfs | |
| parent | Btrfs: fix compiles when CONFIG_BTRFS_FS_RUN_SANITY_TESTS is off (diff) | |
| download | linux-dev-a43bb39b5c710e79e921fb76341bacc418cfde78.tar.xz linux-dev-a43bb39b5c710e79e921fb76341bacc418cfde78.zip | |
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>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/super.c | 2 |
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, 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; } |