Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 (44cad261) · Commits · e / devices / android_kernel_fairphone_FP4

security/selinux/hooks.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -760,13 +760,13 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
		* this early in the boot process. */
		BUG_ON(!ss_initialized);

		/* this might go away sometime down the line if there is a new user
		* of clone, but for now, nfs better not get here... */
		BUG_ON(newsbsec->initialized);

		/* how can we clone if the old one wasn't set up?? */
		BUG_ON(!oldsbsec->initialized);

		/* if fs is reusing a sb, just let its options stand... */
		if (newsbsec->initialized)
		return;

		mutex_lock(&newsbsec->lock);

		newsbsec->flags = oldsbsec->flags;