From: Qu Wenruo <quwenruo@cn.fujitsu.com>
Date: Wed, 8 Oct 2014 02:19:08 +0000 (+0800)
Subject: btrfs: Fix compile error when CONFIG_SECURITY is not set.
X-Git-Tag: v4.9.8~5319^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a43bb39b5c710e79e921fb76341bacc418cfde78;p=platform%2Fkernel%2Flinux-rpi3.git

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>
---

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;
 }