提交 9b32011a 编写于 作者: J James Morris

Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus2

...@@ -481,6 +481,7 @@ static int sb_finish_set_opts(struct super_block *sb) ...@@ -481,6 +481,7 @@ static int sb_finish_set_opts(struct super_block *sb)
list_entry(sbsec->isec_head.next, list_entry(sbsec->isec_head.next,
struct inode_security_struct, list); struct inode_security_struct, list);
struct inode *inode = isec->inode; struct inode *inode = isec->inode;
list_del_init(&isec->list);
spin_unlock(&sbsec->isec_lock); spin_unlock(&sbsec->isec_lock);
inode = igrab(inode); inode = igrab(inode);
if (inode) { if (inode) {
...@@ -489,7 +490,6 @@ static int sb_finish_set_opts(struct super_block *sb) ...@@ -489,7 +490,6 @@ static int sb_finish_set_opts(struct super_block *sb)
iput(inode); iput(inode);
} }
spin_lock(&sbsec->isec_lock); spin_lock(&sbsec->isec_lock);
list_del_init(&isec->list);
goto next_inode; goto next_inode;
} }
spin_unlock(&sbsec->isec_lock); spin_unlock(&sbsec->isec_lock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册