Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus2 (9b32011a) · Commits · e / devices / android_kernel_teracube_emerald

security/selinux/hooks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -481,6 +481,7 @@ static int sb_finish_set_opts(struct super_block *sb)
		list_entry(sbsec->isec_head.next,
		struct inode_security_struct, list);
		struct inode *inode = isec->inode;
		list_del_init(&isec->list);
		spin_unlock(&sbsec->isec_lock);
		inode = igrab(inode);
		if (inode) {
		@@ -489,7 +490,6 @@ static int sb_finish_set_opts(struct super_block *sb)
		iput(inode);
		}
		spin_lock(&sbsec->isec_lock);
		list_del_init(&isec->list);
		goto next_inode;
		}
		spin_unlock(&sbsec->isec_lock);