Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: don't BUG if fs reuses a superblock
This commit is contained in:
commit
44cad26102
|
@ -760,13 +760,13 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
|
||||||
* this early in the boot process. */
|
* this early in the boot process. */
|
||||||
BUG_ON(!ss_initialized);
|
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?? */
|
/* how can we clone if the old one wasn't set up?? */
|
||||||
BUG_ON(!oldsbsec->initialized);
|
BUG_ON(!oldsbsec->initialized);
|
||||||
|
|
||||||
|
/* if fs is reusing a sb, just let its options stand... */
|
||||||
|
if (newsbsec->initialized)
|
||||||
|
return;
|
||||||
|
|
||||||
mutex_lock(&newsbsec->lock);
|
mutex_lock(&newsbsec->lock);
|
||||||
|
|
||||||
newsbsec->flags = oldsbsec->flags;
|
newsbsec->flags = oldsbsec->flags;
|
||||||
|
|
Loading…
Reference in a new issue